s/BlendEquatioRGB/BlendEquationRGB/

[mesa.git] / src / mesa / swrast / s_linetemp.h

diff --git a/src/mesa/swrast/s_linetemp.h b/src/mesa/swrast/s_linetemp.h
index 4d21d1c9daf6b4412a96735d279d3b5babd4987f..1cb330dbdf50c0c272c3f801e0bc364592dd737e 100644 (file)
--- a/src/mesa/swrast/s_linetemp.h
+++ b/src/mesa/swrast/s_linetemp.h
@@ -1,4 +1,3 @@
-/* $Id: s_linetemp.h,v 1.15 2002/11/14 03:48:03 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -74,7 +73,6 @@ NAME( GLcontext *ctx, const SWvertex *vert0, const SWvertex *vert1 )
 {
    struct sw_span span;
    GLuint interpFlags = 0;
-   GLuint arrayFlags = SPAN_XY;
    GLint x0 = (GLint) vert0->win[0];
    GLint x1 = (GLint) vert1->win[0];
    GLint y0 = (GLint) vert0->win[1];
@@ -103,32 +101,12 @@ NAME( GLcontext *ctx, const SWvertex *vert0, const SWvertex *vert1 )
    /* Cull primitives with malformed coordinates.
     */
    {
-      float tmp = vert0->win[0] + vert0->win[1] + vert1->win[0] + vert1->win[1];
+      GLfloat tmp = vert0->win[0] + vert0->win[1]
+                  + vert1->win[0] + vert1->win[1];
       if (IS_INF_OR_NAN(tmp))
         return;
    }
 
-#ifdef INTERP_RGBA
-   interpFlags |= SPAN_RGBA;
-#endif
-#ifdef INTERP_SPEC
-   interpFlags |= SPAN_SPEC;
-#endif
-#ifdef INTERP_INDEX
-   interpFlags |= SPAN_INDEX;
-#endif
-#ifdef INTERP_Z
-   interpFlags |= SPAN_Z;
-#endif
-#ifdef INTERP_FOG
-   interpFlags |= SPAN_FOG;
-#endif
-#if defined(INTERP_TEX) || defined(INTERP_MULTITEX)
-   interpFlags |= SPAN_TEXTURE;
-#endif
-
-   INIT_SPAN(span, GL_LINE, 0, interpFlags, arrayFlags);
-
    /*
    printf("%s():\n", __FUNCTION__);
    printf(" (%f, %f, %f) -> (%f, %f, %f)\n",
@@ -174,7 +152,7 @@ NAME( GLcontext *ctx, const SWvertex *vert0, const SWvertex *vert1 )
       return;
 
 #ifdef DEPTH_TYPE
-   zPtr = (DEPTH_TYPE *) _mesa_zbuffer_address(ctx, x0, y0);
+   zPtr = (DEPTH_TYPE *) _swrast_zbuffer_address(ctx, x0, y0);
 #endif
 #ifdef PIXEL_ADDRESS
    pixelPtr = (PIXEL_TYPE *) PIXEL_ADDRESS(x0,y0);
@@ -223,9 +201,13 @@ NAME( GLcontext *ctx, const SWvertex *vert0, const SWvertex *vert1 )
    ASSERT(dx >= 0);
    ASSERT(dy >= 0);
 
-   span.end = numPixels = MAX2(dx, dy);
+   numPixels = MAX2(dx, dy);
 
+   /*
+    * Span setup: compute start and step values for all interpolated values.
+    */
 #ifdef INTERP_RGBA
+   interpFlags |= SPAN_RGBA;
    if (ctx->Light.ShadeModel == GL_SMOOTH) {
       span.red   = ChanToFixed(vert0->color[0]);
       span.green = ChanToFixed(vert0->color[1]);
@@ -248,6 +230,7 @@ NAME( GLcontext *ctx, const SWvertex *vert0, const SWvertex *vert1 )
    }
 #endif
 #ifdef INTERP_SPEC
+   interpFlags |= SPAN_SPEC;
    if (ctx->Light.ShadeModel == GL_SMOOTH) {
       span.specRed       = ChanToFixed(vert0->specular[0]);
       span.specGreen     = ChanToFixed(vert0->specular[1]);
@@ -266,6 +249,7 @@ NAME( GLcontext *ctx, const SWvertex *vert0, const SWvertex *vert1 )
    }
 #endif
 #ifdef INTERP_INDEX
+   interpFlags |= SPAN_INDEX;
    if (ctx->Light.ShadeModel == GL_SMOOTH) {
       span.index = IntToFixed(vert0->index);
       span.indexStep = IntToFixed(vert1->index - vert0->index) / numPixels;
@@ -276,22 +260,26 @@ NAME( GLcontext *ctx, const SWvertex *vert0, const SWvertex *vert1 )
    }
 #endif
 #if defined(INTERP_Z) || defined(DEPTH_TYPE)
+   interpFlags |= SPAN_Z;
    {
       if (depthBits <= 16) {
          span.z = FloatToFixed(vert0->win[2]) + FIXED_HALF;
          span.zStep = FloatToFixed(vert1->win[2] - vert0->win[2]) / numPixels;
       }
       else {
-         span.z = vert0->win[2];
-         span.zStep = (vert1->win[2] - vert0->win[2]) / numPixels;
+         /* don't use fixed point */
+         span.z = (GLint) vert0->win[2];
+         span.zStep = (GLint) ((vert1->win[2] - vert0->win[2]) / numPixels);
       }
    }
 #endif
 #ifdef INTERP_FOG
+   interpFlags |= SPAN_FOG;
    span.fog = vert0->fog;
    span.fogStep = (vert1->fog - vert0->fog) / numPixels;
 #endif
 #ifdef INTERP_TEX
+   interpFlags |= SPAN_TEXTURE;
    {
       const GLfloat invw0 = vert0->win[3];
       const GLfloat invw1 = vert1->win[3];
@@ -316,6 +304,7 @@ NAME( GLcontext *ctx, const SWvertex *vert0, const SWvertex *vert1 )
    }
 #endif
 #ifdef INTERP_MULTITEX
+   interpFlags |= SPAN_TEXTURE;
    {
       const GLfloat invLen = 1.0F / numPixels;
       GLuint u;
@@ -345,6 +334,8 @@ NAME( GLcontext *ctx, const SWvertex *vert0, const SWvertex *vert1 )
    }
 #endif
 
+   INIT_SPAN(span, GL_LINE, numPixels, interpFlags, SPAN_XY);
+
    /*
     * Draw
     */