diff options
| author | 2018-08-02 23:00:56 -0400 | |
|---|---|---|
| committer | 2018-08-02 23:00:56 -0400 | |
| commit | 52da0ce399c67a6da58be6ad29c98fa88d1c22cc (patch) | |
| tree | 34a7bc988ca95cca192a55be356bd9bee455309a | |
| parent | Merge pull request #899 from lioncash/unused (diff) | |
| parent | gl_shader_manager: Take ShaderSetup instances by const reference in UseProgra... (diff) | |
| download | yuzu-52da0ce399c67a6da58be6ad29c98fa88d1c22cc.tar.gz yuzu-52da0ce399c67a6da58be6ad29c98fa88d1c22cc.tar.xz yuzu-52da0ce399c67a6da58be6ad29c98fa88d1c22cc.zip | |
Merge pull request #901 from lioncash/ref
gl_shader_manager: Take ShaderSetup instances by const reference in UseProgrammableVertexShader() and UseProgrammableFragmentShader()
| -rw-r--r-- | src/video_core/renderer_opengl/gl_shader_manager.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/video_core/renderer_opengl/gl_shader_manager.h b/src/video_core/renderer_opengl/gl_shader_manager.h index e29d551e1..2214c348a 100644 --- a/src/video_core/renderer_opengl/gl_shader_manager.h +++ b/src/video_core/renderer_opengl/gl_shader_manager.h | |||
| @@ -105,14 +105,14 @@ public: | |||
| 105 | } | 105 | } |
| 106 | 106 | ||
| 107 | ShaderEntries UseProgrammableVertexShader(const MaxwellVSConfig& config, | 107 | ShaderEntries UseProgrammableVertexShader(const MaxwellVSConfig& config, |
| 108 | const ShaderSetup setup) { | 108 | const ShaderSetup& setup) { |
| 109 | ShaderEntries result; | 109 | ShaderEntries result; |
| 110 | std::tie(current.vs, result) = vertex_shaders.Get(config, setup); | 110 | std::tie(current.vs, result) = vertex_shaders.Get(config, setup); |
| 111 | return result; | 111 | return result; |
| 112 | } | 112 | } |
| 113 | 113 | ||
| 114 | ShaderEntries UseProgrammableFragmentShader(const MaxwellFSConfig& config, | 114 | ShaderEntries UseProgrammableFragmentShader(const MaxwellFSConfig& config, |
| 115 | const ShaderSetup setup) { | 115 | const ShaderSetup& setup) { |
| 116 | ShaderEntries result; | 116 | ShaderEntries result; |
| 117 | std::tie(current.fs, result) = fragment_shaders.Get(config, setup); | 117 | std::tie(current.fs, result) = fragment_shaders.Get(config, setup); |
| 118 | return result; | 118 | return result; |