From: Brian Paul <brianp@vmware.com>
Date: Sat, 7 Feb 2009 18:21:44 +0000 (-0700)
Subject: mesa: minor clean-ups, remove unneeded conditional
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2a50dde0f5a44b06ba5d07ce96e4da5e264d18ae;p=mesa.git

mesa: minor clean-ups, remove unneeded conditional
---

diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index be6ce186896..df40d61c93b 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -468,9 +468,8 @@ update_texture_state( GLcontext *ctx )
       }
    }
 
-   ctx->NewState |= _NEW_TEXTURE; /* TODO: only set this if there are 
-				   * actual changes. 
-				   */
+   /* TODO: only set this if there are actual changes */
+   ctx->NewState |= _NEW_TEXTURE;
 
    ctx->Texture._EnabledUnits = 0;
    ctx->Texture._GenFlags = 0;
@@ -540,8 +539,9 @@ update_texture_state( GLcontext *ctx )
          continue;
       }
 
-      if (texUnit->_ReallyEnabled)
-         ctx->Texture._EnabledUnits |= (1 << unit);
+      /* if we get here, we know this texture unit is enabled */
+
+      ctx->Texture._EnabledUnits |= (1 << unit);
 
       if (texUnit->EnvMode == GL_COMBINE ||
           texUnit->EnvMode == GL_COMBINE4_NV) {