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

Handle parameters to SOSetTargets being NULL, use defaults. Refs #338

Browse Source 
* It seems like actually ppSOTargets can only be NULL if NumBuffers is
  0, but the D3D runtime will happily accept a null pOffsets and just
  act as if it's full of -1 (which means append)
This commit is contained in:
baldurk
2016-08-25 16:20:42 +02:00
parent 90604c6d9c
commit 8897a1295a
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/d3d11/d3d11_context_wrap.cpp
+11 -4
View File
@@ -2172,13 +2172,19 @@ bool WrappedID3D11DeviceContext::Serialise_SOSetTargets(UINT NumBuffers_,
{
SERIALISE_ELEMENT(uint32_t, NumBuffers, NumBuffers_);
SERIALISE_ELEMENT_ARR(uint32_t, Offsets, pOffsets, NumBuffers);
UINT DefaultOffsets[] = {
~0U, ~0U, ~0U, ~0U, ~0U, ~0U, ~0U, ~0U,
};
RDCCOMPILE_ASSERT(ARRAY_COUNT(DefaultOffsets) >= D3D11_SO_STREAM_COUNT,
"Insufficiently sized array of default offsets");
SERIALISE_ELEMENT_ARR(uint32_t, Offsets, pOffsets ? pOffsets : DefaultOffsets, NumBuffers);
ID3D11Buffer **Buffers = new ID3D11Buffer *[NumBuffers];
for(UINT i = 0; i < NumBuffers; i++)
{
SERIALISE_ELEMENT(ResourceId, id, GetIDForResource(ppSOTargets[i]));
SERIALISE_ELEMENT(ResourceId, id, ppSOTargets ? GetIDForResource(ppSOTargets[i]) : ResourceId());
if(m_State <= EXECUTING && m_pDevice->GetResourceManager()->HasLiveResource(id))
Buffers[i] = (ID3D11Buffer *)m_pDevice->GetResourceManager()->GetLiveResource(id);
@@ -2280,8 +2286,9 @@ void WrappedID3D11DeviceContext::SOSetTargets(UINT NumBuffers, ID3D11Buffer *con
for(UINT b = 0; b < NumBuffers; b++)
{
setbufs[b] = ppSOTargets[b];
setoffs[b] = pOffsets[b];
setbufs[b] = ppSOTargets ? ppSOTargets[b] : NULL;
// passing NULL for pOffsets seems to act like -1 => append
setoffs[b] = pOffsets ? pOffsets[b] : ~0U;
}
// end stream-out queries for outgoing targets