finally get rid of ctx->Texture._ReallyEnabled field

diff --git a/src/mesa/drivers/dos/dmesa.c b/src/mesa/drivers/dos/dmesa.c
index e45d00f269e8e053968713db2b269c56d3bbca54..ac21e8a15f3e5fb8616ca01982c65133447a9263 100644 (file)
--- a/src/mesa/drivers/dos/dmesa.c
+++ b/src/mesa/drivers/dos/dmesa.c
@@ -411,7 +411,7 @@ static swrast_tri_func dmesa_choose_tri_function (GLcontext *ctx)
 \r
  if (ctx->RenderMode != GL_RENDER)  return (swrast_tri_func) NULL;\r
  if (ctx->Polygon.SmoothFlag)       return (swrast_tri_func) NULL;\r
- if (ctx->Texture._ReallyEnabled)   return (swrast_tri_func) NULL;\r
+ if (ctx->Texture._EnabledUnits)    return (swrast_tri_func) NULL;\r
 \r
  if (ctx->Light.ShadeModel==GL_SMOOTH\r
      && swrast->_RasterMask==DEPTH_BIT\r

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index ecf78d62e631a52eaa584c248ae6257bfe40825b..e227de976dcfb56f7d72786be1ffe48d628e28a7 100644 (file)
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1,4 +1,4 @@
-/* $Id: context.c,v 1.179 2002/10/04 17:37:45 brianp Exp $ */
+/* $Id: context.c,v 1.180 2002/10/08 23:59:33 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -1306,7 +1306,6 @@ init_attrib_groups( GLcontext *ctx )
 
    /* Texture group */
    ctx->Texture.CurrentUnit = 0;      /* multitexture */
-   ctx->Texture._ReallyEnabled = 0;   /* XXX obsolete */
    ctx->Texture._EnabledUnits = 0;
    for (i=0; i<MAX_TEXTURE_UNITS; i++)
       init_texture_unit( ctx, i );

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index e345c30a4c3ddf95776d755ee1f4ce4fc07ff75c..772e1970adcf4523be7ea7df4c554e053c2c57f4 100644 (file)
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1,4 +1,4 @@
-/* $Id: mtypes.h,v 1.93 2002/10/04 19:10:08 brianp Exp $ */
+/* $Id: mtypes.h,v 1.94 2002/10/08 23:59:33 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -964,12 +964,6 @@ struct gl_texture_attrib {
    GLuint CurrentUnit;           /* Active texture unit */
 
    GLuint _EnabledUnits;        /* one bit set for each really-enabled unit */
-   /* XXX this field will go away, use _EnabledUnits instead! */
-   GLuint _ReallyEnabled;     /* enables for all texture units: */
-                             /* = (Unit[0]._ReallyEnabled << 0) | */
-                             /*   (Unit[1]._ReallyEnabled << 4) | */
-                            /*   (Unit[2]._ReallyEnabled << 8) | etc... */
-
    GLuint _GenFlags;  /* for texgen */
    GLuint _TexGenEnabled;      
    GLuint _TexMatEnabled;

diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index a5c5deafa4645888a9fa9bccf2894f603b6ea0f1..a7414241a01fa2f25699617b45b989595d2f9057 100644 (file)
--- 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) {

diff --git a/src/mesa/swrast/s_drawpix.c b/src/mesa/swrast/s_drawpix.c
index 1f3999f575ecbc05ddecaeedf0a440a6b7b416fc..1a681f8561099b5662c1311d2f87e14537a68d45 100644 (file)
--- a/src/mesa/swrast/s_drawpix.c
+++ b/src/mesa/swrast/s_drawpix.c
@@ -1,4 +1,4 @@
-/* $Id: s_drawpix.c,v 1.36 2002/08/07 00:45:07 brianp Exp $ */
+/* $Id: s_drawpix.c,v 1.37 2002/10/08 23:59:34 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -629,7 +629,7 @@ draw_depth_pixels( GLcontext *ctx, GLint x, GLint y,
 
    if (ctx->Fog.Enabled)
       _mesa_span_default_fog(ctx, &span);
-   if (ctx->Texture._ReallyEnabled)
+   if (ctx->Texture._EnabledUnits)
       _mesa_span_default_texcoords(ctx, &span);
 
    if (type==GL_UNSIGNED_SHORT && ctx->Visual.depthBits == 16
@@ -737,7 +737,7 @@ draw_rgba_pixels( GLcontext *ctx, GLint x, GLint y,
       _mesa_span_default_z(ctx, &span);
    if (ctx->Fog.Enabled)
       _mesa_span_default_fog(ctx, &span);
-   if (ctx->Texture._ReallyEnabled)
+   if (ctx->Texture._EnabledUnits)
       _mesa_span_default_texcoords(ctx, &span);
 
    if (SWRAST_CONTEXT(ctx)->_RasterMask == 0 && !zoom && x >= 0 && y >= 0