diff options
| author | Brian Paul <brianp@vmware.com> | 2009-09-15 12:35:41 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-09-15 12:36:55 -0600 |
| commit | b0c52e491d4f1ad4d16352d1aae77bc879b8da0a (patch) | |
| tree | e3719530cfb200aaed012a31f4b305236dfc3185 /src/mesa | |
| parent | 26860a6e2f2a30072594d4f68fbf7db6356bb674 (diff) | |
| download | external_mesa3d-b0c52e491d4f1ad4d16352d1aae77bc879b8da0a.zip external_mesa3d-b0c52e491d4f1ad4d16352d1aae77bc879b8da0a.tar.gz external_mesa3d-b0c52e491d4f1ad4d16352d1aae77bc879b8da0a.tar.bz2 | |
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.
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/common/meta.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c index 05909cf..76358a4 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++) { |