Merge pull request #10341 from AdmiralCurtiss/dx12-shader-crash

D3D12: Fix nullptr dereference when creating a shader with a name.

1 files changed, 4 insertions, 4 deletions

diff --git a/Source/Core/VideoBackends/D3D12/DX12Shader.cpp b/Source/Core/VideoBackends/D3D12/DX12Shader.cpp
index 39589b6b24..eb0c3dd1f9 100644
--- a/Source/Core/VideoBackends/D3D12/DX12Shader.cpp
+++ b/Source/Core/VideoBackends/D3D12/DX12Shader.cpp
@@ -13,10 +13,6 @@ namespace DX12
 DXShader::DXShader(ShaderStage stage, BinaryData bytecode, std::string_view name)
     : D3DCommon::Shader(stage, std::move(bytecode)), m_name(UTF8ToWString(name))
 {
-  if (!m_name.empty())
-  {
-    m_compute_pipeline->SetName(m_name.c_str());
-  }
 }
 
 DXShader::~DXShader() = default;
@@ -56,6 +52,10 @@ bool DXShader::CreateComputePipeline()
   HRESULT hr = g_dx_context->GetDevice()->CreateComputePipelineState(
       &desc, IID_PPV_ARGS(&m_compute_pipeline));
   CHECK(SUCCEEDED(hr), "Creating compute pipeline failed");
+
+  if (m_compute_pipeline && !m_name.empty())
+    m_compute_pipeline->SetName(m_name.c_str());
+
   return SUCCEEDED(hr);
 }