Browse Source
Merge pull request #901 from lioncash/ref
gl_shader_manager: Take ShaderSetup instances by const reference in UseProgrammableVertexShader() and UseProgrammableFragmentShader()
pull/15/merge
bunnei
8 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
2 additions and
2 deletions
-
src/video_core/renderer_opengl/gl_shader_manager.h
|
|
@ -105,14 +105,14 @@ public: |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
ShaderEntries UseProgrammableVertexShader(const MaxwellVSConfig& config, |
|
|
ShaderEntries UseProgrammableVertexShader(const MaxwellVSConfig& config, |
|
|
const ShaderSetup setup) { |
|
|
|
|
|
|
|
|
const ShaderSetup& setup) { |
|
|
ShaderEntries result; |
|
|
ShaderEntries result; |
|
|
std::tie(current.vs, result) = vertex_shaders.Get(config, setup); |
|
|
std::tie(current.vs, result) = vertex_shaders.Get(config, setup); |
|
|
return result; |
|
|
return result; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
ShaderEntries UseProgrammableFragmentShader(const MaxwellFSConfig& config, |
|
|
ShaderEntries UseProgrammableFragmentShader(const MaxwellFSConfig& config, |
|
|
const ShaderSetup setup) { |
|
|
|
|
|
|
|
|
const ShaderSetup& setup) { |
|
|
ShaderEntries result; |
|
|
ShaderEntries result; |
|
|
std::tie(current.fs, result) = fragment_shaders.Get(config, setup); |
|
|
std::tie(current.fs, result) = fragment_shaders.Get(config, setup); |
|
|
return result; |
|
|
return result; |
|
|
|