diff options
| author | Stenzek <stenzek@users.noreply.github.com> | 2017-09-06 18:33:47 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-06 18:33:47 +1000 |
| commit | 1073053df98cb019d49266c45dfe716367da0d52 (patch) | |
| tree | 878f99f2bfa98f5993cfc0bfcb9b005ec2ebf0ff /Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp | |
| parent | 2e20cd0ffdfb909a52a70217474fa5b53bd12996 (diff) | |
| parent | 84f8ebd95fc70bc3482a53f31d5ebcc5266bb4b7 (diff) | |
Merge pull request #6026 from stenzek/d3d-ubershader-logicop
ShaderGen: Output uint when logic op is enabled for D3D ubershaders
Diffstat (limited to 'Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp index 6e91717ed5..5617a928a9 100644 --- a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp +++ b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp @@ -231,6 +231,7 @@ SHADER* ProgramShaderCache::SetShader(u32 primitive_type, const GLVertexFormat* uid.puid = GetPixelShaderUid(); uid.vuid = GetVertexShaderUid(); uid.guid = GetGeometryShaderUid(primitive_type); + ClearUnusedPixelShaderUidBits(APIType::OpenGL, &uid.puid); // Check if the shader is already set if (last_entry && uid == last_uid) @@ -298,6 +299,7 @@ SHADER* ProgramShaderCache::SetUberShader(u32 primitive_type, const GLVertexForm uid.puid = UberShader::GetPixelShaderUid(); uid.vuid = UberShader::GetVertexShaderUid(); uid.guid = GetGeometryShaderUid(primitive_type); + UberShader::ClearUnusedPixelShaderUidBits(APIType::OpenGL, &uid.puid); // We need to use the ubershader vertex format with all attributes enabled. // Otherwise, the NV driver can generate variants for the vertex shaders. |