From 5773660e0a46ef38b9ae8df2d17334af710fabbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tur=C3=A1nszki=20J=C3=A1nos?= Date: Mon, 29 Aug 2022 16:10:41 +0200 Subject: [PATCH] added missing unwrap for src and dst resolve resources for depthstencil Follow up for this issue which was partly fixed, but the same crash started appearing after using depth resolve inside renderpass: https://github.com/baldurk/renderdoc/issues/2622 --- .../driver/d3d12/d3d12_command_list4_wrap.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/renderdoc/driver/d3d12/d3d12_command_list4_wrap.cpp b/renderdoc/driver/d3d12/d3d12_command_list4_wrap.cpp index 326c78216..38f84c993 100644 --- a/renderdoc/driver/d3d12/d3d12_command_list4_wrap.cpp +++ b/renderdoc/driver/d3d12/d3d12_command_list4_wrap.cpp @@ -468,6 +468,20 @@ void WrappedID3D12GraphicsCommandList::BeginRenderPass( { unwrappedDSV = *pDepthStencil; unwrappedDSV.cpuDescriptor = Unwrap(unwrappedDSV.cpuDescriptor); + if(unwrappedDSV.DepthEndingAccess.Type == D3D12_RENDER_PASS_ENDING_ACCESS_TYPE_RESOLVE) + { + unwrappedDSV.DepthEndingAccess.Resolve.pSrcResource = + Unwrap(unwrappedDSV.DepthEndingAccess.Resolve.pSrcResource); + unwrappedDSV.DepthEndingAccess.Resolve.pDstResource = + Unwrap(unwrappedDSV.DepthEndingAccess.Resolve.pDstResource); + } + if(unwrappedDSV.StencilEndingAccess.Type == D3D12_RENDER_PASS_ENDING_ACCESS_TYPE_RESOLVE) + { + unwrappedDSV.StencilEndingAccess.Resolve.pSrcResource = + Unwrap(unwrappedDSV.StencilEndingAccess.Resolve.pSrcResource); + unwrappedDSV.StencilEndingAccess.Resolve.pDstResource = + Unwrap(unwrappedDSV.StencilEndingAccess.Resolve.pDstResource); + } } SERIALISE_TIME_CALL(m_pList4->BeginRenderPass(NumRenderTargets, unwrappedRTs,