diff options
| author | Stenzek <stenzek@users.noreply.github.com> | 2017-09-07 14:39:56 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-07 14:39:56 +1000 |
| commit | 5d6dac54104295f2c594c91006d2ee2de486c528 (patch) | |
| tree | b936eea8a22173308d21521c508224b7092f1e91 /Source/Core/VideoBackends/D3D/PixelShaderCache.cpp | |
| parent | c97a799c5fcf4220a6311918f3a2a01f44f90a4a (diff) | |
| parent | b573319f8f2f0f4deab98b9261b585610ecb6143 (diff) | |
Merge pull request #6031 from stenzek/d3d-crash
D3D: Fix shader compile error with logicop and alpha test enabled
Diffstat (limited to 'Source/Core/VideoBackends/D3D/PixelShaderCache.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/D3D/PixelShaderCache.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/VideoBackends/D3D/PixelShaderCache.cpp b/Source/Core/VideoBackends/D3D/PixelShaderCache.cpp index 326f840db1..3625cf4e0c 100644 --- a/Source/Core/VideoBackends/D3D/PixelShaderCache.cpp +++ b/Source/Core/VideoBackends/D3D/PixelShaderCache.cpp @@ -644,7 +644,7 @@ bool PixelShaderCache::SetShader() ShaderCode code = GeneratePixelShaderCode(APIType::D3D, ShaderHostConfig::GetCurrent(), uid.GetUidData()); D3D::CompilePixelShader(code.GetBuffer(), &bytecode); - if (!InsertByteCode(uid, bytecode->Data(), bytecode->Size())) + if (!InsertByteCode(uid, bytecode ? bytecode->Data() : nullptr, bytecode ? bytecode->Size() : 0)) { SAFE_RELEASE(bytecode); return false; @@ -687,7 +687,7 @@ bool PixelShaderCache::SetUberShader() ShaderCode code = UberShader::GenPixelShader(APIType::D3D, ShaderHostConfig::GetCurrent(), uid.GetUidData()); D3D::CompilePixelShader(code.GetBuffer(), &bytecode); - if (!InsertByteCode(uid, bytecode->Data(), bytecode->Size())) + if (!InsertByteCode(uid, bytecode ? bytecode->Data() : nullptr, bytecode ? bytecode->Size() : 0)) { SAFE_RELEASE(bytecode); return false; |