diff options
author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-08-06 03:55:22 +0200 |
---|---|---|
committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-08-06 03:55:22 +0200 |
commit | ff68db61bc737327ae122586bedcaf2ce21619ea (patch) | |
tree | 72daac7672d1f8bcef4d686ed09544546202725d /src/video_core/renderer_opengl/gl_state.cpp | |
parent | Merge pull request #1018 from bbarenblat/master (diff) | |
download | yuzu-ff68db61bc737327ae122586bedcaf2ce21619ea.tar yuzu-ff68db61bc737327ae122586bedcaf2ce21619ea.tar.gz yuzu-ff68db61bc737327ae122586bedcaf2ce21619ea.tar.bz2 yuzu-ff68db61bc737327ae122586bedcaf2ce21619ea.tar.lz yuzu-ff68db61bc737327ae122586bedcaf2ce21619ea.tar.xz yuzu-ff68db61bc737327ae122586bedcaf2ce21619ea.tar.zst yuzu-ff68db61bc737327ae122586bedcaf2ce21619ea.zip |
Diffstat (limited to '')
-rw-r--r-- | src/video_core/renderer_opengl/gl_state.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/video_core/renderer_opengl/gl_state.cpp b/src/video_core/renderer_opengl/gl_state.cpp index 9efc15337..7ccf474e1 100644 --- a/src/video_core/renderer_opengl/gl_state.cpp +++ b/src/video_core/renderer_opengl/gl_state.cpp @@ -40,7 +40,6 @@ OpenGLState::OpenGLState() { logic_op = GL_COPY; for (auto& texture_unit : texture_units) { - texture_unit.enabled_2d = false; texture_unit.texture_2d = 0; } @@ -147,16 +146,9 @@ void OpenGLState::Apply() { // Textures for (unsigned texture_index = 0; texture_index < ARRAY_SIZE(texture_units); ++texture_index) { - if (texture_units[texture_index].enabled_2d != cur_state.texture_units[texture_index].enabled_2d || - texture_units[texture_index].texture_2d != cur_state.texture_units[texture_index].texture_2d) { - + if (texture_units[texture_index].texture_2d != cur_state.texture_units[texture_index].texture_2d) { glActiveTexture(GL_TEXTURE0 + texture_index); - - if (texture_units[texture_index].enabled_2d) { - glBindTexture(GL_TEXTURE_2D, texture_units[texture_index].texture_2d); - } else { - glBindTexture(GL_TEXTURE_2D, 0); - } + glBindTexture(GL_TEXTURE_2D, texture_units[texture_index].texture_2d); } } |