Module: Mesa Branch: master Commit: 2a50dde0f5a44b06ba5d07ce96e4da5e264d18ae URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2a50dde0f5a44b06ba5d07ce96e4da5e264d18ae
Author: Brian Paul <[email protected]> Date: Sat Feb 7 11:21:44 2009 -0700 mesa: minor clean-ups, remove unneeded conditional --- src/mesa/main/texstate.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c index be6ce18..df40d61 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) { _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
