lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-29 21:30:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a deny flag when necessary on tier 1 heap devices

Browse Source
This commit is contained in:
baldurk
2020-02-20 23:32:33 +00:00
parent cf3153f238
commit 9d3e4dc5e7
1 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/d3d12/d3d12_device_wrap3.cpp
+34
View File
@@ -51,6 +51,23 @@ HRESULT WrappedID3D12Device::OpenExistingHeapFromAddress(const void *pAddress, R
// remove SHARED flags that are not allowed on real heaps
heapDesc.Flags &= ~(D3D12_HEAP_FLAG_SHARED | D3D12_HEAP_FLAG_SHARED_CROSS_ADAPTER);
D3D12_FEATURE_DATA_D3D12_OPTIONS opts = {};
if(SUCCEEDED(m_pDevice->CheckFeatureSupport(D3D12_FEATURE_D3D12_OPTIONS, &opts, sizeof(opts))))
{
if(opts.ResourceHeapTier == D3D12_RESOURCE_HEAP_TIER_1)
{
// tier 1 devices don't support heaps with no DENY flags, but the heap we get from here
// will likely have no DENY flags set. Artifically add one that should be safe for this
// kind of heap.
if((heapDesc.Flags & (D3D12_HEAP_FLAG_DENY_BUFFERS | D3D12_HEAP_FLAG_DENY_RT_DS_TEXTURES |
D3D12_HEAP_FLAG_DENY_NON_RT_DS_TEXTURES)) == 0)
{
RDCWARN("Adding DENY_RT_DS_TEXTURES to OpenExistingHeap heap for tier 1 compatibility");
heapDesc.Flags |= D3D12_HEAP_FLAG_DENY_RT_DS_TEXTURES;
}
}
}
SCOPED_SERIALISE_CHUNK(D3D12Chunk::Device_CreateHeapFromAddress);
Serialise_CreateHeap(ser, &heapDesc, riid, (void **)&wrapped);
@@ -99,6 +116,23 @@ HRESULT WrappedID3D12Device::OpenExistingHeapFromFileMapping(HANDLE hFileMapping
// remove SHARED flags that are not allowed on real heaps
heapDesc.Flags &= ~(D3D12_HEAP_FLAG_SHARED | D3D12_HEAP_FLAG_SHARED_CROSS_ADAPTER);
D3D12_FEATURE_DATA_D3D12_OPTIONS opts = {};
if(SUCCEEDED(m_pDevice->CheckFeatureSupport(D3D12_FEATURE_D3D12_OPTIONS, &opts, sizeof(opts))))
{
if(opts.ResourceHeapTier == D3D12_RESOURCE_HEAP_TIER_1)
{
// tier 1 devices don't support heaps with no DENY flags, but the heap we get from here
// will likely have no DENY flags set. Artifically add one that should be safe for this
// kind of heap.
if((heapDesc.Flags & (D3D12_HEAP_FLAG_DENY_BUFFERS | D3D12_HEAP_FLAG_DENY_RT_DS_TEXTURES |
D3D12_HEAP_FLAG_DENY_NON_RT_DS_TEXTURES)) == 0)
{
RDCWARN("Adding DENY_RT_DS_TEXTURES to OpenExistingHeap heap for tier 1 compatibility");
heapDesc.Flags |= D3D12_HEAP_FLAG_DENY_RT_DS_TEXTURES;
}
}
}
SCOPED_SERIALISE_CHUNK(D3D12Chunk::Device_CreateHeapFromFileMapping);
Serialise_CreateHeap(ser, &heapDesc, riid, (void **)&wrapped);