From efd11bb7f2b23625b339751175d637dec46437e7 Mon Sep 17 00:00:00 2001 From: baldurk Date: Fri, 15 Jun 2018 10:34:05 +0100 Subject: [PATCH] Don't crash if OMSetRTVs is called with no RTVs and single handle flag --- renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp b/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp index c412aa72f..ae51c3c40 100644 --- a/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp +++ b/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp @@ -1256,9 +1256,12 @@ bool WrappedID3D12GraphicsCommandList2::Serialise_OMSetRenderTargets( { if(RTsSingleHandleToDescriptorRange) { - const D3D12Descriptor *descs = GetWrapped(pRenderTargetDescriptors[0]); + if(pRenderTargetDescriptors && NumRenderTargetDescriptors > 0) + { + const D3D12Descriptor *descs = GetWrapped(pRenderTargetDescriptors[0]); - RTVs.insert(RTVs.begin(), descs, descs + NumRenderTargetDescriptors); + RTVs.insert(RTVs.begin(), descs, descs + NumRenderTargetDescriptors); + } } else {