From adf0e8eeb302dab08d4a52df03030a1b3268cfce Mon Sep 17 00:00:00 2001 From: assiduous Date: Sun, 21 Feb 2021 20:43:17 -0800 Subject: Fixed bug in DescriptorHeapAllocationManager --- Graphics/GraphicsEngineD3D12/src/DescriptorHeap.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'Graphics/GraphicsEngineD3D12') diff --git a/Graphics/GraphicsEngineD3D12/src/DescriptorHeap.cpp b/Graphics/GraphicsEngineD3D12/src/DescriptorHeap.cpp index 1159c041..04028631 100644 --- a/Graphics/GraphicsEngineD3D12/src/DescriptorHeap.cpp +++ b/Graphics/GraphicsEngineD3D12/src/DescriptorHeap.cpp @@ -217,12 +217,13 @@ DescriptorHeapAllocation DescriptorHeapAllocationManager::Allocate(uint32_t Coun ++m_AllocationsCounter; // Copy invalid descriptors. If the descriptors are accessed, this will cause device removal. { - auto* pd3d12Device = m_DeviceD3D12Impl.GetD3D12Device(); - const auto InvalidCPUHandles = m_pd3d12InvalidDescriptorHeap->GetCPUDescriptorHandleForHeapStart(); - auto DstCPUHandle = CPUHandle; - for (Uint32 FisrtDescr = 0; FisrtDescr < Count; FisrtDescr += InvalidDescriptorsCount, DstCPUHandle.ptr += InvalidDescriptorsCount) + auto* const pd3d12Device = m_DeviceD3D12Impl.GetD3D12Device(); + const auto InvalidCPUHandles = m_pd3d12InvalidDescriptorHeap->GetCPUDescriptorHandleForHeapStart(); + for (Uint32 FisrtDescr = 0; FisrtDescr < Count; FisrtDescr += InvalidDescriptorsCount) { auto NumDescrsToCopy = std::min(Count - FisrtDescr, InvalidDescriptorsCount); + auto DstCPUHandle = CPUHandle; + DstCPUHandle.ptr += FisrtDescr * m_DescriptorSize; pd3d12Device->CopyDescriptorsSimple(NumDescrsToCopy, DstCPUHandle, InvalidCPUHandles, m_HeapDesc.Type); } } -- cgit v1.2.3