summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/state.c
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2002-10-08 23:59:33 +0000
committerBrian Paul <[email protected]>2002-10-08 23:59:33 +0000
commit59c5cf35c92e969f66eefd27809e72089b731701 (patch)
tree7b0abf04f0eeb0726f2e02458b527b4bea81cf86 /src/mesa/main/state.c
parent614301facaf7f9943270f227a5c6503b47871a90 (diff)
finally get rid of ctx->Texture._ReallyEnabled field
Diffstat (limited to 'src/mesa/main/state.c')
-rw-r--r--src/mesa/main/state.c14
1 files changed, 3 insertions, 11 deletions
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index a5c5deafa46..a7414241a01 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -1,4 +1,4 @@
-/* $Id: state.c,v 1.93 2002/10/02 21:44:08 brianp Exp $ */
+/* $Id: state.c,v 1.94 2002/10/08 23:59:33 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -772,7 +772,6 @@ update_texture_state( GLcontext *ctx )
{
GLuint unit;
- ctx->Texture._ReallyEnabled = 0; /* XXX obsolete */
ctx->Texture._EnabledUnits = 0;
ctx->Texture._GenFlags = 0;
ctx->_NeedNormals &= ~NEED_NORMALS_TEXGEN;
@@ -854,15 +853,8 @@ update_texture_state( GLcontext *ctx )
continue;
}
- /* Texture._ReallyEnabled records the enable state for all units in
- * one word.
- */
- {
- GLuint flag = texUnit->_ReallyEnabled << (unit * NUM_TEXTURE_TARGETS);
- ctx->Texture._ReallyEnabled |= flag; /* XXX obsolete field! */
- if (texUnit->_ReallyEnabled)
- ctx->Texture._EnabledUnits |= (1 << unit);
- }
+ if (texUnit->_ReallyEnabled)
+ ctx->Texture._EnabledUnits |= (1 << unit);
if (texUnit->TexGenEnabled) {
if (texUnit->TexGenEnabled & S_BIT) {