diff options
author | Brian Paul <brian.paul@tungstengraphics.com> | 2000-11-17 02:42:32 +0000 |
---|---|---|
committer | Brian Paul <brian.paul@tungstengraphics.com> | 2000-11-17 02:42:32 +0000 |
commit | 3efc845d1b14f3376a4bb81a44972055bc8502db (patch) | |
tree | 0e9302516a22c38fba1a95064c8709192c61ba83 | |
parent | dc203452eb9d6dda2193405ef95bfb633f3135b3 (diff) |
yet another tweak to ctx->NewState |= NEW_TEXTURING in _mesa_BindTexture()
-rw-r--r-- | src/mesa/main/texobj.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c index f1e98bd44d..955efe7afc 100644 --- a/src/mesa/main/texobj.c +++ b/src/mesa/main/texobj.c @@ -1,4 +1,4 @@ -/* $Id: texobj.c,v 1.23.4.7 2000/11/11 20:23:23 brianp Exp $ */ +/* $Id: texobj.c,v 1.23.4.8 2000/11/17 02:42:32 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -553,6 +553,8 @@ _mesa_BindTexture( GLenum target, GLuint texName ) return; } + ctx->NewState |= NEW_TEXTURING; + if (oldTexObj->Name == texName) return; @@ -613,17 +615,12 @@ _mesa_BindTexture( GLenum target, GLuint texName ) || (oldTexObj->Image[0] && newTexObj->Image[0] && (oldTexObj->Image[0]->Format!=newTexObj->Image[0]->Format)))) { - ctx->NewState |= (NEW_RASTER_OPS | NEW_TEXTURING); + ctx->NewState |= NEW_RASTER_OPS; } - if (oldTexObj->Complete != newTexObj->Complete) - ctx->NewState |= NEW_TEXTURING; - /* Pass BindTexture call to device driver */ if (ctx->Driver.BindTexture) { (*ctx->Driver.BindTexture)( ctx, target, newTexObj ); - /* Make sure the Driver.UpdateState() function gets called! */ - ctx->NewState |= NEW_TEXTURING; } if (oldTexObj->Name > 0) { |