Minor change to current raster position and texcoords.

5 files changed, 28 insertions, 30 deletions

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 0bea34234ae..b4e746d769a 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1,4 +1,4 @@
-/* $Id: context.c,v 1.161 2002/04/19 00:23:08 brianp Exp $ */
+/* $Id: context.c,v 1.162 2002/05/09 21:54:16 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -857,8 +857,7 @@ init_attrib_groups( GLcontext *ctx )
    ASSIGN_4V( ctx->Current.RasterColor, 1.0, 1.0, 1.0, 1.0 );
    ctx->Current.RasterIndex = 1;
    for (i=0; i<MAX_TEXTURE_UNITS; i++)
-      ASSIGN_4V( ctx->Current.RasterMultiTexCoord[i], 0.0, 0.0, 0.0, 1.0 );
-   ctx->Current.RasterTexCoord = ctx->Current.RasterMultiTexCoord[0];
+      ASSIGN_4V( ctx->Current.RasterTexCoords[i], 0.0, 0.0, 0.0, 1.0 );
    ctx->Current.RasterPosValid = GL_TRUE;
 
 
diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c
index 9f2047878af..1c37f5b9a2c 100644
--- a/src/mesa/main/drawpix.c
+++ b/src/mesa/main/drawpix.c
@@ -1,4 +1,4 @@
-/* $Id: drawpix.c,v 1.59 2002/01/15 21:49:57 brianp Exp $ */
+/* $Id: drawpix.c,v 1.60 2002/05/09 21:54:16 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -84,7 +84,7 @@ _mesa_DrawPixels( GLsizei width, GLsizei height,
 				ctx->Current.RasterPos,
 				ctx->Current.RasterColor,
 				ctx->Current.RasterIndex,
-				ctx->Current.RasterTexCoord );
+				ctx->Current.RasterTexCoords[0] );
       }
    }
    else if (ctx->RenderMode==GL_SELECT) {
@@ -163,7 +163,7 @@ _mesa_CopyPixels( GLint srcx, GLint srcy, GLsizei width, GLsizei height,
                                 ctx->Current.RasterPos,
                                 ctx->Current.RasterColor,
                                 ctx->Current.RasterIndex,
-                                ctx->Current.RasterTexCoord );
+                                ctx->Current.RasterTexCoords[0] );
       }
    }
    else if (ctx->RenderMode == GL_SELECT) {
@@ -212,7 +212,7 @@ _mesa_Bitmap( GLsizei width, GLsizei height,
 				ctx->Current.RasterPos,
 				ctx->Current.RasterColor,
 				ctx->Current.RasterIndex, 
-				ctx->Current.RasterTexCoord );
+				ctx->Current.RasterTexCoords[0] );
       }
    }
    else if (ctx->RenderMode==GL_SELECT) {
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 11286c6dfd9..0b63eab77c3 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -1,4 +1,4 @@
-/* $Id: get.c,v 1.77 2002/04/24 20:05:26 brianp Exp $ */
+/* $Id: get.c,v 1.78 2002/05/09 21:54:16 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -296,10 +296,10 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
 	 params[3] = FLOAT_TO_BOOL(ctx->Current.RasterPos[3]);
 	 break;
       case GL_CURRENT_RASTER_TEXTURE_COORDS:
-         params[0] = FLOAT_TO_BOOL(ctx->Current.RasterMultiTexCoord[texUnit][0]);
-         params[1] = FLOAT_TO_BOOL(ctx->Current.RasterMultiTexCoord[texUnit][1]);
-         params[2] = FLOAT_TO_BOOL(ctx->Current.RasterMultiTexCoord[texUnit][2]);
-         params[3] = FLOAT_TO_BOOL(ctx->Current.RasterMultiTexCoord[texUnit][3]);
+         params[0] = FLOAT_TO_BOOL(ctx->Current.RasterTexCoords[texUnit][0]);
+         params[1] = FLOAT_TO_BOOL(ctx->Current.RasterTexCoords[texUnit][1]);
+         params[2] = FLOAT_TO_BOOL(ctx->Current.RasterTexCoords[texUnit][2]);
+         params[3] = FLOAT_TO_BOOL(ctx->Current.RasterTexCoords[texUnit][3]);
 	 break;
       case GL_CURRENT_RASTER_POSITION_VALID:
          *params = ctx->Current.RasterPosValid;
@@ -1628,10 +1628,10 @@ _mesa_GetDoublev( GLenum pname, GLdouble *params )
 	 params[3] = (GLdouble) ctx->Current.RasterPos[3];
 	 break;
       case GL_CURRENT_RASTER_TEXTURE_COORDS:
-	 params[0] = (GLdouble) ctx->Current.RasterMultiTexCoord[texUnit][0];
-	 params[1] = (GLdouble) ctx->Current.RasterMultiTexCoord[texUnit][1];
-	 params[2] = (GLdouble) ctx->Current.RasterMultiTexCoord[texUnit][2];
-	 params[3] = (GLdouble) ctx->Current.RasterMultiTexCoord[texUnit][3];
+	 params[0] = (GLdouble) ctx->Current.RasterTexCoords[texUnit][0];
+	 params[1] = (GLdouble) ctx->Current.RasterTexCoords[texUnit][1];
+	 params[2] = (GLdouble) ctx->Current.RasterTexCoords[texUnit][2];
+	 params[3] = (GLdouble) ctx->Current.RasterTexCoords[texUnit][3];
 	 break;
       case GL_CURRENT_RASTER_POSITION_VALID:
 	 *params = (GLdouble) ctx->Current.RasterPosValid;
@@ -2867,10 +2867,10 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
 	 params[3] = ctx->Current.RasterPos[3];
 	 break;
       case GL_CURRENT_RASTER_TEXTURE_COORDS:
-	 params[0] = ctx->Current.RasterMultiTexCoord[texUnit][0];
-	 params[1] = ctx->Current.RasterMultiTexCoord[texUnit][1];
-	 params[2] = ctx->Current.RasterMultiTexCoord[texUnit][2];
-	 params[3] = ctx->Current.RasterMultiTexCoord[texUnit][3];
+	 params[0] = ctx->Current.RasterTexCoords[texUnit][0];
+	 params[1] = ctx->Current.RasterTexCoords[texUnit][1];
+	 params[2] = ctx->Current.RasterTexCoords[texUnit][2];
+	 params[3] = ctx->Current.RasterTexCoords[texUnit][3];
 	 break;
       case GL_CURRENT_RASTER_POSITION_VALID:
 	 *params = (GLfloat) ctx->Current.RasterPosValid;
@@ -4076,10 +4076,10 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
 	 params[3] = (GLint) ctx->Current.RasterPos[3];
 	 break;
       case GL_CURRENT_RASTER_TEXTURE_COORDS:
-	 params[0] = (GLint) ctx->Current.RasterMultiTexCoord[texUnit][0];
-	 params[1] = (GLint) ctx->Current.RasterMultiTexCoord[texUnit][1];
-	 params[2] = (GLint) ctx->Current.RasterMultiTexCoord[texUnit][2];
-	 params[3] = (GLint) ctx->Current.RasterMultiTexCoord[texUnit][3];
+	 params[0] = (GLint) ctx->Current.RasterTexCoords[texUnit][0];
+	 params[1] = (GLint) ctx->Current.RasterTexCoords[texUnit][1];
+	 params[2] = (GLint) ctx->Current.RasterTexCoords[texUnit][2];
+	 params[3] = (GLint) ctx->Current.RasterTexCoords[texUnit][3];
 	 break;
       case GL_CURRENT_RASTER_POSITION_VALID:
 	 *params = (GLint) ctx->Current.RasterPosValid;
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 41ba77ba92c..93f217f57c9 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1,4 +1,4 @@
-/* $Id: mtypes.h,v 1.74 2002/05/02 00:59:20 brianp Exp $ */
+/* $Id: mtypes.h,v 1.75 2002/05/09 21:54:16 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -360,8 +360,7 @@ struct gl_current_attrib {
    GLfloat RasterColor[4];			/* Current raster color */
    GLfloat RasterSecondaryColor[4];             /* Current rast 2ndary color */
    GLuint RasterIndex;				/* Current raster index */
-   GLfloat *RasterTexCoord;			/* Current raster texcoord */
-   GLfloat RasterMultiTexCoord[MAX_TEXTURE_UNITS][4];
+   GLfloat RasterTexCoords[MAX_TEXTURE_UNITS][4];/* Current raster texcoords */
    GLboolean RasterPosValid;			/* Raster pos valid flag */
 };
 
diff --git a/src/mesa/main/rastpos.c b/src/mesa/main/rastpos.c
index 3f2f6bab57c..483324932ba 100644
--- a/src/mesa/main/rastpos.c
+++ b/src/mesa/main/rastpos.c
@@ -1,4 +1,4 @@
-/* $Id: rastpos.c,v 1.36 2002/03/29 17:27:59 brianp Exp $ */
+/* $Id: rastpos.c,v 1.37 2002/05/09 21:54:16 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -368,7 +368,7 @@ raster_pos4f(GLcontext *ctx, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
    {
       GLuint texSet;
       for (texSet = 0; texSet < ctx->Const.MaxTextureUnits; texSet++) {
-         COPY_4FV( ctx->Current.RasterMultiTexCoord[texSet],
+         COPY_4FV( ctx->Current.RasterTexCoords[texSet],
                   ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texSet] );
       }
    }
@@ -584,7 +584,7 @@ window_pos3f(GLfloat x, GLfloat y, GLfloat z)
    {
       GLuint texSet;
       for (texSet = 0; texSet < ctx->Const.MaxTextureUnits; texSet++) {
-         COPY_4FV( ctx->Current.RasterMultiTexCoord[texSet],
+         COPY_4FV( ctx->Current.RasterTexCoords[texSet],
                   ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texSet] );
       }
    }