Ensure safe state is used for RT builds on compute command buffers

baldurk · baldurk · commit 204f003f2b77 · 2025-02-11T14:06:01.000Z
diff --git a/renderdoc/driver/d3d12/d3d12_command_list4_wrap.cpp b/renderdoc/driver/d3d12/d3d12_command_list4_wrap.cpp
@@ -792,6 +792,7 @@ bool WrappedID3D12GraphicsCommandList::PatchAccStructBlasAddress(
     // Here, we are uploading the old BLAS addresses, and comparing the BLAS
     // addresses in the TLAS and patching it with the corresponding new address.
 
+    BakedCmdListInfo &bakedCmdInfo = m_Cmd->m_BakedCmdListInfo[m_Cmd->m_LastCmdListID];
     D3D12RTManager *rtManager = GetResourceManager()->GetRTManager();
 
     // Create a resource for patched instance desc; we don't
@@ -825,6 +826,9 @@ bool WrappedID3D12GraphicsCommandList::PatchAccStructBlasAddress(
       {
         needInitialTransition = true;
       }
+
+      if(bakedCmdInfo.type == D3D12_COMMAND_LIST_TYPE_COMPUTE)
+        instanceResState = D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE;
     }
 
     {

Original file line number	Diff line number	Diff line change
`@@ -792,6 +792,7 @@ bool WrappedID3D12GraphicsCommandList::PatchAccStructBlasAddress(`
`792`	`792`	`// Here, we are uploading the old BLAS addresses, and comparing the BLAS`
`793`	`793`	`// addresses in the TLAS and patching it with the corresponding new address.`
`794`	`794`
	`795`	`+ BakedCmdListInfo &bakedCmdInfo = m_Cmd->m_BakedCmdListInfo[m_Cmd->m_LastCmdListID];`
`795`	`796`	`D3D12RTManager *rtManager = GetResourceManager()->GetRTManager();`
`796`	`797`
`797`	`798`	`// Create a resource for patched instance desc; we don't`
`@@ -825,6 +826,9 @@ bool WrappedID3D12GraphicsCommandList::PatchAccStructBlasAddress(`
`825`	`826`	`{`
`826`	`827`	`needInitialTransition = true;`
`827`	`828`	`}`
	`829`	`+`
	`830`	`+ if(bakedCmdInfo.type == D3D12_COMMAND_LIST_TYPE_COMPUTE)`
	`831`	`+ instanceResState = D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE;`
`828`	`832`	`}`
`829`	`833`
`830`	`834`	`{`