summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Valle <sebastianvalle@uninorte.edu.co>2019-05-19 15:35:47 +0200
committerGitHub <noreply@github.com>2019-05-19 15:35:47 +0200
commitb42ca9888d054cabf8ce9b9ed503ac5b4be31aca (patch)
tree2b33be0c231b36abfe5517337310a139164a1e9d
parentMerge pull request #2473 from lioncash/vs2019 (diff)
parentgl_shader_gen: std::move objects where applicable (diff)
downloadyuzu-b42ca9888d054cabf8ce9b9ed503ac5b4be31aca.tar
yuzu-b42ca9888d054cabf8ce9b9ed503ac5b4be31aca.tar.gz
yuzu-b42ca9888d054cabf8ce9b9ed503ac5b4be31aca.tar.bz2
yuzu-b42ca9888d054cabf8ce9b9ed503ac5b4be31aca.tar.lz
yuzu-b42ca9888d054cabf8ce9b9ed503ac5b4be31aca.tar.xz
yuzu-b42ca9888d054cabf8ce9b9ed503ac5b4be31aca.tar.zst
yuzu-b42ca9888d054cabf8ce9b9ed503ac5b4be31aca.zip
-rw-r--r--src/video_core/renderer_opengl/gl_shader_gen.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/video_core/renderer_opengl/gl_shader_gen.cpp b/src/video_core/renderer_opengl/gl_shader_gen.cpp
index 6abf948f8..7ab0b4553 100644
--- a/src/video_core/renderer_opengl/gl_shader_gen.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_gen.cpp
@@ -33,14 +33,14 @@ layout (std140, binding = EMULATION_UBO_BINDING) uniform vs_config {
};
)";
- ShaderIR program_ir(setup.program.code, PROGRAM_OFFSET);
+ const ShaderIR program_ir(setup.program.code, PROGRAM_OFFSET);
ProgramResult program =
Decompile(device, program_ir, Maxwell3D::Regs::ShaderStage::Vertex, "vertex");
out += program.first;
if (setup.IsDualProgram()) {
- ShaderIR program_ir_b(setup.program.code_b, PROGRAM_OFFSET);
+ const ShaderIR program_ir_b(setup.program.code_b, PROGRAM_OFFSET);
ProgramResult program_b =
Decompile(device, program_ir_b, Maxwell3D::Regs::ShaderStage::Vertex, "vertex_b");
@@ -76,7 +76,7 @@ void main() {
}
})";
- return {out, program.second};
+ return {std::move(out), std::move(program.second)};
}
ProgramResult GenerateGeometryShader(const Device& device, const ShaderSetup& setup) {
@@ -97,7 +97,7 @@ layout (std140, binding = EMULATION_UBO_BINDING) uniform gs_config {
};
)";
- ShaderIR program_ir(setup.program.code, PROGRAM_OFFSET);
+ const ShaderIR program_ir(setup.program.code, PROGRAM_OFFSET);
ProgramResult program =
Decompile(device, program_ir, Maxwell3D::Regs::ShaderStage::Geometry, "geometry");
out += program.first;
@@ -107,7 +107,7 @@ void main() {
execute_geometry();
};)";
- return {out, program.second};
+ return {std::move(out), std::move(program.second)};
}
ProgramResult GenerateFragmentShader(const Device& device, const ShaderSetup& setup) {
@@ -160,7 +160,7 @@ bool AlphaFunc(in float value) {
}
)";
- ShaderIR program_ir(setup.program.code, PROGRAM_OFFSET);
+ const ShaderIR program_ir(setup.program.code, PROGRAM_OFFSET);
ProgramResult program =
Decompile(device, program_ir, Maxwell3D::Regs::ShaderStage::Fragment, "fragment");
@@ -172,7 +172,7 @@ void main() {
}
)";
- return {out, program.second};
+ return {std::move(out), std::move(program.second)};
}
} // namespace OpenGL::GLShader