summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar ReinUsesLisp2019-01-31 16:44:11 -0300
committerGravatar ReinUsesLisp2019-02-06 22:23:40 -0300
commite147ed4fc039d4e1367567d2992300d5f7b61c55 (patch)
tree2f2e7f3f1abc08765a26ed3ac4dc8e755c0c0b01 /src
parentcmake: Fixup application string (diff)
downloadyuzu-e147ed4fc039d4e1367567d2992300d5f7b61c55.tar.gz
yuzu-e147ed4fc039d4e1367567d2992300d5f7b61c55.tar.xz
yuzu-e147ed4fc039d4e1367567d2992300d5f7b61c55.zip
gl_shader_cache: Fixup GLSL unique identifiers
Diffstat (limited to 'src')
-rw-r--r--src/video_core/renderer_opengl/gl_shader_cache.cpp4
-rw-r--r--src/video_core/renderer_opengl/gl_shader_gen.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/video_core/renderer_opengl/gl_shader_cache.cpp b/src/video_core/renderer_opengl/gl_shader_cache.cpp
index e0e624e6f..bbcd15867 100644
--- a/src/video_core/renderer_opengl/gl_shader_cache.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_cache.cpp
@@ -136,12 +136,12 @@ u64 GetUniqueIdentifier(Maxwell::ShaderProgram program_type, const ProgramCode&
136/// Creates an unspecialized program from code streams 136/// Creates an unspecialized program from code streams
137GLShader::ProgramResult CreateProgram(Maxwell::ShaderProgram program_type, ProgramCode program_code, 137GLShader::ProgramResult CreateProgram(Maxwell::ShaderProgram program_type, ProgramCode program_code,
138 ProgramCode program_code_b) { 138 ProgramCode program_code_b) {
139 GLShader::ShaderSetup setup(std::move(program_code)); 139 GLShader::ShaderSetup setup(program_code);
140 if (program_type == Maxwell::ShaderProgram::VertexA) { 140 if (program_type == Maxwell::ShaderProgram::VertexA) {
141 // VertexB is always enabled, so when VertexA is enabled, we have two vertex shaders. 141 // VertexB is always enabled, so when VertexA is enabled, we have two vertex shaders.
142 // Conventional HW does not support this, so we combine VertexA and VertexB into one 142 // Conventional HW does not support this, so we combine VertexA and VertexB into one
143 // stage here. 143 // stage here.
144 setup.SetProgramB(std::move(program_code_b)); 144 setup.SetProgramB(program_code_b);
145 } 145 }
146 setup.program.unique_identifier = 146 setup.program.unique_identifier =
147 GetUniqueIdentifier(program_type, program_code, program_code_b); 147 GetUniqueIdentifier(program_type, program_code, program_code_b);
diff --git a/src/video_core/renderer_opengl/gl_shader_gen.h b/src/video_core/renderer_opengl/gl_shader_gen.h
index fd3105de3..fba8e681b 100644
--- a/src/video_core/renderer_opengl/gl_shader_gen.h
+++ b/src/video_core/renderer_opengl/gl_shader_gen.h
@@ -29,7 +29,7 @@ struct ShaderSetup {
29 } program; 29 } program;
30 30
31 /// Used in scenarios where we have a dual vertex shaders 31 /// Used in scenarios where we have a dual vertex shaders
32 void SetProgramB(ProgramCode&& program_b) { 32 void SetProgramB(ProgramCode program_b) {
33 program.code_b = std::move(program_b); 33 program.code_b = std::move(program_b);
34 has_program_b = true; 34 has_program_b = true;
35 } 35 }