diff options
| author |  bunnei | 2018-08-03 14:07:30 -0400 |
|---|---|---|
| committer |  GitHub | 2018-08-03 14:07:30 -0400 |
| commit | 64806a8397b58e2785297c9de2692edd62fc01c2 (patch) | |
| tree | 676d388c5fd7fc630b2d79af50c7bac11677dd0b /src | |
| parent | Added ability to change username & language code in the settings ui. Added IP... (diff) | |
| parent | gl_shader_manager: Make ProgramManager's GetCurrentProgramStage() a const mem... (diff) | |
| download | yuzu-64806a8397b58e2785297c9de2692edd62fc01c2.tar.gz yuzu-64806a8397b58e2785297c9de2692edd62fc01c2.tar.xz yuzu-64806a8397b58e2785297c9de2692edd62fc01c2.zip | |
Merge pull request #909 from lioncash/const
gl_shader_manager: Make ProgramManager's GetCurrentProgramStage() a const member function
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_shader_manager.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/video_core/renderer_opengl/gl_shader_manager.h b/src/video_core/renderer_opengl/gl_shader_manager.h index 2214c348a..716933a0b 100644 --- a/src/video_core/renderer_opengl/gl_shader_manager.h +++ b/src/video_core/renderer_opengl/gl_shader_manager.h | |||
| @@ -118,7 +118,7 @@ public: | |||
| 118 | return result; | 118 | return result; |
| 119 | } | 119 | } |
| 120 | 120 | ||
| 121 | GLuint GetCurrentProgramStage(Maxwell3D::Regs::ShaderStage stage) { | 121 | GLuint GetCurrentProgramStage(Maxwell3D::Regs::ShaderStage stage) const { |
| 122 | switch (stage) { | 122 | switch (stage) { |
| 123 | case Maxwell3D::Regs::ShaderStage::Vertex: | 123 | case Maxwell3D::Regs::ShaderStage::Vertex: |
| 124 | return current.vs; | 124 | return current.vs; |