mesa: minor clean-ups, remove unneeded conditional

This commit is contained in:
Brian Paul 2009-02-07 11:21:44 -07:00
parent b46611633c
commit 2a50dde0f5

View file

@ -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) {