diff options
| author | Brian Paul <brianp@vmware.com> | 2009-02-07 11:21:44 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-02-07 11:21:44 -0700 |
| commit | 2a50dde0f5a44b06ba5d07ce96e4da5e264d18ae (patch) | |
| tree | 372cd8563fa3c15bfc3d9d2df872f7b26938df3e /src/mesa/main/texstate.c | |
| parent | b46611633c5da6fa23ee17bce22939fe20ef194e (diff) | |
mesa: minor clean-ups, remove unneeded conditional
Diffstat (limited to 'src/mesa/main/texstate.c')
| -rw-r--r-- | 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 be6ce18689..df40d61c93 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) { |