From 7244491206dfa05f6c517650253cdd83f95f38ca Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Fri, 16 Sep 2016 11:52:34 +0200
Subject: [PATCH] Check that buffer exists before restoring it

---
 renderdoc/driver/d3d12/d3d12_common.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/renderdoc/driver/d3d12/d3d12_common.cpp b/renderdoc/driver/d3d12/d3d12_common.cpp
index c79f586cb..7cf1ee5ca 100644
--- a/renderdoc/driver/d3d12/d3d12_common.cpp
+++ b/renderdoc/driver/d3d12/d3d12_common.cpp
@@ -549,7 +549,11 @@ void Serialiser::Serialise(const char *name, D3D12_CONSTANT_BUFFER_VIEW_DESC &el
 
   if(m_Mode == READING)
   {
-    ID3D12Resource *res = rm->GetLiveAs<ID3D12Resource>(buffer);
+    ID3D12Resource *res = NULL;
+
+    if(buffer != ResourceId() && rm->HasLiveResource(buffer))
+      res = rm->GetLiveAs<ID3D12Resource>(buffer);
+
     if(res)
       el.BufferLocation = res->GetGPUVirtualAddress() + offs;
     else