renamed Current.ByteColor Current.Color

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index ab8c4dc0651f803edcdf98a63c6b5deea2dbc44a..6f46041887ad26638acd45b7fda114d18785d9a9 100644 (file)
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1,4 +1,4 @@
-/* $Id: context.c,v 1.97 2000/10/28 18:34:48 brianp Exp $ */
+/* $Id: context.c,v 1.98 2000/10/29 19:02:23 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -695,7 +695,7 @@ init_fallback_arrays( GLcontext *ctx )
    cl->Type = GL_UNSIGNED_BYTE;
    cl->Stride = 0;
    cl->StrideB = 0;
-   cl->Ptr = (void *) ctx->Current.ByteColor;
+   cl->Ptr = (void *) ctx->Current.Color;
    cl->Enabled = 1;
 
    cl = &ctx->Fallback.SecondaryColor;
@@ -884,7 +884,7 @@ init_attrib_groups( GLcontext *ctx )
    ctx->Color.MultiDrawBuffer = GL_FALSE;
 
    /* Current group */
-   ASSIGN_4V( ctx->Current.ByteColor, CHAN_MAX, CHAN_MAX, CHAN_MAX, CHAN_MAX );
+   ASSIGN_4V( ctx->Current.Color, CHAN_MAX, CHAN_MAX, CHAN_MAX, CHAN_MAX );
    ctx->Current.Index = 1;
    for (i=0; i<MAX_TEXTURE_UNITS; i++)
       ASSIGN_4V( ctx->Current.Texcoord[i], 0.0, 0.0, 0.0, 1.0 );

diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c
index 4ccb128a485e3d649f54b30524f8d40f2443896a..4b2fbacd6ad7ca7cd783d505dccd81f3bbe4389b 100644 (file)
--- a/src/mesa/main/drawpix.c
+++ b/src/mesa/main/drawpix.c
@@ -1,4 +1,4 @@
-/* $Id: drawpix.c,v 1.41 2000/10/29 18:12:15 brianp Exp $ */
+/* $Id: drawpix.c,v 1.42 2000/10/29 19:02:23 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -917,10 +917,10 @@ _mesa_DrawPixels( GLsizei width, GLsizei height,
       if (ctx->Current.RasterPosValid) {
          GLfloat color[4];
         GLfloat texcoord[4], invq;
-         color[0] = CHAN_TO_FLOAT(ctx->Current.ByteColor[0]);
-         color[1] = CHAN_TO_FLOAT(ctx->Current.ByteColor[1]);
-         color[2] = CHAN_TO_FLOAT(ctx->Current.ByteColor[2]);
-         color[3] = CHAN_TO_FLOAT(ctx->Current.ByteColor[3]);
+         color[0] = CHAN_TO_FLOAT(ctx->Current.Color[0]);
+         color[1] = CHAN_TO_FLOAT(ctx->Current.Color[1]);
+         color[2] = CHAN_TO_FLOAT(ctx->Current.Color[2]);
+         color[3] = CHAN_TO_FLOAT(ctx->Current.Color[3]);
          invq = 1.0F / ctx->Current.Texcoord[0][3];
          texcoord[0] = ctx->Current.Texcoord[0][0] * invq;
          texcoord[1] = ctx->Current.Texcoord[0][1] * invq;

diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c
index 2c0e3334c7491d03d1b1ca47fe80fbc4b23ba3b5..f60fcc44f2369e29f746a51fbfa998f261fb0499 100644 (file)
--- a/src/mesa/main/enable.c
+++ b/src/mesa/main/enable.c
@@ -1,4 +1,4 @@
-/* $Id: enable.c,v 1.27 2000/10/27 16:44:40 keithw Exp $ */
+/* $Id: enable.c,v 1.28 2000/10/29 19:02:23 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -117,7 +117,7 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state )
             ctx->Light.ColorMaterialEnabled = state;
            ctx->NewState |= NEW_LIGHTING;
             if (state)
-               gl_update_color_material( ctx, ctx->Current.ByteColor );
+               gl_update_color_material( ctx, ctx->Current.Color );
          }
         break;
       case GL_CULL_FACE:

diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 9123138caa5e813485def5d6569cb80994c39f1c..263c5ca134148a5e88f4be723cb2a399b547582a 100644 (file)
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -1,4 +1,4 @@
-/* $Id: get.c,v 1.37 2000/10/28 20:41:14 brianp Exp $ */
+/* $Id: get.c,v 1.38 2000/10/29 19:02:23 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -228,10 +228,10 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
          *params = ENUM_TO_BOOL(ctx->Polygon.CullFaceMode);
          break;
       case GL_CURRENT_COLOR:
-         params[0] = INT_TO_BOOL(ctx->Current.ByteColor[0]);
-         params[1] = INT_TO_BOOL(ctx->Current.ByteColor[1]);
-         params[2] = INT_TO_BOOL(ctx->Current.ByteColor[2]);
-         params[3] = INT_TO_BOOL(ctx->Current.ByteColor[3]);
+         params[0] = INT_TO_BOOL(ctx->Current.Color[0]);
+         params[1] = INT_TO_BOOL(ctx->Current.Color[1]);
+         params[2] = INT_TO_BOOL(ctx->Current.Color[2]);
+         params[3] = INT_TO_BOOL(ctx->Current.Color[3]);
          break;
       case GL_CURRENT_INDEX:
          *params = INT_TO_BOOL(ctx->Current.Index);
@@ -1419,10 +1419,10 @@ _mesa_GetDoublev( GLenum pname, GLdouble *params )
          *params = ENUM_TO_DOUBLE(ctx->Polygon.CullFaceMode);
          break;
       case GL_CURRENT_COLOR:
-         params[0] = CHAN_TO_FLOAT(ctx->Current.ByteColor[0]);
-         params[1] = CHAN_TO_FLOAT(ctx->Current.ByteColor[1]);
-         params[2] = CHAN_TO_FLOAT(ctx->Current.ByteColor[2]);
-         params[3] = CHAN_TO_FLOAT(ctx->Current.ByteColor[3]);
+         params[0] = CHAN_TO_FLOAT(ctx->Current.Color[0]);
+         params[1] = CHAN_TO_FLOAT(ctx->Current.Color[1]);
+         params[2] = CHAN_TO_FLOAT(ctx->Current.Color[2]);
+         params[3] = CHAN_TO_FLOAT(ctx->Current.Color[3]);
          break;
       case GL_CURRENT_INDEX:
          *params = (GLdouble) ctx->Current.Index;
@@ -2611,10 +2611,10 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          *params = ENUM_TO_FLOAT(ctx->Polygon.CullFaceMode);
          break;
       case GL_CURRENT_COLOR:
-         params[0] = CHAN_TO_FLOAT(ctx->Current.ByteColor[0]);
-         params[1] = CHAN_TO_FLOAT(ctx->Current.ByteColor[1]);
-         params[2] = CHAN_TO_FLOAT(ctx->Current.ByteColor[2]);
-         params[3] = CHAN_TO_FLOAT(ctx->Current.ByteColor[3]);
+         params[0] = CHAN_TO_FLOAT(ctx->Current.Color[0]);
+         params[1] = CHAN_TO_FLOAT(ctx->Current.Color[1]);
+         params[2] = CHAN_TO_FLOAT(ctx->Current.Color[2]);
+         params[3] = CHAN_TO_FLOAT(ctx->Current.Color[3]);
          break;
       case GL_CURRENT_INDEX:
          *params = (GLfloat) ctx->Current.Index;
@@ -3779,10 +3779,10 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
          *params = (GLint) ctx->Polygon.CullFaceMode;
          break;
       case GL_CURRENT_COLOR:
-         params[0] = FLOAT_TO_INT( CHAN_TO_FLOAT( ctx->Current.ByteColor[0] ) );
-         params[1] = FLOAT_TO_INT( CHAN_TO_FLOAT( ctx->Current.ByteColor[1] ) );
-         params[2] = FLOAT_TO_INT( CHAN_TO_FLOAT( ctx->Current.ByteColor[2] ) );
-         params[3] = FLOAT_TO_INT( CHAN_TO_FLOAT( ctx->Current.ByteColor[3] ) );
+         params[0] = FLOAT_TO_INT( CHAN_TO_FLOAT( ctx->Current.Color[0] ) );
+         params[1] = FLOAT_TO_INT( CHAN_TO_FLOAT( ctx->Current.Color[1] ) );
+         params[2] = FLOAT_TO_INT( CHAN_TO_FLOAT( ctx->Current.Color[2] ) );
+         params[3] = FLOAT_TO_INT( CHAN_TO_FLOAT( ctx->Current.Color[3] ) );
          break;
       case GL_CURRENT_INDEX:
          *params = (GLint) ctx->Current.Index;

diff --git a/src/mesa/main/light.c b/src/mesa/main/light.c
index 38e74e7115228707c491ec90e0e57b2a1ccf3538..e47a5dcb2cb83337cc0d3b452dd15d88c0f856c0 100644 (file)
--- a/src/mesa/main/light.c
+++ b/src/mesa/main/light.c
@@ -1,4 +1,4 @@
-/* $Id: light.c,v 1.20 2000/10/28 20:41:14 brianp Exp $ */
+/* $Id: light.c,v 1.21 2000/10/29 19:02:23 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -844,7 +844,7 @@ _mesa_ColorMaterial( GLenum face, GLenum mode )
    }
 
    if (ctx->Light.ColorMaterialEnabled)
-      gl_update_color_material( ctx, ctx->Current.ByteColor );
+      gl_update_color_material( ctx, ctx->Current.Color );
 }
 
 

diff --git a/src/mesa/main/rastpos.c b/src/mesa/main/rastpos.c
index b4d36bbb0d1bc90197e731726eb5b105642eca01..1ba4695c6da2795e139d83d10e07ff81cff477d8 100644 (file)
--- a/src/mesa/main/rastpos.c
+++ b/src/mesa/main/rastpos.c
@@ -1,4 +1,4 @@
-/* $Id: rastpos.c,v 1.10 2000/10/28 20:41:14 brianp Exp $ */
+/* $Id: rastpos.c,v 1.11 2000/10/29 19:02:23 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -92,10 +92,10 @@ static void raster_pos4f( GLcontext *ctx,
    else {
       /* use current color or index */
       if (ctx->Visual.RGBAflag) {
-         ctx->Current.RasterColor[0] = CHAN_TO_FLOAT(ctx->Current.ByteColor[0]);
-         ctx->Current.RasterColor[1] = CHAN_TO_FLOAT(ctx->Current.ByteColor[1]);
-         ctx->Current.RasterColor[2] = CHAN_TO_FLOAT(ctx->Current.ByteColor[2]);
-         ctx->Current.RasterColor[3] = CHAN_TO_FLOAT(ctx->Current.ByteColor[3]);
+         ctx->Current.RasterColor[0] = CHAN_TO_FLOAT(ctx->Current.Color[0]);
+         ctx->Current.RasterColor[1] = CHAN_TO_FLOAT(ctx->Current.Color[1]);
+         ctx->Current.RasterColor[2] = CHAN_TO_FLOAT(ctx->Current.Color[2]);
+         ctx->Current.RasterColor[3] = CHAN_TO_FLOAT(ctx->Current.Color[3]);
       }
       else {
         ctx->Current.RasterIndex = ctx->Current.Index;