diff options
| author |  Yuri Kunde Schlesner | 2015-05-22 16:54:06 -0700 |
|---|---|---|
| committer | Yuri Kunde Schlesner | 2015-05-22 16:54:06 -0700 |
| commit | 4c207798b47836fedb09e93b3bb5bdd00bc91bd1 (patch) | |
| tree | 1f651364ebccde78ed33f72bcb1fa8bbb33b452b /src | |
| parent | Merge pull request #802 from bunnei/vfp-trace-log (diff) | |
| parent | gl_state: Fix a condition typo in Apply (diff) | |
| download | yuzu-4c207798b47836fedb09e93b3bb5bdd00bc91bd1.tar.gz yuzu-4c207798b47836fedb09e93b3bb5bdd00bc91bd1.tar.xz yuzu-4c207798b47836fedb09e93b3bb5bdd00bc91bd1.zip | |
Merge pull request #803 from lioncash/typo
gl_state: Fix a condition typo in Apply
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_state.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/video_core/renderer_opengl/gl_state.cpp b/src/video_core/renderer_opengl/gl_state.cpp index ca8a371e7..938edf1c2 100644 --- a/src/video_core/renderer_opengl/gl_state.cpp +++ b/src/video_core/renderer_opengl/gl_state.cpp | |||
| @@ -120,7 +120,7 @@ const void OpenGLState::Apply() { | |||
| 120 | 120 | ||
| 121 | // Textures | 121 | // Textures |
| 122 | for (unsigned texture_index = 0; texture_index < ARRAY_SIZE(texture_units); ++texture_index) { | 122 | for (unsigned texture_index = 0; texture_index < ARRAY_SIZE(texture_units); ++texture_index) { |
| 123 | if (texture_units[texture_index].enabled_2d != texture_units[texture_index].enabled_2d) { | 123 | if (texture_units[texture_index].enabled_2d != cur_state.texture_units[texture_index].enabled_2d) { |
| 124 | glActiveTexture(GL_TEXTURE0 + texture_index); | 124 | glActiveTexture(GL_TEXTURE0 + texture_index); |
| 125 | 125 | ||
| 126 | if (texture_units[texture_index].enabled_2d) { | 126 | if (texture_units[texture_index].enabled_2d) { |