From: Brian Paul <brianp@vmware.com>
Date: Tue, 27 Oct 2009 19:51:51 +0000 (-0600)
Subject: mesa: avoid redundant state setting in glClientActiveTexture
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=72cb441c2feb7e5f11fc84a2d9f551da94ce2f16;p=mesa.git

mesa: avoid redundant state setting in glClientActiveTexture

Plus add code for verbose/debugging.
---

diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 16492bd7bcf..c735e18affb 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -318,11 +318,18 @@ _mesa_ClientActiveTextureARB(GLenum texture)
    GLuint texUnit = texture - GL_TEXTURE0;
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
+   if (MESA_VERBOSE & (VERBOSE_API | VERBOSE_TEXTURE))
+      _mesa_debug(ctx, "glClientActiveTexture %s\n",
+                  _mesa_lookup_enum_by_nr(texture));
+
    if (texUnit >= ctx->Const.MaxTextureCoordUnits) {
       _mesa_error(ctx, GL_INVALID_ENUM, "glClientActiveTexture(texture)");
       return;
    }
 
+   if (ctx->Array.ActiveTexture == texUnit)
+      return;
+
    FLUSH_VERTICES(ctx, _NEW_ARRAY);
    ctx->Array.ActiveTexture = texUnit;
 }