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

Fixes for GS output in the Mesh Viewer in D3D12

Browse Source 
- Ensure there is space for the Stream Out counters at the beginning of the SO buffer
- Fix use-after-Unmap of the SO statistics data
- Reset the state correctly after syncing every 1000 instances
- Unmap the SO buffer when no output instances are found
This commit is contained in:
Dylan Barrie
2021-09-01 13:02:27 -07:00
committed by Baldur Karlsson
parent 6659fae944
commit 1b19208323
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/d3d12/d3d12_postvs.cpp
+14 -3
View File
@@ -911,7 +911,9 @@ void D3D12Replay::InitPostVSBuffers(uint32_t eventId)
range.End = 0;
m_SOStagingBuffer->Unmap(0, &range);
uint64_t outputSize = data->PrimitivesStorageNeeded * 3 * stride;
// reserve space for enough 'buffer filled size' locations
UINT64 SizeCounterBytes = AlignUp(uint64_t(action->numInstances * sizeof(UINT64)), 64ULL);
uint64_t outputSize = SizeCounterBytes + result.PrimitivesStorageNeeded * 3 * stride;
if(m_SOBufferSize < outputSize)
{
@@ -961,8 +963,6 @@ void D3D12Replay::InitPostVSBuffers(uint32_t eventId)
rs.ApplyGraphicsRootElements(list);
}
// reserve space for enough 'buffer filled size' locations
UINT64 SizeCounterBytes = AlignUp(uint64_t(action->numInstances * sizeof(UINT64)), 64ULL);
view.BufferLocation = m_SOBuffer->GetGPUVirtualAddress() + SizeCounterBytes;
view.SizeInBytes = m_SOBufferSize - SizeCounterBytes;
@@ -1000,6 +1000,16 @@ void D3D12Replay::InitPostVSBuffers(uint32_t eventId)
GetDebugManager()->ResetDebugAlloc();
list = GetDebugManager()->ResetDebugList();
rs.ApplyState(m_pDevice, list);
list->SetPipelineState(pipe);
if(soSig)
{
list->SetGraphicsRootSignature(soSig);
rs.ApplyGraphicsRootElements(list);
}
}
}
@@ -1178,6 +1188,7 @@ void D3D12Replay::InitPostVSBuffers(uint32_t eventId)
if(numBytesWritten == 0)
{
SAFE_RELEASE(soSig);
m_SOStagingBuffer->Unmap(0, &range);
return;
}