aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/video_core/renderer_opengl/gl_state.cpp
diff options
context:
space:
mode:
authorGravatar Yuri Kunde Schlesner <yuriks@yuriks.net>2015-08-05 22:55:22 -0300
committerGravatar Yuri Kunde Schlesner <yuriks@yuriks.net>2015-08-05 22:55:22 -0300
commitff68db61bc737327ae122586bedcaf2ce21619ea (patch)
tree72daac7672d1f8bcef4d686ed09544546202725d /src/video_core/renderer_opengl/gl_state.cpp
parentb6c241d667dd6a22b1dadaf9c2d6ddaac2e93de5 (diff)
OpenGL: Remove redundant texture.enable_2d field from OpenGLState
All uses of this field where it's false can just set the texture id to 0 instead.
Diffstat (limited to 'src/video_core/renderer_opengl/gl_state.cpp')
-rw-r--r--src/video_core/renderer_opengl/gl_state.cpp12
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 9efc1533..7ccf474e 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);
}
}