The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-26 07:45:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
D3D12: Fix nullptr dereference when creating a shader with a name.
This commit is contained in:
Léo Lam 2022-01-03 17:43:30 +01:00 committed by GitHub
commit a026ef30d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/VideoBackends/D3D12/DX12Shader.cpp
View File

@ -13,10 +13,6 @@ namespace DX12
DXShader::DXShader(ShaderStage stage, BinaryData bytecode, std::string_view name) DXShader::DXShader(ShaderStage stage, BinaryData bytecode, std::string_view name)
: D3DCommon::Shader(stage, std::move(bytecode)), m_name(UTF8ToWString(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; DXShader::~DXShader() = default;
@ -56,6 +52,10 @@ bool DXShader::CreateComputePipeline()
HRESULT hr = g_dx_context->GetDevice()->CreateComputePipelineState( HRESULT hr = g_dx_context->GetDevice()->CreateComputePipelineState(
&desc, IID_PPV_ARGS(&m_compute_pipeline)); &desc, IID_PPV_ARGS(&m_compute_pipeline));
CHECK(SUCCEEDED(hr), "Creating compute pipeline failed"); 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); return SUCCEEDED(hr);
} }