diff options
| author |  Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-05-22 16:54:06 -0700 |
|---|---|---|
| committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-05-22 16:54:06 -0700 |
| commit | 4c207798b47836fedb09e93b3bb5bdd00bc91bd1 (patch) | |
| tree | 1f651364ebccde78ed33f72bcb1fa8bbb33b452b | |
| parent | 932aeb333fc7035f181688f9ea468688bc5f780d (diff) | |
| parent | 23d5df9d9c77e405f03ea1c1616e27764c290728 (diff) | |
Merge pull request #803 from lioncash/typo
gl_state: Fix a condition typo in Apply
| -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 ca8a371e..938edf1c 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() { // Textures for (unsigned texture_index = 0; texture_index < ARRAY_SIZE(texture_units); ++texture_index) { - if (texture_units[texture_index].enabled_2d != texture_units[texture_index].enabled_2d) { + if (texture_units[texture_index].enabled_2d != cur_state.texture_units[texture_index].enabled_2d) { glActiveTexture(GL_TEXTURE0 + texture_index); if (texture_units[texture_index].enabled_2d) { |