From d104a887f1dad172d9e50ba9b1078558976fa61e Mon Sep 17 00:00:00 2001 From: baldurk Date: Fri, 23 Sep 2016 15:18:33 +0200 Subject: [PATCH] Fix calls that were unwrapping an unwrapped list --- renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp b/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp index 5ac4839cd..9589a0cac 100644 --- a/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp +++ b/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp @@ -2902,11 +2902,10 @@ bool WrappedID3D12GraphicsCommandList::Serialise_CopyBufferRegion(ID3D12Resource } else if(m_State == READING) { - ID3D12GraphicsCommandList *list = GetList(CommandList); pDstBuffer = GetResourceManager()->GetLiveAs(dst); pSrcBuffer = GetResourceManager()->GetLiveAs(src); - list->CopyBufferRegion(Unwrap(pDstBuffer), dstoffs, Unwrap(pSrcBuffer), srcoffs, num); + GetList(CommandList)->CopyBufferRegion(Unwrap(pDstBuffer), dstoffs, Unwrap(pSrcBuffer), srcoffs, num); const string desc = m_pSerialiser->GetDebugStr(); @@ -2986,9 +2985,7 @@ bool WrappedID3D12GraphicsCommandList::Serialise_CopyTextureRegion( } else if(m_State == READING) { - ID3D12GraphicsCommandList *list = GetList(CommandList); - - list->CopyTextureRegion(&dst, dstX, dstY, dstZ, &src, HasSrcBox ? &box : NULL); + GetList(CommandList)->CopyTextureRegion(&dst, dstX, dstY, dstZ, &src, HasSrcBox ? &box : NULL); const string desc = m_pSerialiser->GetDebugStr(); @@ -3079,11 +3076,10 @@ bool WrappedID3D12GraphicsCommandList::Serialise_CopyResource(ID3D12Resource *pD } else if(m_State == READING) { - ID3D12GraphicsCommandList *list = GetList(CommandList); pDstResource = GetResourceManager()->GetLiveAs(dst); pSrcResource = GetResourceManager()->GetLiveAs(src); - Unwrap(list)->CopyResource(Unwrap(pDstResource), Unwrap(pSrcResource)); + GetList(CommandList)->CopyResource(Unwrap(pDstResource), Unwrap(pSrcResource)); const string desc = m_pSerialiser->GetDebugStr(); @@ -3167,11 +3163,11 @@ bool WrappedID3D12GraphicsCommandList::Serialise_ResolveSubresource(ID3D12Resour } else if(m_State == READING) { - ID3D12GraphicsCommandList *list = GetList(CommandList); pDstResource = GetResourceManager()->GetLiveAs(dst); pSrcResource = GetResourceManager()->GetLiveAs(src); - Unwrap(list)->ResolveSubresource(Unwrap(pDstResource), dstSub, Unwrap(pSrcResource), srcSub, fmt); + GetList(CommandList) + ->ResolveSubresource(Unwrap(pDstResource), dstSub, Unwrap(pSrcResource), srcSub, fmt); const string desc = m_pSerialiser->GetDebugStr();