From 11a3e65654e8d4b245ce92a2dd10f9bff14f30ce Mon Sep 17 00:00:00 2001 From: baldurk Date: Thu, 5 Jan 2017 18:54:18 +0100 Subject: [PATCH] Make sure we don't index into empty RTs array with rtSingle. Refs #482 --- renderdoc/driver/d3d12/d3d12_state.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/renderdoc/driver/d3d12/d3d12_state.cpp b/renderdoc/driver/d3d12/d3d12_state.cpp index fc5b6f426..08f149f3d 100644 --- a/renderdoc/driver/d3d12/d3d12_state.cpp +++ b/renderdoc/driver/d3d12/d3d12_state.cpp @@ -192,7 +192,8 @@ void D3D12RenderState::ApplyState(ID3D12GraphicsCommandList *cmd) const D3D12_CPU_DESCRIPTOR_HANDLE rtHandles[8]; D3D12_CPU_DESCRIPTOR_HANDLE dsvHandle = CPUHandleFromPortableHandle(GetResourceManager(), dsv); - UINT numActualHandles = rtSingle ? 1 : (UINT)rts.size(); + UINT rtCount = (UINT)rts.size(); + UINT numActualHandles = rtSingle ? RDCMIN(1U, rtCount) : rtCount; for(UINT i = 0; i < numActualHandles; i++) rtHandles[i] = CPUHandleFromPortableHandle(GetResourceManager(), rts[i]);