diff options
| author | Scott Mansell <phiren@gmail.com> | 2015-11-04 13:42:49 +1300 |
|---|---|---|
| committer | Scott Mansell <phiren@gmail.com> | 2015-11-04 13:42:49 +1300 |
| commit | e161e714c76e64d7dee98c93df6e143eae73b41e (patch) | |
| tree | bdd03a63a59cd2b61c19403df9a71689e22a2353 /Source/Core/VideoBackends/D3D/PixelShaderCache.cpp | |
| parent | 9cc4cffa1d3618a875b0c9070c4e26cf3074036d (diff) | |
| parent | 71d1eb3c313535b5003884bb862635d4d2f8aae9 (diff) | |
Merge pull request #3226 from Tilka/shadergen
VideoCommon: return code/uid from shader gens
Diffstat (limited to 'Source/Core/VideoBackends/D3D/PixelShaderCache.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/D3D/PixelShaderCache.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/Source/Core/VideoBackends/D3D/PixelShaderCache.cpp b/Source/Core/VideoBackends/D3D/PixelShaderCache.cpp index c361a25835..d1013c5539 100644 --- a/Source/Core/VideoBackends/D3D/PixelShaderCache.cpp +++ b/Source/Core/VideoBackends/D3D/PixelShaderCache.cpp @@ -527,12 +527,10 @@ void PixelShaderCache::Shutdown() bool PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode) { - PixelShaderUid uid; - GetPixelShaderUid(uid, dstAlphaMode, API_D3D); + PixelShaderUid uid = GetPixelShaderUid(dstAlphaMode, API_D3D); if (g_ActiveConfig.bEnableShaderDebugging) { - ShaderCode code; - GeneratePixelShaderCode(code, dstAlphaMode, API_D3D); + ShaderCode code = GeneratePixelShaderCode(dstAlphaMode, API_D3D); pixel_uid_checker.AddToIndexAndCheck(code, uid, "Pixel", "p"); } @@ -561,8 +559,7 @@ bool PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode) } // Need to compile a new shader - ShaderCode code; - GeneratePixelShaderCode(code, dstAlphaMode, API_D3D); + ShaderCode code = GeneratePixelShaderCode(dstAlphaMode, API_D3D); D3DBlob* pbytecode; if (!D3D::CompilePixelShader(code.GetBuffer(), &pbytecode)) |