From: Brian Paul <brianp@vmware.com>
Date: Tue, 15 Sep 2009 18:35:41 +0000 (-0600)
Subject: mesa: remove incorrect texture state check
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b0c52e491d4f1ad4d16352d1aae77bc879b8da0a;p=mesa.git

mesa: remove incorrect texture state check

Fixes incorrectly textured bitmap text in engine demo.
It's incorrect to test the texture enable bits here since they may have
been changed by disabling the shader above.  Optimization is still possible
but will have to be reexamined.
---

diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index 05909cfa307..76358a481fc 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -415,11 +415,6 @@ _mesa_meta_begin(GLcontext *ctx, GLbitfield state)
       save->ClientActiveUnit = ctx->Array.ActiveTexture;
       save->EnvMode = ctx->Texture.Unit[0].EnvMode;
 
-      if (ctx->Texture._EnabledUnits |
-          ctx->Texture._EnabledCoordUnits |
-          ctx->Texture._TexGenEnabled |
-          ctx->Texture._TexMatEnabled) {
-
       /* Disable all texture units */
       for (u = 0; u < ctx->Const.MaxTextureUnits; u++) {
          save->TexEnabled[u] = ctx->Texture.Unit[u].Enabled;
@@ -438,7 +433,6 @@ _mesa_meta_begin(GLcontext *ctx, GLbitfield state)
             _mesa_set_enable(ctx, GL_TEXTURE_GEN_Q, GL_FALSE);
          }
       }
-      }
 
       /* save current texture objects for unit[0] only */
       for (tgt = 0; tgt < NUM_TEXTURE_TARGETS; tgt++) {