diff options
author | ReinUsesLisp <reinuseslisp@airmail.cc> | 2019-01-31 20:44:11 +0100 |
---|---|---|
committer | ReinUsesLisp <reinuseslisp@airmail.cc> | 2019-02-07 02:23:40 +0100 |
commit | e147ed4fc039d4e1367567d2992300d5f7b61c55 (patch) | |
tree | 2f2e7f3f1abc08765a26ed3ac4dc8e755c0c0b01 | |
parent | cmake: Fixup application string (diff) | |
download | yuzu-e147ed4fc039d4e1367567d2992300d5f7b61c55.tar yuzu-e147ed4fc039d4e1367567d2992300d5f7b61c55.tar.gz yuzu-e147ed4fc039d4e1367567d2992300d5f7b61c55.tar.bz2 yuzu-e147ed4fc039d4e1367567d2992300d5f7b61c55.tar.lz yuzu-e147ed4fc039d4e1367567d2992300d5f7b61c55.tar.xz yuzu-e147ed4fc039d4e1367567d2992300d5f7b61c55.tar.zst yuzu-e147ed4fc039d4e1367567d2992300d5f7b61c55.zip |
-rw-r--r-- | src/video_core/renderer_opengl/gl_shader_cache.cpp | 4 | ||||
-rw-r--r-- | src/video_core/renderer_opengl/gl_shader_gen.h | 2 |
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& /// 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; } |