diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2018-01-12 05:19:20 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2018-01-12 05:19:20 +0000 |
| commit | 4fd1bd291d2233706ede7ee0f6f41f2429b21254 (patch) | |
| tree | a2909127311afc0eb41a0ee0f1e135deaa5be225 /Graphics/GraphicsEngineD3D12 | |
| parent | Fixed Linux build error (diff) | |
| download | DiligentCore-4fd1bd291d2233706ede7ee0f6f41f2429b21254.tar.gz DiligentCore-4fd1bd291d2233706ede7ee0f6f41f2429b21254.zip | |
Fixed error in debug macros
Diffstat (limited to 'Graphics/GraphicsEngineD3D12')
| -rw-r--r-- | Graphics/GraphicsEngineD3D12/include/ShaderResourceCacheD3D12.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Graphics/GraphicsEngineD3D12/include/ShaderResourceCacheD3D12.h b/Graphics/GraphicsEngineD3D12/include/ShaderResourceCacheD3D12.h index 9e71530f..1230b8c1 100644 --- a/Graphics/GraphicsEngineD3D12/include/ShaderResourceCacheD3D12.h +++ b/Graphics/GraphicsEngineD3D12/include/ShaderResourceCacheD3D12.h @@ -32,14 +32,14 @@ // // // __________________________________________________________ -// m_pMemory | m_pResources, m_NumResources | +// m_pMemory | m_pResources, m_NumResources == m | // | | | // V | V // | RootTable[0] | .... | RootTable[Nrt-1] | Res[0] | ... | Res[n-1] | .... | Res[0] | ... | Res[m-1] | // | A \ // | | \ // |________________________________________________| \RefCntAutoPtr -// m_pResources, m_NumResources \_________ +// m_pResources, m_NumResources == n \_________ // | Object | // --------- // @@ -231,7 +231,7 @@ public: // variable assignments for a shader. It is also not assigned to root views if( RootParam.m_TableStartOffset != InvalidDescriptorOffset ) { - VERIFY(RootParam.m_TableStartOffset + OffsetFromTableStart < RootParam.m_NumResources, "Offset is out of range"); + VERIFY(OffsetFromTableStart < RootParam.m_NumResources, "Offset is out of range"); if( HeapType == D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER ) { VERIFY_EXPR(!m_SamplerHeapSpace.IsNull()); @@ -257,7 +257,7 @@ public: { auto &RootParam = GetRootTable(RootParamInd); VERIFY(RootParam.m_TableStartOffset != InvalidDescriptorOffset, "GPU descriptor handle must never be requested for dynamic resources"); - VERIFY(RootParam.m_TableStartOffset + OffsetFromTableStart < RootParam.m_NumResources, "Offset is out of range"); + VERIFY(OffsetFromTableStart < RootParam.m_NumResources, "Offset is out of range"); D3D12_GPU_DESCRIPTOR_HANDLE GPUDescriptorHandle = {0}; VERIFY( HeapType == RootParam.DbgGetHeapType(), "Invalid descriptor heap type"); |