summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/mesa/main/context.c6
-rw-r--r--src/mesa/main/drawpix.c10
-rw-r--r--src/mesa/main/enable.c4
-rw-r--r--src/mesa/main/get.c34
-rw-r--r--src/mesa/main/light.c4
-rw-r--r--src/mesa/main/rastpos.c10
6 files changed, 34 insertions, 34 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index ab8c4dc065..6f46041887 100644
--- 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 4ccb128a48..4b2fbacd6a 100644
--- 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 2c0e3334c7..f60fcc44f2 100644
--- 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 9123138caa..263c5ca134 100644
--- 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 38e74e7115..e47a5dcb2c 100644
--- 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 b4d36bbb0d..1ba4695c6d 100644
--- 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;
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-16 13:38:56 +0000