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

If a resource is NULL, make sure we don't use an invalid descriptor

Browse Source 
* This can happen if the resource was not included in the capture, but
  there was a descriptor passed (i.e. not NULL desc which is handled
  separately) which specifies some parameters, but leaves the format
  as UNKNOWN.
This commit is contained in:
baldurk
2017-10-25 00:12:09 +01:00
parent 6589e1fa9a
commit 4befa9dd22
1 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/d3d12/d3d12_manager.cpp
+26
View File
@@ -164,6 +164,12 @@ void D3D12Descriptor::Create(D3D12_DESCRIPTOR_HEAP_TYPE heapType, WrappedID3D12D
return;
}
}
else if(!nonsamp.resource)
{
// if we don't have a resource (which is possible if the descriptor is unused), use a
// default descriptor
desc = defaultSRV();
}
// it's possible to end up with invalid resource and descriptor combinations:
// 1. descriptor is created for ResID_1234 BC1_TYPELESS and a view BC1_UNORM
@@ -235,6 +241,12 @@ void D3D12Descriptor::Create(D3D12_DESCRIPTOR_HEAP_TYPE heapType, WrappedID3D12D
return;
}
}
else if(!nonsamp.resource)
{
// if we don't have a resource (which is possible if the descriptor is unused), use a
// default descriptor
desc = defaultRTV();
}
// see comment above in SRV case for what this code is doing
if(nonsamp.resource && desc)
@@ -270,7 +282,15 @@ void D3D12Descriptor::Create(D3D12_DESCRIPTOR_HEAP_TYPE heapType, WrappedID3D12D
{
D3D12_DEPTH_STENCIL_VIEW_DESC *desc = &nonsamp.dsv;
if(desc->ViewDimension == D3D12_DSV_DIMENSION_UNKNOWN)
{
desc = nonsamp.resource ? NULL : defaultDSV();
}
else if(!nonsamp.resource)
{
// if we don't have a resource (which is possible if the descriptor is unused), use a
// default descriptor
desc = defaultDSV();
}
// see comment above in SRV case for what this code is doing
if(nonsamp.resource && desc)
@@ -325,6 +345,12 @@ void D3D12Descriptor::Create(D3D12_DESCRIPTOR_HEAP_TYPE heapType, WrappedID3D12D
return;
}
}
else if(!nonsamp.resource)
{
// if we don't have a resource (which is possible if the descriptor is unused), use a
// default descriptor
desc = defaultUAV();
}
// don't create a UAV with a counter resource but no main resource. This is fine because
// if the main resource wasn't present in the capture, this UAV isn't present - the counter