From 4d394bcdceaee3e69c3f588b8b15bf75748ff4ec Mon Sep 17 00:00:00 2001 From: baldurk Date: Thu, 7 Jul 2016 13:49:59 +0300 Subject: [PATCH] Serialise ID3D12Resource* as ResourceId properly --- renderdoc/driver/d3d12/d3d12_common.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/renderdoc/driver/d3d12/d3d12_common.cpp b/renderdoc/driver/d3d12/d3d12_common.cpp index 34fc365de..436de2baa 100644 --- a/renderdoc/driver/d3d12/d3d12_common.cpp +++ b/renderdoc/driver/d3d12/d3d12_common.cpp @@ -396,16 +396,24 @@ void Serialiser::Serialise(const char *name, D3D12_RESOURCE_BARRIER &el) switch(el.Type) { case D3D12_RESOURCE_BARRIER_TYPE_TRANSITION: - Serialise("Transition.pResource", el.Transition.pResource); + { + SerialiseObject(ID3D12Resource, "Transition.pResource", el.Transition.pResource); Serialise("Transition.Subresource", el.Transition.Subresource); Serialise("Transition.StateBefore", el.Transition.StateBefore); Serialise("Transition.StateAfter", el.Transition.StateAfter); break; + } case D3D12_RESOURCE_BARRIER_TYPE_ALIASING: - Serialise("Aliasing.pResourceBefore", el.Aliasing.pResourceBefore); - Serialise("Aliasing.pResourceAfter", el.Aliasing.pResourceAfter); + { + SerialiseObject(ID3D12Resource, "Aliasing.pResourceBefore", el.Aliasing.pResourceBefore); + SerialiseObject(ID3D12Resource, "Aliasing.pResourceAfter", el.Aliasing.pResourceAfter); break; - case D3D12_RESOURCE_BARRIER_TYPE_UAV: Serialise("UAV.pResource", el.UAV.pResource); break; + } + case D3D12_RESOURCE_BARRIER_TYPE_UAV: + { + SerialiseObject(ID3D12Resource, "UAV.pResource", el.UAV.pResource); + break; + } } }