From 49e05bee72599bec0be5b42e8a170ff8e03ebab0 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Tue, 13 Apr 2021 16:27:58 +0100
Subject: [PATCH] Add error checking for textures failing to create

---
 renderdoc/driver/d3d11/d3d11_initstate.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/renderdoc/driver/d3d11/d3d11_initstate.cpp b/renderdoc/driver/d3d11/d3d11_initstate.cpp
index 36bf28593..0bd50ee19 100644
--- a/renderdoc/driver/d3d11/d3d11_initstate.cpp
+++ b/renderdoc/driver/d3d11/d3d11_initstate.cpp
@@ -789,7 +789,16 @@ bool WrappedID3D11Device::Serialise_InitialState(SerialiserType &ser, ResourceId
             ID3D11Texture2D *contentsMS = NULL;
             hr = m_pDevice->CreateTexture2D(&desc, NULL, &contentsMS);
 
-            m_DebugManager->CopyArrayToTex2DMS(contentsMS, dataTex, ~0U);
+            if(FAILED(hr) || contentsMS == NULL)
+            {
+              RDCERR("Failed to create MSAA texture for Texture2D initial contents HRESULT: %s",
+                     ToStr(hr).c_str());
+              ret = false;
+            }
+            else
+            {
+              m_DebugManager->CopyArrayToTex2DMS(contentsMS, dataTex, ~0U);
+            }
 
             SAFE_RELEASE(dataTex);
             dataTex = contentsMS;