lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-08-04 05:41:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix GPU patching of handles in local root signatures

Browse Source
This commit is contained in:
baldurk
2024-05-09 15:00:30 +01:00
parent 731f137e2f
commit 84dc120871
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/data/hlsl/raytracing.hlsl
+10 -6
View File
@@ -136,9 +136,11 @@ void PatchTable(uint byteOffset)
bufferToPatch.Store4(byteOffset, recordData.identifier[0]);
bufferToPatch.Store4(byteOffset + 16, recordData.identifier[1]);
if(recordData.rootSigIndex & 0xffff != 0xffff)
uint rootSigIndex = (recordData.rootSigIndex & 0xffff);
if(rootSigIndex != 0xffff)
{
RootSig sig = rootsigs[recordData.rootSigIndex];
RootSig sig = rootsigs[rootSigIndex];
DescriptorHeapData heaps[2];
@@ -156,7 +158,7 @@ void PatchTable(uint byteOffset)
for(uint i = 0; i < sig.numHandles; i++)
{
GPUAddress wrappedHandlePtr = bufferToPatch.Load2(sig.handleOffsets[i]);
GPUAddress wrappedHandlePtr = bufferToPatch.Load2(byteOffset + sig.handleOffsets[i]);
bool patched = false;
for(int h = 0; h < 2; h++)
@@ -165,9 +167,11 @@ void PatchTable(uint byteOffset)
lessThan(wrappedHandlePtr, heaps[h].wrapped_end))
{
// assume the byte offsets will all fit into the LSB 32-bits
uint index = sub(wrappedHandlePtr, wrapped_sampHeapBase).x / WRAPPED_DESCRIPTOR_STRIDE;
uint index = sub(wrappedHandlePtr, heaps[h].wrapped_base).x / WRAPPED_DESCRIPTOR_STRIDE;
GPUAddress handleOffset = GPUAddress(index * heaps[h].unwrapped_stride, 0);
bufferToPatch.Store2(sig.handleOffsets[i], add(heaps[h].unwrapped_base, handleOffset));
bufferToPatch.Store2(byteOffset + sig.handleOffsets[i],
add(heaps[h].unwrapped_base, handleOffset));
patched = true;
}
}
@@ -175,7 +179,7 @@ void PatchTable(uint byteOffset)
if(!patched)
{
// won't work but is our best effort
bufferToPatch.Store2(sig.handleOffsets[i], GPUAddress(0, 0));
bufferToPatch.Store2(byteOffset + sig.handleOffsets[i], GPUAddress(0, 0));
}
}
}
renderdoc/driver/d3d12/d3d12_manager.cpp
+8
View File
@@ -872,6 +872,14 @@ PatchedRayDispatch D3D12RaytracingResourceAndUtilHandler::PatchRayDispatch(
exportIndex += (uint32_t)m_ExportDatabases[i]->ownExports.size();
}
for(size_t i = 0; i < m_UniqueLocalRootSigs.size(); i++)
{
uint32_t *rootSigData = (uint32_t *)(lookupData.data() + RootSigOffset + RootSigStride * i);
rootSigData[0] = (uint32_t)m_UniqueLocalRootSigs[i].size();
memcpy(&rootSigData[1], m_UniqueLocalRootSigs[i].data(), m_UniqueLocalRootSigs[i].byteSize());
}
D3D12GpuBufferAllocator::Inst()->Alloc(D3D12GpuBufferHeapType::UploadHeap,
D3D12GpuBufferHeapMemoryFlag::Default,
lookupData.size(), 256, &m_LookupBuffer);