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

Fix calculation of offsets on root descriptor buffers

Browse Source 
* The stride these buffers are accessed with in the shader is not guaranteed to
  be 4 bytes when used untyped (e.g. structured buffers) so we can't assume it
  and bake the offset into element count. Instead fetch data starting at that
  offset and list a first element of 0.
This commit is contained in:
baldurk
2022-11-01 16:33:37 +00:00
parent 72d4d2702d
commit 2c220e7af0
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/d3d12/d3d12_shaderdebug.cpp
+22 -6
View File
@@ -180,14 +180,22 @@ void D3D12DebugAPIWrapper::FetchSRV(const DXBCDebug::BindingSlot &slot)
{
D3D12_RESOURCE_DESC resDesc = pResource->GetDesc();
// DXBC allows root buffers to have a stride of up to 16 bytes in the shader, which
// means encoding the byte offset into the first element here is wrong without knowing
// what the actual accessed stride is. Instead we only fetch the data from that offset
// onwards.
// TODO: Root buffers can be 32-bit UINT/SINT/FLOAT. Using UINT for now, but the
// resource desc format or the DXBC reflection info might be more correct.
DXBCDebug::FillViewFmt(DXGI_FORMAT_R32_UINT, srvData.format);
srvData.firstElement = (uint32_t)(element.offset / sizeof(uint32_t));
srvData.numElements = (uint32_t)((resDesc.Width - element.offset) / sizeof(uint32_t));
srvData.firstElement = 0;
// root arguments have no bounds checking, so use the most conservative number of
// elements
srvData.numElements = uint32_t(resDesc.Width - element.offset);
if(resDesc.Dimension == D3D12_RESOURCE_DIMENSION_BUFFER)
m_pDevice->GetDebugManager()->GetBufferData(pResource, 0, 0, srvData.data);
m_pDevice->GetDebugManager()->GetBufferData(pResource, element.offset, 0,
srvData.data);
}
return;
@@ -346,14 +354,22 @@ void D3D12DebugAPIWrapper::FetchUAV(const DXBCDebug::BindingSlot &slot)
{
D3D12_RESOURCE_DESC resDesc = pResource->GetDesc();
// DXBC allows root buffers to have a stride of up to 16 bytes in the shader, which
// means encoding the byte offset into the first element here is wrong without knowing
// what the actual accessed stride is. Instead we only fetch the data from that offset
// onwards.
// TODO: Root buffers can be 32-bit UINT/SINT/FLOAT. Using UINT for now, but the
// resource desc format or the DXBC reflection info might be more correct.
DXBCDebug::FillViewFmt(DXGI_FORMAT_R32_UINT, uavData.format);
uavData.firstElement = (uint32_t)(element.offset / sizeof(uint32_t));
uavData.numElements = (uint32_t)((resDesc.Width - element.offset) / sizeof(uint32_t));
uavData.firstElement = 0;
// root arguments have no bounds checking, so use the most conservative number of
// elements
uavData.numElements = uint32_t(resDesc.Width - element.offset);
if(resDesc.Dimension == D3D12_RESOURCE_DIMENSION_BUFFER)
m_pDevice->GetDebugManager()->GetBufferData(pResource, 0, 0, uavData.data);
m_pDevice->GetDebugManager()->GetBufferData(pResource, element.offset, 0,
uavData.data);
}
return;