From e147ed4fc039d4e1367567d2992300d5f7b61c55 Mon Sep 17 00:00:00 2001 From: ReinUsesLisp Date: Thu, 31 Jan 2019 16:44:11 -0300 Subject: gl_shader_cache: Fixup GLSL unique identifiers --- src/video_core/renderer_opengl/gl_shader_cache.cpp | 4 ++-- src/video_core/renderer_opengl/gl_shader_gen.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/video_core') 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& /// Creates an unspecialized program from code streams GLShader::ProgramResult CreateProgram(Maxwell::ShaderProgram program_type, ProgramCode program_code, ProgramCode program_code_b) { - GLShader::ShaderSetup setup(std::move(program_code)); + GLShader::ShaderSetup setup(program_code); if (program_type == Maxwell::ShaderProgram::VertexA) { // VertexB is always enabled, so when VertexA is enabled, we have two vertex shaders. // Conventional HW does not support this, so we combine VertexA and VertexB into one // stage here. - setup.SetProgramB(std::move(program_code_b)); + setup.SetProgramB(program_code_b); } setup.program.unique_identifier = 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 { } program; /// Used in scenarios where we have a dual vertex shaders - void SetProgramB(ProgramCode&& program_b) { + void SetProgramB(ProgramCode program_b) { program.code_b = std::move(program_b); has_program_b = true; } -- cgit v1.2.3