mesa: minor clean-ups, remove unneeded conditional

diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index be6ce186896f88798849710cc9d878fc2e79dbeb..df40d61c93b29abefc45f986c9e4338f02feea58 100644 (file)
--- 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) {