diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2004-01-23 14:46:27 +0000 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2004-01-23 14:46:27 +0000 |
| commit | 3abf746a7eae52220485cd031aecec2ca9e6103e (patch) | |
| tree | c5b0f5e9e1751cb18043824027b2e0c2b06b1b03 /src/mesa/main/texstate.c | |
| parent | 5c161cf615a073a9a69916957babdd234eba2174 (diff) | |
Don't set extra bits in FLUSH_VERTICES, fix several state bugs.
Diffstat (limited to 'src/mesa/main/texstate.c')
| -rw-r--r-- | src/mesa/main/texstate.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c index b1554ab3c8..e27c42e07b 100644 --- a/src/mesa/main/texstate.c +++ b/src/mesa/main/texstate.c @@ -2703,6 +2703,10 @@ update_texture_state( GLcontext *ctx ) { GLuint unit; + ctx->NewState |= _NEW_TEXTURE; /* TODO: only set this if there are + * actual changes. + */ + ctx->Texture._EnabledUnits = 0; ctx->Texture._GenFlags = 0; ctx->Texture._TexMatEnabled = 0; @@ -2834,7 +2838,7 @@ void _mesa_update_texture( GLcontext *ctx, GLuint new_state ) if (new_state & _NEW_TEXTURE_MATRIX) update_texture_matrices( ctx ); - if (new_state & _NEW_TEXTURE) + if (new_state & (_NEW_TEXTURE | _NEW_PROGRAM)) update_texture_state( ctx ); } |