From b5d3f2c52103c6bd834838695cd753ca26991bd6 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Wed, 30 May 2001 15:22:04 +0000 Subject: added current raster fog coord and related code --- src/mesa/main/mtypes.h | 5 +++-- src/mesa/main/rastpos.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'src/mesa/main') diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index d82d806cc8f..4dfdbe46196 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 388f8f3e28f..958cf23bfb8 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; -- cgit v1.2.3