fix for AMD gpus

Author: Cheaterdev

sources/HAL/API/D3D12/HAL.D3D12.RootSignature.cpp

@@ -28,7 +28,7 @@ namespace HAL
                     ranges.emplace_back();
                     auto& range = ranges.back();
 
-                    range.Init(static_cast<D3D12_DESCRIPTOR_RANGE_TYPE>(table.range), table.count, table.offset, table.space, D3D12_DESCRIPTOR_RANGE_FLAGS::D3D12_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE);
+                    range.Init(static_cast<D3D12_DESCRIPTOR_RANGE_TYPE>(table.range), table.count, table.offset, table.space, D3D12_DESCRIPTOR_RANGE_FLAGS::D3D12_DESCRIPTOR_RANGE_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE);
                     param.InitAsDescriptorTable(1, &range, static_cast<D3D12_SHADER_VISIBILITY>(table.visibility));
 
                 },

sources/HAL/API/D3D12/HAL.Impl.cpp

@@ -20,13 +20,13 @@ namespace HAL
         ComPtr<ID3D12Debug> debugController;
         ComPtr<ID3D12Debug1> spDebugController1;
 
-       /* if constexpr (Debug::CheckErrors)
+        if constexpr (Debug::CheckErrors)
             if (SUCCEEDED(D3D12GetDebugInterface(IID_PPV_ARGS(&debugController))))
             {
                 debugController->QueryInterface(IID_PPV_ARGS(&spDebugController1));
                 debugController->EnableDebugLayer();
                 //    spDebugController1->SetEnableGPUBasedValidation(true);
-            }*/
+            }
 
     }
 

sources/HAL/autogen/pso.cpp

@@ -102,14 +102,15 @@ void init_pso(HAL::Device& device, enum_array<PSO, PSOBase::ptr>& pso)
 	tasks.emplace_back(PSOBase::create<PSOS::DenoiserDownsample>(device, pso[PSO::DenoiserDownsample]));
 
 
-	
-#ifndef HAL_BACKEND_VULKAN
-
-
-				  
-	tasks.emplace_back(PSOBase::create<PSOS::WorkGR>(device, pso[PSO::WorkGR]));
-
+	if (device.get_properties().work_graph)
+	{
+	}
 
+#ifndef HAL_BACKEND_VULKAN
+	if (device.get_properties().work_graph)
+	{
+		tasks.emplace_back(PSOBase::create<PSOS::WorkGR>(device, pso[PSO::WorkGR]));
+	}
 #endif // !HAL_BACKEND_VULKAN
 
 	when_all(begin(tasks), end(tasks)).wait();

sources/RenderSystem/FrameGraph/PassDefaults.cpp

@@ -71,6 +71,9 @@ void PassDefault<Passes::Profiler>::render(
 bool PassDefault<Passes::RTXPass>::setup(
     Passes::RTXPass::Context& data, FrameGraph::TaskBuilder& builder)
 {
+        if (!RenderSystem::get().device().get_properties().work_graph)
+            return false;
+
     auto& frame    = builder.graph->get_context<ViewportInfo>();
     auto  work_pso = RenderSystem::get().device().get_engine_pso_holder().GetPSO<PSOS::WorkGR>();
     auto  size     = frame.frame_size;

sources/RenderSystem/GUI/Base.cpp

@@ -1633,7 +1633,10 @@ void PassDefault<Passes::UI_Render>::render(
     {
         RT::SingleColor rt;
         rt.GetColor() = texture.renderTarget;
-        command_list->get_graphics().set_rtv(rt);
+        const auto rt_options = (slot == 0)
+            ? HAL::RTOptions::Default | HAL::RTOptions::ClearColor
+            : HAL::RTOptions::Default;
+        command_list->get_graphics().set_rtv(rt, rt_options);
     }
 
     Renderer renderer;

sources/RenderSystem/GUI/Skin.cpp

@@ -112,6 +112,8 @@ Skin::Skin()
 	Virtual = EngineAssets::virtualtex.get_asset()->get_texture()->texture_2d();
 	Shadow = EngineAssets::shadow.get_asset()->get_texture()->texture_2d();
 	Fill = EngineAssets::back_fill.get_asset()->get_texture()->texture_2d();
+
+	Edit  = EngineAssets::back_fill.get_asset()->get_texture()->texture_2d();
 	Edit.padding = { 5, 5, 5, 5 };
 	Virtual.padding = { 5, 5, 5, 5 };
 

sources/RenderSystem/RenderSystem.cpp

@@ -14,6 +14,10 @@ std::shared_ptr<HAL::Device> RenderSystem::select_adapter()
         Log::get() << "adapter: " << desc.Description << Log::endl;
 
         const auto props = HAL::Device::probe(adapter);
+
+        //   if (std::wstring(desc.Description).find(L"AMD") == std::wstring::npos) return;
+
+
         if (!result && props.mesh_shader && props.full_bindless &&
             std::wstring(desc.Description).find(L"Basic") == std::wstring::npos)
         {

sources/SIGParser/templates/cpp/psos.jinja

@@ -49,12 +49,15 @@ void init_pso(HAL::Device& device, enum_array<PSO, PSOBase::ptr>& pso)
 {%- endif %}
 {%- endfor %}
 
-{% for v in parsed.workgraph_pso -%}
-{%- set t = parsed.workgraph_pso[v] -%}
+	if (device.get_properties().work_graph)
+	{
+{%- for v in parsed.workgraph_pso %}
+{%- set t = parsed.workgraph_pso[v] %}
 {%- if t.options.ExcludeVulkan is undefined %}
-	tasks.emplace_back(PSOBase::create<PSOS::{{t.name}}>(device, pso[PSO::{{t.name}}]));
+		tasks.emplace_back(PSOBase::create<PSOS::{{t.name}}>(device, pso[PSO::{{t.name}}]));
 {%- endif %}
 {%- endfor %}
+	}
 
 #ifndef HAL_BACKEND_VULKAN
 {% for v in parsed.compute_pso -%}
@@ -71,12 +74,15 @@ void init_pso(HAL::Device& device, enum_array<PSO, PSOBase::ptr>& pso)
 {%- endif %}
 {%- endfor %}
 
-{% for v in parsed.workgraph_pso -%}
-{%- set t = parsed.workgraph_pso[v] -%}
+	if (device.get_properties().work_graph)
+	{
+{%- for v in parsed.workgraph_pso %}
+{%- set t = parsed.workgraph_pso[v] %}
 {%- if t.options.ExcludeVulkan is defined %}
-	tasks.emplace_back(PSOBase::create<PSOS::{{t.name}}>(device, pso[PSO::{{t.name}}]));
+		tasks.emplace_back(PSOBase::create<PSOS::{{t.name}}>(device, pso[PSO::{{t.name}}]));
 {%- endif %}
 {%- endfor %}
+	}
 #endif // !HAL_BACKEND_VULKAN
 
 	when_all(begin(tasks), end(tasks)).wait();

sources/SIGParser/templates/hlsl/table.jinja

@@ -54,8 +54,8 @@ struct {{"[raypayload]" if table.options.raypayload is defined}}{{table.name}}
 	{{type}} Get{{v.name|camel}}(int i)
 	{
 		StructuredBuffer<uint> indirection = ResourceDescriptorHeap[{{v.name}}];
-		uint id = indirection.Load(i);
-		return ResourceDescriptorHeap[id];
+		uint id = indirection[NonUniformResourceIndex(i)];
+		return ResourceDescriptorHeap[NonUniformResourceIndex(id)];
 	}
 {%elif v.as_array and v.array_count > 1 %}
 	{{type}} Get{{v.name|camel}}(int i) { return ResourceDescriptorHeap[{{v.name}}[i]]; }

workdir/shaders/autogen/tables/NinePatch.h

@@ -15,8 +15,8 @@ struct NinePatch
 	Texture2D<float4> GetTextures(int i)
 	{
 		StructuredBuffer<uint> indirection = ResourceDescriptorHeap[textures];
-		uint id = indirection.Load(i);
-		return ResourceDescriptorHeap[id];
+		uint id = indirection[NonUniformResourceIndex(i)];
+		return ResourceDescriptorHeap[NonUniformResourceIndex(id)];
 	}
 
 };