More raster fog coord fixes.

New truncate vs. floor comments in drawpixels.c
Added current raster secondary color state, not used yet.

6 files changed, 81 insertions, 84 deletions

diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c
index 7d29257c497..1b069078833 100644
--- a/src/mesa/main/drawpix.c
+++ b/src/mesa/main/drawpix.c
@@ -1,4 +1,4 @@
-/* $Id: drawpix.c,v 1.55 2001/06/26 01:32:48 brianp Exp $ */
+/* $Id: drawpix.c,v 1.56 2001/06/26 21:15:35 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -42,8 +42,6 @@
 
 
 
-
-
 /*
  * Execute glDrawPixels
  */
@@ -64,13 +62,10 @@ _mesa_DrawPixels( GLsizei width, GLsizei height,
          _mesa_update_state(ctx);
       }
 
-#if 1
+      /* Round, to satisfy conformance tests (matches SGI's OpenGL) */
       x = IROUND(ctx->Current.RasterPos[0]);
       y = IROUND(ctx->Current.RasterPos[1]);
-#else
-      x = IFLOOR(ctx->Current.RasterPos[0]);
-      y = IFLOOR(ctx->Current.RasterPos[1]);
-#endif
+
       ctx->OcclusionResult = GL_TRUE;
       ctx->Driver.DrawPixels(ctx, x, y, width, height, format, type,
 			     &ctx->Unpack, pixels);
@@ -146,13 +141,11 @@ _mesa_CopyPixels( GLint srcx, GLint srcy, GLsizei width, GLsizei height,
       if (!ctx->Current.RasterPosValid) {
 	 return;
       }
-#if 1
+
+      /* Round, to satisfy conformance tests (matches SGI's OpenGL) */
       destx = IROUND(ctx->Current.RasterPos[0]);
       desty = IROUND(ctx->Current.RasterPos[1]);
-#else
-      destx = IFLOOR(ctx->Current.RasterPos[0]);
-      desty = IFLOOR(ctx->Current.RasterPos[1]);
-#endif
+
       ctx->OcclusionResult = GL_TRUE;
 
       ctx->Driver.CopyPixels( ctx, srcx, srcy, width, height, destx, desty,
@@ -195,13 +188,10 @@ _mesa_Bitmap( GLsizei width, GLsizei height,
 
    if (ctx->RenderMode==GL_RENDER) {
       if (bitmap) {
-#if 0
-         GLint x = (GLint) ( (ctx->Current.RasterPos[0] - xorig) + 0.0F );
-         GLint y = (GLint) ( (ctx->Current.RasterPos[1] - yorig) + 0.0F );
-#else
+         /* Truncate, to satisfy conformance tests (matches SGI's OpenGL). */
          GLint x = IFLOOR(ctx->Current.RasterPos[0] - xorig);
          GLint y = IFLOOR(ctx->Current.RasterPos[1] - yorig);
-#endif
+
          if (ctx->NewState) {
             _mesa_update_state(ctx);
          }
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index b9e1778cc8d..8b0eb4fd8b0 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1,4 +1,4 @@
-/* $Id: mtypes.h,v 1.47 2001/06/26 01:32:48 brianp Exp $ */
+/* $Id: mtypes.h,v 1.48 2001/06/26 21:15:35 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -309,6 +309,7 @@ struct gl_current_attrib {
    GLfloat RasterPos[4];			/* Current raster position */
    GLfloat RasterDistance;			/* Current raster distance */
    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];
diff --git a/src/mesa/main/rastpos.c b/src/mesa/main/rastpos.c
index c4f87c2ba4f..348cfa7c0a8 100644
--- a/src/mesa/main/rastpos.c
+++ b/src/mesa/main/rastpos.c
@@ -1,4 +1,4 @@
-/* $Id: rastpos.c,v 1.27 2001/06/26 01:32:48 brianp Exp $ */
+/* $Id: rastpos.c,v 1.28 2001/06/26 21:15:36 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -110,22 +110,30 @@ userclip_point( GLcontext* ctx, const GLfloat v[] )
 /* This has been split off to allow the normal shade routines to
  * get a little closer to the vertex buffer, and to use the
  * GLvector objects directly.
+ * Input: ctx - the context
+ *        vertex - vertex location
+ *        normal - normal vector
+ * Output: Rcolor - returned color
+ *         Rspec  - returned specular color (if separate specular enabled)
+ *         Rindex - returned color index
  */
 static void
 shade_rastpos(GLcontext *ctx,
               const GLfloat vertex[4],
               const GLfloat normal[3],
               GLfloat Rcolor[4],
-              GLuint *index)
+              GLfloat Rspec[4],
+              GLuint *Rindex)
 {
    GLfloat (*base)[3] = ctx->Light._BaseColor;
    const GLfloat *sumA = ctx->Light._BaseAlpha;
    struct gl_light *light;
-   GLfloat color[4];
+   GLfloat diffuseColor[4], specularColor[4];
    GLfloat diffuse = 0, specular = 0;
 
-   COPY_3V(color, base[0]);
-   color[3] = sumA[0];
+   COPY_3V(diffuseColor, base[0]);
+   diffuseColor[3] = sumA[0];
+   ASSIGN_4V(specularColor, 0.0, 0.0, 0.0, 0.0);
 
    foreach (light, &ctx->Light.EnabledList) {
       GLfloat n_dot_h;
@@ -133,7 +141,7 @@ shade_rastpos(GLcontext *ctx,
       GLfloat VP[3];
       GLfloat n_dot_VP;
       GLfloat *h;
-      GLfloat contrib[3];
+      GLfloat diffuseContrib[3], specularContrib[3];
       GLboolean normalized;
 
       if (!(light->_Flags & LIGHT_POSITIONAL)) {
@@ -176,13 +184,14 @@ shade_rastpos(GLcontext *ctx,
       n_dot_VP = DOT3( normal, VP );
 
       if (n_dot_VP < 0.0F) {
-	 ACC_SCALE_SCALAR_3V(color, attenuation, light->_MatAmbient[0]);
+	 ACC_SCALE_SCALAR_3V(diffuseColor, attenuation, light->_MatAmbient[0]);
 	 continue;
       }
 
-      COPY_3V(contrib, light->_MatAmbient[0]);
-      ACC_SCALE_SCALAR_3V(contrib, n_dot_VP, light->_MatDiffuse[0]);
+      COPY_3V(diffuseContrib, light->_MatAmbient[0]);
+      ACC_SCALE_SCALAR_3V(diffuseContrib, n_dot_VP, light->_MatDiffuse[0]);
       diffuse += n_dot_VP * light->_dli * attenuation;
+      ASSIGN_3V(specularContrib, 0.0, 0.0, 0.0);
 
       {
 	 if (ctx->Light.Model.LocalViewer) {
@@ -206,7 +215,7 @@ shade_rastpos(GLcontext *ctx,
 	 n_dot_h = DOT3(normal, h);
 
 	 if (n_dot_h > 0.0F) {
-	    struct gl_material *mat = &ctx->Light.Material[0];
+	    const struct gl_material *mat = &ctx->Light.Material[0];
 	    GLfloat spec_coef;
 	    GLfloat shininess = mat->Shininess;
 
@@ -219,21 +228,32 @@ shade_rastpos(GLcontext *ctx,
 	    GET_SHINE_TAB_ENTRY( ctx->_ShineTable[0], n_dot_h, spec_coef );
 
 	    if (spec_coef > 1.0e-10) {
-	       ACC_SCALE_SCALAR_3V( contrib, spec_coef,
-				    light->_MatSpecular[0]);
+               if (ctx->Light.Model.ColorControl==GL_SEPARATE_SPECULAR_COLOR) {
+                  ACC_SCALE_SCALAR_3V( specularContrib, spec_coef,
+                                       light->_MatSpecular[0]);
+               }
+               else {
+                  ACC_SCALE_SCALAR_3V( diffuseContrib, spec_coef,
+                                       light->_MatSpecular[0]);
+               }
 	       specular += spec_coef * light->_sli * attenuation;
 	    }
 	 }
       }
 
-      ACC_SCALE_SCALAR_3V( color, attenuation, contrib );
+      ACC_SCALE_SCALAR_3V( diffuseColor, attenuation, diffuseContrib );
+      ACC_SCALE_SCALAR_3V( specularColor, attenuation, specularContrib );
    }
 
    if (ctx->Visual.rgbMode) {
-      Rcolor[0] = CLAMP(color[0], 0.0F, 1.0F);
-      Rcolor[1] = CLAMP(color[1], 0.0F, 1.0F);
-      Rcolor[2] = CLAMP(color[2], 0.0F, 1.0F);
-      Rcolor[3] = CLAMP(color[3], 0.0F, 1.0F);
+      Rcolor[0] = CLAMP(diffuseColor[0], 0.0F, 1.0F);
+      Rcolor[1] = CLAMP(diffuseColor[1], 0.0F, 1.0F);
+      Rcolor[2] = CLAMP(diffuseColor[2], 0.0F, 1.0F);
+      Rcolor[3] = CLAMP(diffuseColor[3], 0.0F, 1.0F);
+      Rspec[0] = CLAMP(specularColor[0], 0.0F, 1.0F);
+      Rspec[1] = CLAMP(specularColor[1], 0.0F, 1.0F);
+      Rspec[2] = CLAMP(specularColor[2], 0.0F, 1.0F);
+      Rspec[3] = CLAMP(specularColor[3], 0.0F, 1.0F);
    }
    else {
       struct gl_material *mat = &ctx->Light.Material[0];
@@ -245,7 +265,7 @@ shade_rastpos(GLcontext *ctx,
       if (ind > mat->SpecularIndex) {
 	 ind = mat->SpecularIndex;
       }
-      *index = (GLuint) (GLint) ind;
+      *Rindex = (GLuint) (GLint) ind;
    }
 
 }
@@ -282,16 +302,16 @@ raster_pos4f(GLcontext *ctx, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 
       shade_rastpos( ctx, v, norm,
                      ctx->Current.RasterColor,
+                     ctx->Current.RasterSecondaryColor,
                      &ctx->Current.RasterIndex );
 
    }
    else {
       /* use current color or index */
       if (ctx->Visual.rgbMode) {
-         ctx->Current.RasterColor[0] = (ctx->Current.Color[0]);
-         ctx->Current.RasterColor[1] = (ctx->Current.Color[1]);
-         ctx->Current.RasterColor[2] = (ctx->Current.Color[2]);
-         ctx->Current.RasterColor[3] = (ctx->Current.Color[3]);
+         COPY_4FV(ctx->Current.RasterColor, ctx->Current.Color);
+         COPY_4FV(ctx->Current.RasterSecondaryColor,
+                  ctx->Current.SecondaryColor);
       }
       else {
 	 ctx->Current.RasterIndex = ctx->Current.Index;
diff --git a/src/mesa/swrast/s_bitmap.c b/src/mesa/swrast/s_bitmap.c
index 17387ba0afa..5f129933149 100644
--- a/src/mesa/swrast/s_bitmap.c
+++ b/src/mesa/swrast/s_bitmap.c
@@ -1,4 +1,4 @@
-/* $Id: s_bitmap.c,v 1.11 2001/06/18 23:55:18 brianp Exp $ */
+/* $Id: s_bitmap.c,v 1.12 2001/06/26 21:15:36 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -49,7 +49,7 @@ _swrast_Bitmap( GLcontext *ctx, GLint px, GLint py,
    struct pixel_buffer *PB = swrast->PB;
    GLint row, col;
    GLdepth fragZ;
-   GLfloat fogCoord;
+   GLfloat fog;
 
    ASSERT(ctx->RenderMode == GL_RENDER);
    ASSERT(bitmap);
@@ -75,15 +75,13 @@ _swrast_Bitmap( GLcontext *ctx, GLint px, GLint py,
    fragZ = (GLdepth) ( ctx->Current.RasterPos[2] * ctx->DepthMaxF);
 
    if (ctx->Fog.Enabled) {
-      if (ctx->Fog.FogCoordinateSource == GL_FOG_COORDINATE_EXT) {
-         fogCoord = ctx->Current.FogCoord;
-      }
-      else {
-         fogCoord = _mesa_z_to_fogfactor(ctx, ctx->Current.RasterDistance);
-      }
+      if (ctx->Fog.FogCoordinateSource == GL_FOG_COORDINATE_EXT)
+         fog = _mesa_z_to_fogfactor(ctx, ctx->Current.FogCoord);
+      else
+         fog = _mesa_z_to_fogfactor(ctx, ctx->Current.RasterDistance);
    }
    else {
-      fogCoord = 0.0;
+      fog = 0.0;
    }
 
    for (row=0; row<height; row++) {
@@ -95,7 +93,7 @@ _swrast_Bitmap( GLcontext *ctx, GLint px, GLint py,
          GLubyte mask = 1U << (unpack->SkipPixels & 0x7);
          for (col=0; col<width; col++) {
             if (*src & mask) {
-               PB_WRITE_PIXEL( PB, px+col, py+row, fragZ, fogCoord );
+               PB_WRITE_PIXEL( PB, px+col, py+row, fragZ, fog );
             }
             if (mask == 128U) {
                src++;
@@ -117,7 +115,7 @@ _swrast_Bitmap( GLcontext *ctx, GLint px, GLint py,
          GLubyte mask = 128U >> (unpack->SkipPixels & 0x7);
          for (col=0; col<width; col++) {
             if (*src & mask) {
-               PB_WRITE_PIXEL( PB, px+col, py+row, fragZ, fogCoord );
+               PB_WRITE_PIXEL( PB, px+col, py+row, fragZ, fog );
             }
             if (mask == 1U) {
                src++;
diff --git a/src/mesa/swrast/s_copypix.c b/src/mesa/swrast/s_copypix.c
index 3c7ee260d9e..ab8198945ce 100644
--- a/src/mesa/swrast/s_copypix.c
+++ b/src/mesa/swrast/s_copypix.c
@@ -1,4 +1,4 @@
-/* $Id: s_copypix.c,v 1.20 2001/06/18 23:55:18 brianp Exp $ */
+/* $Id: s_copypix.c,v 1.21 2001/06/26 21:15:36 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -114,12 +114,10 @@ copy_conv_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy,
       GLfloat fog;
       GLint i;
 
-      if (ctx->Fog.FogCoordinateSource == GL_FOG_COORDINATE_EXT) {
-         fog = ctx->Current.RasterFogCoord;
-      }
-      else {
+      if (ctx->Fog.FogCoordinateSource == GL_FOG_COORDINATE_EXT)
+         fog = _mesa_z_to_fogfactor(ctx, ctx->Current.RasterFogCoord);
+      else
          fog = _mesa_z_to_fogfactor(ctx, ctx->Current.RasterDistance);
-      }
 
       for (i = 0; i < width; i++) {
          zspan[i] = z;
@@ -354,12 +352,10 @@ copy_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy,
       GLdepth z = (GLdepth) (ctx->Current.RasterPos[2] * ctx->DepthMax);
       GLfloat fog;
 
-      if (ctx->Fog.FogCoordinateSource == GL_FOG_COORDINATE_EXT) {
-         fog = ctx->Current.RasterFogCoord;
-      }
-      else {
+      if (ctx->Fog.FogCoordinateSource == GL_FOG_COORDINATE_EXT)
+         fog = _mesa_z_to_fogfactor(ctx, ctx->Current.RasterFogCoord);
+      else
          fog = _mesa_z_to_fogfactor(ctx, ctx->Current.RasterDistance);
-      }
 
       for (i=0;i<width;i++) {
          zspan[i] = z;
@@ -620,12 +616,10 @@ static void copy_ci_pixels( GLcontext *ctx,
       GLdepth z = (GLdepth) (ctx->Current.RasterPos[2] * ctx->DepthMax);
       GLfloat fog;
 
-      if (ctx->Fog.FogCoordinateSource == GL_FOG_COORDINATE_EXT) {
-         fog = ctx->Current.RasterFogCoord;
-      }
-      else {
+      if (ctx->Fog.FogCoordinateSource == GL_FOG_COORDINATE_EXT)
+         fog = _mesa_z_to_fogfactor(ctx, ctx->Current.RasterFogCoord);
+      else
          fog = _mesa_z_to_fogfactor(ctx, ctx->Current.RasterDistance);
-      }
 
       for (i=0;i<width;i++) {
          zspan[i] = z;
@@ -769,12 +763,10 @@ static void copy_depth_pixels( GLcontext *ctx, GLint srcx, GLint srcy,
    if (ctx->Fog.Enabled) {
       GLfloat fog;
 
-      if (ctx->Fog.FogCoordinateSource == GL_FOG_COORDINATE_EXT) {
-         fog = ctx->Current.RasterFogCoord;
-      }
-      else {
+      if (ctx->Fog.FogCoordinateSource == GL_FOG_COORDINATE_EXT)
+         fog = _mesa_z_to_fogfactor(ctx, ctx->Current.RasterFogCoord);
+      else
          fog = _mesa_z_to_fogfactor(ctx, ctx->Current.RasterDistance);
-      }
 
       for (i = 0; i < width; i++) {
          fogSpan[i] = fog;
diff --git a/src/mesa/swrast/s_drawpix.c b/src/mesa/swrast/s_drawpix.c
index fb11af5e441..e618dc0a233 100644
--- a/src/mesa/swrast/s_drawpix.c
+++ b/src/mesa/swrast/s_drawpix.c
@@ -1,4 +1,4 @@
-/* $Id: s_drawpix.c,v 1.21 2001/06/18 23:55:18 brianp Exp $ */
+/* $Id: s_drawpix.c,v 1.22 2001/06/26 21:15:36 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -501,12 +501,10 @@ draw_index_pixels( GLcontext *ctx, GLint x, GLint y,
       GLfloat fog;
       GLint i;
 
-      if (ctx->Fog.FogCoordinateSource == GL_FOG_COORDINATE_EXT) {
-         fog = ctx->Current.RasterFogCoord;
-      }
-      else {
+      if (ctx->Fog.FogCoordinateSource == GL_FOG_COORDINATE_EXT)
+         fog = _mesa_z_to_fogfactor(ctx, ctx->Current.RasterFogCoord);
+      else
          fog = _mesa_z_to_fogfactor(ctx, ctx->Current.RasterDistance);
-      }
 
       for (i = 0; i < drawWidth; i++) {
 	 zspan[i] = zval;
@@ -747,12 +745,10 @@ draw_rgba_pixels( GLcontext *ctx, GLint x, GLint y,
       GLfloat fog;
       GLint i;
 
-      if (ctx->Fog.FogCoordinateSource == GL_FOG_COORDINATE_EXT) {
-         fog = ctx->Current.RasterFogCoord;
-      }
-      else {
+      if (ctx->Fog.FogCoordinateSource == GL_FOG_COORDINATE_EXT)
+         fog = _mesa_z_to_fogfactor(ctx, ctx->Current.RasterFogCoord);
+      else
          fog = _mesa_z_to_fogfactor(ctx, ctx->Current.RasterDistance);
-      }
 
       for (i=0;i<width;i++) {
 	 zspan[i] = z;