From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Sun, 23 Feb 2003 04:12:57 +0000 (+0000)
Subject: test if active texture is really changed in _mesa_ActiveTexture()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=25060c1f29f3ad52f9a3b5f6f68df238dbc2de8a;p=mesa.git

test if active texture is really changed in _mesa_ActiveTexture()
---

diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index e640cea001d..b1b7535a33f 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -1,4 +1,4 @@
-/* $Id: texstate.c,v 1.93 2003/01/21 23:58:29 brianp Exp $ */
+/* $Id: texstate.c,v 1.94 2003/02/23 04:12:57 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -2447,7 +2447,7 @@ void
 _mesa_ActiveTextureARB( GLenum target )
 {
    GET_CURRENT_CONTEXT(ctx);
-   GLuint texUnit = target - GL_TEXTURE0;
+   const GLuint texUnit = target - GL_TEXTURE0;
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
    if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE))
@@ -2460,6 +2460,9 @@ _mesa_ActiveTextureARB( GLenum target )
       return;
    }
 
+   if (ctx->Texture.CurrentUnit == texUnit)
+      return;
+
    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
 
    ctx->Texture.CurrentUnit = texUnit;