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

Make sure persistent map check includes resources in bound descriptors

Browse Source
This commit is contained in:
baldurk
2016-10-27 16:23:09 +02:00
parent 95f955a5bb
commit 58ecabc7c4
1 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/d3d12/d3d12_command_queue_wrap.cpp
+21 -17
View File
@@ -448,6 +448,9 @@ void STDMETHODCALLTYPE WrappedID3D12CommandQueue::ExecuteCommandLists(
{
D3D12Descriptor &desc = **it;
ResourceId id, id2;
FrameRefType ref = eFrameRef_Read;
switch(desc.GetType())
{
case D3D12Descriptor::TypeUndefined:
@@ -455,29 +458,30 @@ void STDMETHODCALLTYPE WrappedID3D12CommandQueue::ExecuteCommandLists(
// nothing to do - no resource here
break;
case D3D12Descriptor::TypeCBV:
GetResourceManager()->MarkResourceFrameReferenced(
WrappedID3D12Resource::GetResIDFromAddr(desc.nonsamp.cbv.BufferLocation),
eFrameRef_Read);
break;
case D3D12Descriptor::TypeSRV:
GetResourceManager()->MarkResourceFrameReferenced(GetResID(desc.nonsamp.resource),
eFrameRef_Read);
id = WrappedID3D12Resource::GetResIDFromAddr(desc.nonsamp.cbv.BufferLocation);
break;
case D3D12Descriptor::TypeSRV: id = GetResID(desc.nonsamp.resource); break;
case D3D12Descriptor::TypeUAV:
GetResourceManager()->MarkResourceFrameReferenced(GetResID(desc.nonsamp.resource),
eFrameRef_Write);
GetResourceManager()->MarkResourceFrameReferenced(
GetResID(desc.nonsamp.uav.counterResource), eFrameRef_Write);
break;
id2 = GetResID(desc.nonsamp.uav.counterResource);
// deliberate fall-through
case D3D12Descriptor::TypeRTV:
GetResourceManager()->MarkResourceFrameReferenced(GetResID(desc.nonsamp.resource),
eFrameRef_Write);
break;
case D3D12Descriptor::TypeDSV:
GetResourceManager()->MarkResourceFrameReferenced(GetResID(desc.nonsamp.resource),
eFrameRef_Write);
ref = eFrameRef_Write;
id = GetResID(desc.nonsamp.resource);
break;
}
if(id != ResourceId())
{
refdIDs.insert(id);
GetResourceManager()->MarkResourceFrameReferenced(id, ref);
}
if(id2 != ResourceId())
{
refdIDs.insert(id2);
GetResourceManager()->MarkResourceFrameReferenced(id2, ref);
}
}
// pull in frame refs from this baked command list