added current raster fog coord and related code

2 files changed, 5 insertions, 4 deletions

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index d82d806cc8..4dfdbe4619 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1,4 +1,4 @@
-/* $Id: mtypes.h,v 1.43 2001/05/29 15:23:49 brianp Exp $ */
+/* $Id: mtypes.h,v 1.44 2001/05/30 15:22:04 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -312,6 +312,7 @@ struct gl_current_attrib {
    GLuint  RasterIndex;				/* Current raster index */
    GLfloat *RasterTexCoord;			/* Current raster texcoord*/
    GLfloat RasterMultiTexCoord[MAX_TEXTURE_UNITS][4];
+   GLfloat RasterFogCoord;
    GLboolean RasterPosValid;			/* Raster po valid flag */
 };
 
@@ -424,7 +425,7 @@ struct gl_fog_attrib {
    GLfloat Index;		/* Fog index */
    GLenum Mode;			/* Fog mode */
    GLboolean ColorSumEnabled;
-   GLenum FogCoordinateSource;
+   GLenum FogCoordinateSource;  /* GL_EXT_fog_coord */
 };
 
 
diff --git a/src/mesa/main/rastpos.c b/src/mesa/main/rastpos.c
index 388f8f3e28..958cf23bfb 100644
--- a/src/mesa/main/rastpos.c
+++ b/src/mesa/main/rastpos.c
@@ -1,4 +1,4 @@
-/* $Id: rastpos.c,v 1.24 2001/05/01 07:25:41 keithw Exp $ */
+/* $Id: rastpos.c,v 1.25 2001/05/30 15:22:04 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -320,7 +320,7 @@ raster_pos4f(GLcontext *ctx, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
    ctx->Current.RasterPos[3] = clip[3];
    ctx->Current.RasterPosValid = GL_TRUE;
 
-   /* FOG??? */
+   ctx->Current.RasterFogCoord = ctx->Current.FogCoord;
 
    {
       GLuint texSet;