lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-09-22 05:35:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't accumulate infinite ResolveSubresource calls. Refs #434

Browse Source
This commit is contained in:
baldurk
2016-11-28 17:53:55 +01:00
parent d3dedbef5a
commit 8d26996034
1 changed files with 39 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/d3d11/d3d11_context_wrap.cpp
+39 -34
View File
@@ -6032,45 +6032,50 @@ void WrappedID3D11DeviceContext::ResolveSubresource(ID3D11Resource *pDstResource
m_pDevice->GetResourceManager()->GetResourceRecord(GetIDForResource(pSrcResource));
RDCASSERT(srcRecord);
record->AddParent(srcRecord);
if(m_pDevice->GetResourceManager()->IsResourceDirty(GetIDForResource(pSrcResource)))
MarkDirtyResource(GetIDForResource(pDstResource));
SCOPED_SERIALISE_CONTEXT(RESOLVE_SUBRESOURCE);
m_pSerialiser->Serialise("context", m_ResourceID);
Serialise_ResolveSubresource(pDstResource, DstSubresource, pSrcResource, SrcSubresource, Format);
// resolve subresource only really 'clears' if it's the only subresource.
// This is usually the case for render target textures though.
if(record->NumSubResources == 1)
if(m_pDevice->GetResourceManager()->IsResourceDirty(GetIDForResource(pSrcResource)) ||
record->NumSubResources > 1)
{
m_pDevice->LockForChunkRemoval();
record->LockChunks();
for(;;)
{
Chunk *end = record->GetLastChunk();
if(end->GetChunkType() == CLEAR_RTV || end->GetChunkType() == CLEAR_DSV ||
end->GetChunkType() == CLEAR_UAV_FLOAT || end->GetChunkType() == CLEAR_UAV_INT ||
end->GetChunkType() == RESOLVE_SUBRESOURCE || end->GetChunkType() == COPY_RESOURCE)
{
SAFE_DELETE(end);
record->PopChunk();
continue;
}
break;
}
record->UnlockChunks();
m_pDevice->UnlockForChunkRemoval();
MarkDirtyResource(GetIDForResource(pDstResource));
}
else
{
record->AddParent(srcRecord);
record->AddChunk(scope.Get());
SCOPED_SERIALISE_CONTEXT(RESOLVE_SUBRESOURCE);
m_pSerialiser->Serialise("context", m_ResourceID);
Serialise_ResolveSubresource(pDstResource, DstSubresource, pSrcResource, SrcSubresource,
Format);
{
m_pDevice->LockForChunkRemoval();
record->LockChunks();
for(;;)
{
Chunk *end = record->GetLastChunk();
if(end->GetChunkType() == CLEAR_RTV || end->GetChunkType() == CLEAR_DSV ||
end->GetChunkType() == CLEAR_UAV_FLOAT || end->GetChunkType() == CLEAR_UAV_INT ||
end->GetChunkType() == RESOLVE_SUBRESOURCE || end->GetChunkType() == COPY_RESOURCE)
{
SAFE_DELETE(end);
record->PopChunk();
continue;
}
break;
}
record->UnlockChunks();
m_pDevice->UnlockForChunkRemoval();
}
record->AddChunk(scope.Get());
}
}
m_pRealContext->ResolveSubresource(