X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fswrast%2Fs_lines.c;h=001b4dc3168162d60d065b5150367db301a63ca8;hb=1fe3b1d96459b59381be449a8dc869421071a430;hp=c5523a432cc2193d42d7903f0d475e094907d02c;hpb=6b1e4ea5a54ea852a904440cd9fa50251f63f64c;p=mesa.git

diff --git a/src/mesa/swrast/s_lines.c b/src/mesa/swrast/s_lines.c
index c5523a432cc..001b4dc3168 100644
--- a/src/mesa/swrast/s_lines.c
+++ b/src/mesa/swrast/s_lines.c
@@ -1,10 +1,10 @@
-/* $Id: s_lines.c,v 1.18 2001/05/21 18:13:43 brianp Exp $ */
+/* $Id: s_lines.c,v 1.33 2002/11/14 03:48:03 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
+ * Version:  5.1
  *
- * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -30,908 +30,201 @@
 #include "macros.h"
 #include "mmath.h"
 #include "s_aaline.h"
-#include "s_pb.h"
 #include "s_context.h"
 #include "s_depth.h"
-#include "s_lines.h"
 #include "s_feedback.h"
-
-
-
-/**********************************************************************/
-/*****                    Rasterization                           *****/
-/**********************************************************************/
+#include "s_lines.h"
+#include "s_span.h"
 
 
 /*
- * There are 4 pairs (RGBA, CI) of line drawing functions:
- *   1. simple:  width=1 and no special rasterization functions (fastest)
- *   2. flat:  width=1, non-stippled, flat-shaded, any raster operations
- *   3. smooth:  width=1, non-stippled, smooth-shaded, any raster operations
- *   4. general:  any other kind of line (slowest)
+ * Init the mask[] array to implement a line stipple.
  */
-
-
-/* Flat, color index line */
-static void flat_ci_line( GLcontext *ctx,
-                          const SWvertex *vert0,
-			  const SWvertex *vert1 )
-{
-   struct pixel_buffer *PB = SWRAST_CONTEXT(ctx)->PB;
-
-   PB_SET_INDEX( PB, vert0->index );
-
-#define INTERP_XY 1
-#define PLOT(X,Y)  PB_WRITE_PIXEL(PB, X, Y, 0, 0);
-
-#include "s_linetemp.h"
-
-   _mesa_flush_pb(ctx);
-}
-
-
-
-/* Flat, color index line with Z interpolation/testing */
-static void flat_ci_z_line( GLcontext *ctx,
-                            const SWvertex *vert0,
-			    const SWvertex *vert1 )
-{
-   struct pixel_buffer *PB = SWRAST_CONTEXT(ctx)->PB;
-   PB_SET_INDEX( PB, vert0->index );
-
-#define INTERP_XY 1
-#define INTERP_Z 1
-#define INTERP_FOG 1
-#define PLOT(X,Y)  PB_WRITE_PIXEL(PB, X, Y, Z, fog0);
-
-#include "s_linetemp.h"
-
-   _mesa_flush_pb(ctx);
-}
-
-
-
-/* Flat-shaded, RGBA line */
-static void flat_rgba_line( GLcontext *ctx,
-                            const SWvertex *vert0,
-			    const SWvertex *vert1 )
-{
-   const GLchan *color = vert1->color;
-   struct pixel_buffer *PB = SWRAST_CONTEXT(ctx)->PB;
-   PB_SET_COLOR( PB, color[0], color[1], color[2], color[3] );
-
-#define INTERP_XY 1
-#define PLOT(X,Y)   PB_WRITE_PIXEL(PB, X, Y, 0, 0);
-
-#include "s_linetemp.h"
-
-   _mesa_flush_pb(ctx);
-}
-
-
-
-/* Flat-shaded, RGBA line with Z interpolation/testing */
-static void flat_rgba_z_line( GLcontext *ctx,
-                              const SWvertex *vert0,
-			      const SWvertex *vert1 )
-{
-   const GLchan *color = vert1->color;
-   struct pixel_buffer *PB = SWRAST_CONTEXT(ctx)->PB;
-   PB_SET_COLOR( PB, color[0], color[1], color[2], color[3] );
-
-#define INTERP_XY 1
-#define INTERP_Z 1
-#define INTERP_FOG 1
-#define PLOT(X,Y)   PB_WRITE_PIXEL(PB, X, Y, Z, fog0);
-
-#include "s_linetemp.h"
-
-   _mesa_flush_pb(ctx);
-}
-
-
-
-/* Smooth shaded, color index line */
-static void smooth_ci_line( GLcontext *ctx,
-                            const SWvertex *vert0,
-			    const SWvertex *vert1 )
-{
-   struct pixel_buffer *PB = SWRAST_CONTEXT(ctx)->PB;
-   GLint count = PB->count;
-   GLint *pbx = PB->x;
-   GLint *pby = PB->y;
-   GLuint *pbi = PB->index;
-
-   PB->mono = GL_FALSE;
-
-#define INTERP_XY 1
-#define INTERP_INDEX 1
-
-#define PLOT(X,Y)		\
-	pbx[count] = X;		\
-	pby[count] = Y;		\
-	pbi[count] = I;		\
-	count++;
-
-#include "s_linetemp.h"
-
-   PB->count = count;
-   _mesa_flush_pb(ctx);
-}
-
-
-
-/* Smooth shaded, color index line with Z interpolation/testing */
-static void smooth_ci_z_line( GLcontext *ctx,
-                              const SWvertex *vert0,
-			      const SWvertex *vert1 )
+static void
+compute_stipple_mask( GLcontext *ctx, GLuint len, GLubyte mask[] )
 {
-   struct pixel_buffer *PB = SWRAST_CONTEXT(ctx)->PB;
-   GLint count = PB->count;
-   GLint *pbx = PB->x;
-   GLint *pby = PB->y;
-   GLdepth *pbz = PB->z;
-   GLuint *pbi = PB->index;
-
-   PB->mono = GL_FALSE;
-
-#define INTERP_XY 1
-#define INTERP_Z 1
-#define INTERP_FOG 1
-#define INTERP_INDEX 1
-
-#define PLOT(X,Y)		\
-	pbx[count] = X;		\
-	pby[count] = Y;		\
-	pbz[count] = Z;		\
-	pbi[count] = I;		\
-	count++;
-
-#include "s_linetemp.h"
-
-   PB->count = count;
-   _mesa_flush_pb(ctx);
-}
-
-
-
-/* Smooth-shaded, RGBA line */
-static void smooth_rgba_line( GLcontext *ctx,
-                       	      const SWvertex *vert0,
-			      const SWvertex *vert1 )
-{
-   struct pixel_buffer *PB = SWRAST_CONTEXT(ctx)->PB;
-   GLint count = PB->count;
-   GLint *pbx = PB->x;
-   GLint *pby = PB->y;
-   GLchan (*pbrgba)[4] = PB->rgba;
-
-   PB->mono = GL_FALSE;
-
-#define INTERP_XY 1
-#define INTERP_RGB 1
-#define INTERP_ALPHA 1
-
-#define PLOT(X,Y)			\
-	pbx[count] = X;			\
-	pby[count] = Y;			\
-	pbrgba[count][RCOMP] = FixedToInt(r0);	\
-	pbrgba[count][GCOMP] = FixedToInt(g0);	\
-	pbrgba[count][BCOMP] = FixedToInt(b0);	\
-	pbrgba[count][ACOMP] = FixedToInt(a0);	\
-	count++;
-
-#include "s_linetemp.h"
-
-   PB->count = count;
-   _mesa_flush_pb(ctx);
-}
-
-
-
-/* Smooth-shaded, RGBA line with Z interpolation/testing */
-static void smooth_rgba_z_line( GLcontext *ctx,
-                       	        const SWvertex *vert0,
-				const SWvertex *vert1 )
-{
-   struct pixel_buffer *PB = SWRAST_CONTEXT(ctx)->PB;
-   GLint count = PB->count;
-   GLint *pbx = PB->x;
-   GLint *pby = PB->y;
-   GLdepth *pbz = PB->z;
-   GLfloat *pbfog = PB->fog;
-   GLchan (*pbrgba)[4] = PB->rgba;
-
-
-   PB->mono = GL_FALSE;
-
-#define INTERP_XY 1
-#define INTERP_Z 1
-#define INTERP_FOG 1
-#define INTERP_RGB 1
-#define INTERP_ALPHA 1
-
-#define PLOT(X,Y)				\
-	pbx[count] = X;				\
-	pby[count] = Y;				\
-	pbz[count] = Z;				\
-	pbfog[count] = fog0;			\
-	pbrgba[count][RCOMP] = FixedToInt(r0);	\
-	pbrgba[count][GCOMP] = FixedToInt(g0);	\
-	pbrgba[count][BCOMP] = FixedToInt(b0);	\
-	pbrgba[count][ACOMP] = FixedToInt(a0);	\
-	count++;
-
-#include "s_linetemp.h"
-
-   PB->count = count;
-   _mesa_flush_pb(ctx);
-}
-
-
-#define CHECK_FULL(count)		\
-   if (count >= PB_SIZE-MAX_WIDTH) {	\
-      PB->count = count;		\
-      _mesa_flush_pb(ctx);			\
-      count = PB->count;		\
-   }
-
-
-
-/* Smooth shaded, color index, any width, maybe stippled */
-static void general_smooth_ci_line( GLcontext *ctx,
-                           	    const SWvertex *vert0,
-				    const SWvertex *vert1 )
-{
-   struct pixel_buffer *PB = SWRAST_CONTEXT(ctx)->PB;
-   GLint count = PB->count;
-   GLint *pbx = PB->x;
-   GLint *pby = PB->y;
-   GLdepth *pbz = PB->z;
-   GLfloat *pbfog = PB->fog;
-   GLuint *pbi = PB->index;
-
-   PB->mono = GL_FALSE;
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   GLuint i;
 
-   if (ctx->Line.StippleFlag) {
-      /* stippled */
-#define INTERP_XY 1
-#define INTERP_Z 1
-#define INTERP_FOG 1
-#define INTERP_INDEX 1
-#define WIDE 1
-#define STIPPLE 1
-#define PLOT(X,Y)		\
-	pbx[count] = X;		\
-	pby[count] = Y;		\
-	pbz[count] = Z;		\
-	pbfog[count] = fog0;	\
-	pbi[count] = I;		\
-	count++;		\
-	CHECK_FULL(count);
-#include "s_linetemp.h"
-   }
-   else {
-      /* unstippled */
-      if (ctx->Line.Width==2.0F) {
-         /* special case: unstippled and width=2 */
-#define INTERP_XY 1
-#define INTERP_Z 1
-#define INTERP_FOG 1
-#define INTERP_INDEX 1
-#define XMAJOR_PLOT(X,Y)				\
-	pbx[count] = X;  pbx[count+1] = X;		\
-	pby[count] = Y;  pby[count+1] = Y+1;		\
-	pbz[count] = Z;  pbz[count+1] = Z;		\
-	pbfog[count] = fog0;  pbfog[count+1] = fog0;	\
-	pbi[count] = I;  pbi[count+1] = I;		\
-	count += 2;					\
-	CHECK_FULL(count);
-#define YMAJOR_PLOT(X,Y)				\
-	pbx[count] = X;  pbx[count+1] = X+1;		\
-	pby[count] = Y;  pby[count+1] = Y;		\
-	pbz[count] = Z;  pbz[count+1] = Z;		\
-	pbfog[count] = fog0;  pbfog[count+1] = fog0;	\
-	pbi[count] = I;  pbi[count+1] = I;		\
-	count += 2;					\
-	CHECK_FULL(count);
-#include "s_linetemp.h"
+   for (i = 0; i < len; i++) {
+      GLuint bit = (swrast->StippleCounter / ctx->Line.StippleFactor) & 0xf;
+      if ((1 << bit) & ctx->Line.StipplePattern) {
+         mask[i] = GL_TRUE;
       }
       else {
-         /* unstippled, any width */
-#define INTERP_XY 1
-#define INTERP_Z 1
-#define INTERP_FOG 1
-#define INTERP_INDEX 1
-#define WIDE 1
-#define PLOT(X,Y)		\
-	pbx[count] = X;		\
-	pby[count] = Y;		\
-	pbz[count] = Z;		\
-	pbi[count] = I;		\
-	pbfog[count] = fog0;	\
-	count++;		\
-	CHECK_FULL(count);
-#include "s_linetemp.h"
+         mask[i] = GL_FALSE;
       }
+      swrast->StippleCounter++;
    }
-
-   PB->count = count;
-   _mesa_flush_pb(ctx);
 }
 
 
-/* Flat shaded, color index, any width, maybe stippled */
-static void general_flat_ci_line( GLcontext *ctx,
-                                  const SWvertex *vert0,
-				  const SWvertex *vert1 )
+/*
+ * To draw a wide line we can simply redraw the span N times, side by side.
+ */
+static void
+draw_wide_line( GLcontext *ctx, struct sw_span *span, GLboolean xMajor )
 {
-   struct pixel_buffer *PB = SWRAST_CONTEXT(ctx)->PB;
-   GLint count;
-   GLint *pbx = PB->x;
-   GLint *pby = PB->y;
-   GLdepth *pbz = PB->z;
-   GLfloat *pbfog = PB->fog;
-   PB_SET_INDEX( PB, vert0->index );
-   count = PB->count;
+   GLint width, start;
 
-   if (ctx->Line.StippleFlag) {
-      /* stippled, any width */
-#define INTERP_XY 1
-#define INTERP_Z 1
-#define INTERP_FOG 1
-#define WIDE 1
-#define STIPPLE 1
-#define PLOT(X,Y)		\
-	pbx[count] = X;		\
-	pby[count] = Y;		\
-	pbz[count] = Z;		\
-	pbfog[count] = fog0;	\
-	count++;		\
-	CHECK_FULL(count);
-#include "s_linetemp.h"
+   ASSERT(span->end < MAX_WIDTH);
+
+   width = (GLint) CLAMP( ctx->Line.Width, MIN_LINE_WIDTH, MAX_LINE_WIDTH );
+
+   if (width & 1)
+      start = width / 2;
+   else
+      start = width / 2 - 1;
+
+   if (xMajor) {
+      GLint *y = span->array->y;
+      GLuint i;
+      GLint w;
+      for (w = 0; w < width; w++) {
+         if (w == 0) {
+            for (i = 0; i < span->end; i++)
+               y[i] -= start;
+         }
+         else {
+            for (i = 0; i < span->end; i++)
+               y[i]++;
+         }
+         if ((span->interpMask | span->arrayMask) & SPAN_TEXTURE)
+            _mesa_write_texture_span(ctx, span);
+         else if ((span->interpMask | span->arrayMask) & SPAN_RGBA)
+            _mesa_write_rgba_span(ctx, span);
+         else
+            _mesa_write_index_span(ctx, span);
+      }
    }
    else {
-      /* unstippled */
-      if (ctx->Line.Width==2.0F) {
-         /* special case: unstippled and width=2 */
-#define INTERP_XY 1
-#define INTERP_Z 1
-#define INTERP_FOG 1
-#define XMAJOR_PLOT(X,Y)				\
-	pbx[count] = X;  pbx[count+1] = X;		\
-	pby[count] = Y;  pby[count+1] = Y+1;		\
-	pbz[count] = Z;  pbz[count+1] = Z;		\
-	pbfog[count] = fog0;  pbfog[count+1] = fog0;	\
-	count += 2;					\
-	CHECK_FULL(count);
-#define YMAJOR_PLOT(X,Y)				\
-	pbx[count] = X;  pbx[count+1] = X+1;		\
-	pby[count] = Y;  pby[count+1] = Y;		\
-	pbz[count] = Z;  pbz[count+1] = Z;		\
-	pbfog[count] = fog0;  pbfog[count+1] = fog0;	\
-	count += 2;					\
-	CHECK_FULL(count);
-#include "s_linetemp.h"
-      }
-      else {
-         /* unstippled, any width */
-#define INTERP_XY 1
-#define INTERP_Z 1
-#define INTERP_FOG 1
-#define WIDE 1
-#define PLOT(X,Y)		\
-	pbx[count] = X;		\
-	pby[count] = Y;		\
-	pbz[count] = Z;		\
-	pbfog[count] = fog0;	\
-	count++;		\
-	CHECK_FULL(count);
-#include "s_linetemp.h"
+      GLint *x = span->array->x;
+      GLuint i;
+      GLint w;
+      for (w = 0; w < width; w++) {
+         if (w == 0) {
+            for (i = 0; i < span->end; i++)
+               x[i] -= start;
+         }
+         else {
+            for (i = 0; i < span->end; i++)
+               x[i]++;
+         }
+         if ((span->interpMask | span->arrayMask) & SPAN_TEXTURE)
+            _mesa_write_texture_span(ctx, span);
+         else if ((span->interpMask | span->arrayMask) & SPAN_RGBA)
+            _mesa_write_rgba_span(ctx, span);
+         else
+            _mesa_write_index_span(ctx, span);
       }
    }
-
-   PB->count = count;
-   _mesa_flush_pb(ctx);
 }
 
 
 
-static void general_smooth_rgba_line( GLcontext *ctx,
-                                      const SWvertex *vert0,
-				      const SWvertex *vert1 )
-{
-   struct pixel_buffer *PB = SWRAST_CONTEXT(ctx)->PB;
-   GLint count = PB->count;
-   GLint *pbx = PB->x;
-   GLint *pby = PB->y;
-   GLdepth *pbz = PB->z;
-   GLfloat *pbfog = PB->fog;
-   GLchan (*pbrgba)[4] = PB->rgba;
+/**********************************************************************/
+/*****                    Rasterization                           *****/
+/**********************************************************************/
 
-   PB->mono = GL_FALSE;
 
-   if (ctx->Line.StippleFlag) {
-      /* stippled */
-#define INTERP_XY 1
-#define INTERP_Z 1
-#define INTERP_FOG 1
-#define INTERP_RGB 1
-#define INTERP_ALPHA 1
-#define WIDE 1
-#define STIPPLE 1
-#define PLOT(X,Y)				\
-	pbx[count] = X;				\
-	pby[count] = Y;				\
-	pbz[count] = Z;				\
-	pbfog[count] = fog0;			\
-	pbrgba[count][RCOMP] = FixedToInt(r0);	\
-	pbrgba[count][GCOMP] = FixedToInt(g0);	\
-	pbrgba[count][BCOMP] = FixedToInt(b0);	\
-	pbrgba[count][ACOMP] = FixedToInt(a0);	\
-	count++;				\
-	CHECK_FULL(count);
-#include "s_linetemp.h"
-   }
-   else {
-      /* unstippled */
-      if (ctx->Line.Width==2.0F) {
-         /* special case: unstippled and width=2 */
-#define INTERP_XY 1
-#define INTERP_Z 1
-#define INTERP_FOG 1
-#define INTERP_RGB 1
-#define INTERP_ALPHA 1
-#define XMAJOR_PLOT(X,Y)				\
-	pbx[count] = X;  pbx[count+1] = X;		\
-	pby[count] = Y;  pby[count+1] = Y+1;		\
-	pbz[count] = Z;  pbz[count+1] = Z;		\
-	pbfog[count] = fog0;  pbfog[count+1] = fog0;	\
-	pbrgba[count][RCOMP] = FixedToInt(r0);		\
-	pbrgba[count][GCOMP] = FixedToInt(g0);		\
-	pbrgba[count][BCOMP] = FixedToInt(b0);		\
-	pbrgba[count][ACOMP] = FixedToInt(a0);		\
-	pbrgba[count+1][RCOMP] = FixedToInt(r0);	\
-	pbrgba[count+1][GCOMP] = FixedToInt(g0);	\
-	pbrgba[count+1][BCOMP] = FixedToInt(b0);	\
-	pbrgba[count+1][ACOMP] = FixedToInt(a0);	\
-	count += 2;					\
-	CHECK_FULL(count);
-#define YMAJOR_PLOT(X,Y)				\
-	pbx[count] = X;  pbx[count+1] = X+1;		\
-	pby[count] = Y;  pby[count+1] = Y;		\
-	pbz[count] = Z;  pbz[count+1] = Z;		\
-	pbfog[count] = fog0;  pbfog[count+1] = fog0;	\
-	pbrgba[count][RCOMP] = FixedToInt(r0);		\
-	pbrgba[count][GCOMP] = FixedToInt(g0);		\
-	pbrgba[count][BCOMP] = FixedToInt(b0);		\
-	pbrgba[count][ACOMP] = FixedToInt(a0);		\
-	pbrgba[count+1][RCOMP] = FixedToInt(r0);	\
-	pbrgba[count+1][GCOMP] = FixedToInt(g0);	\
-	pbrgba[count+1][BCOMP] = FixedToInt(b0);	\
-	pbrgba[count+1][ACOMP] = FixedToInt(a0);	\
-	count += 2;					\
-	CHECK_FULL(count);
-#include "s_linetemp.h"
-      }
-      else {
-         /* unstippled, any width */
-#define INTERP_XY 1
-#define INTERP_Z 1
-#define INTERP_FOG 1
-#define INTERP_RGB 1
-#define INTERP_ALPHA 1
-#define WIDE 1
-#define PLOT(X,Y)				\
-	pbx[count] = X;				\
-	pby[count] = Y;				\
-	pbz[count] = Z;				\
-	pbfog[count] = fog0;  			\
-	pbrgba[count][RCOMP] = FixedToInt(r0);	\
-	pbrgba[count][GCOMP] = FixedToInt(g0);	\
-	pbrgba[count][BCOMP] = FixedToInt(b0);	\
-	pbrgba[count][ACOMP] = FixedToInt(a0);	\
-	count++;				\
-	CHECK_FULL(count);
+/* Simple color index line (no stipple, width=1, no Z, no fog, no tex)*/
+#define NAME simple_ci_line
+#define INTERP_INDEX
+#define RENDER_SPAN(span) _mesa_write_index_span(ctx, &span)
 #include "s_linetemp.h"
-      }
-   }
-
-   PB->count = count;
-   _mesa_flush_pb(ctx);
-}
 
 
-static void general_flat_rgba_line( GLcontext *ctx,
-                                    const SWvertex *vert0,
-				    const SWvertex *vert1 )
-{
-   struct pixel_buffer *PB = SWRAST_CONTEXT(ctx)->PB;
-   const GLchan *color = vert1->color;
-   PB_SET_COLOR( PB, color[0], color[1], color[2], color[3] );
-
-   if (ctx->Line.StippleFlag) {
-      /* stippled */
-#define INTERP_XY 1
-#define INTERP_Z 1
-#define INTERP_FOG 1
-#define WIDE 1
-#define STIPPLE 1
-#define PLOT(X,Y)  PB_WRITE_PIXEL(PB, X, Y, Z, fog0);
-#include "s_linetemp.h"
-   }
-   else {
-      /* unstippled */
-      if (ctx->Line.Width==2.0F) {
-         /* special case: unstippled and width=2 */
-#define INTERP_XY 1
-#define INTERP_Z 1
-#define INTERP_FOG 1
-#define XMAJOR_PLOT(X,Y) PB_WRITE_PIXEL(PB, X, Y, Z, fog0); \
-                         PB_WRITE_PIXEL(PB, X, Y+1, Z, fog0);
-#define YMAJOR_PLOT(X,Y)  PB_WRITE_PIXEL(PB, X, Y, Z, fog0); \
-                          PB_WRITE_PIXEL(PB, X+1, Y, Z, fog0);
-#include "s_linetemp.h"
-      }
-      else {
-         /* unstippled, any width */
-#define INTERP_XY 1
-#define INTERP_Z 1
-#define INTERP_FOG 1
-#define WIDE 1
-#define PLOT(X,Y) PB_WRITE_PIXEL(PB, X, Y, Z, fog0);
+/* Simple RGBA index line (no stipple, width=1, no Z, no fog, no tex)*/
+#define NAME simple_rgba_line
+#define INTERP_RGBA
+#define RENDER_SPAN(span) _mesa_write_rgba_span(ctx, &span);
 #include "s_linetemp.h"
-      }
-   }
-
-   _mesa_flush_pb(ctx);
-}
 
 
-/* Flat-shaded, textured, any width, maybe stippled */
-static void flat_textured_line( GLcontext *ctx,
-                                const SWvertex *vert0,
-				const SWvertex *vert1 )
-{
-   struct pixel_buffer *PB = SWRAST_CONTEXT(ctx)->PB;
-   GLint count;
-   GLint *pbx = PB->x;
-   GLint *pby = PB->y;
-   GLdepth *pbz = PB->z;
-   GLfloat *pbfog = PB->fog;
-   GLfloat *pbs = PB->s[0];
-   GLfloat *pbt = PB->t[0];
-   GLfloat *pbu = PB->u[0];
-   GLchan *color = (GLchan*) vert1->color;
-   PB_SET_COLOR( PB, color[0], color[1], color[2], color[3] );
-   count = PB->count;
-
-   if (ctx->Line.StippleFlag) {
-      /* stippled */
-#define INTERP_XY 1
-#define INTERP_Z 1
-#define INTERP_FOG 1
-#define INTERP_TEX 1
-#define WIDE 1
-#define STIPPLE 1
-#define PLOT(X,Y)			\
-	{				\
-	   pbx[count] = X;		\
-	   pby[count] = Y;		\
-	   pbz[count] = Z;		\
- 	   pbfog[count] = fog0;		\
-	   pbs[count] = fragTexcoord[0];\
-	   pbt[count] = fragTexcoord[1];\
-	   pbu[count] = fragTexcoord[2];\
-	   count++;			\
-	   CHECK_FULL(count);		\
-	}
-#include "s_linetemp.h"
+/* Z, fog, wide, stipple color index line */
+#define NAME general_ci_line
+#define INTERP_INDEX
+#define INTERP_Z
+#define INTERP_FOG
+#define RENDER_SPAN(span)					\
+   if (ctx->Line.StippleFlag) {					\
+      span.arrayMask |= SPAN_MASK;				\
+      compute_stipple_mask(ctx, span.end, span.array->mask);	\
+   }								\
+   if (ctx->Line.Width > 1.0) {					\
+      draw_wide_line(ctx, &span, dx > dy);			\
+   }								\
+   else {							\
+      _mesa_write_index_span(ctx, &span);			\
    }
-   else {
-      /* unstippled */
-#define INTERP_XY 1
-#define INTERP_Z 1
-#define INTERP_FOG 1
-#define INTERP_TEX 1
-#define WIDE 1
-#define PLOT(X,Y)			\
-	{				\
-	   pbx[count] = X;		\
-	   pby[count] = Y;		\
-	   pbz[count] = Z;		\
- 	   pbfog[count] = fog0;		\
-	   pbs[count] = fragTexcoord[0];\
-	   pbt[count] = fragTexcoord[1];\
-	   pbu[count] = fragTexcoord[2];\
-	   count++;			\
-	   CHECK_FULL(count);		\
-	}
 #include "s_linetemp.h"
-   }
-
-   PB->count = count;
-   _mesa_flush_pb(ctx);
-}
 
 
-
-/* Smooth-shaded, textured, any width, maybe stippled */
-static void smooth_textured_line( GLcontext *ctx,
-                                  const SWvertex *vert0,
-				  const SWvertex *vert1 )
-{
-   struct pixel_buffer *PB = SWRAST_CONTEXT(ctx)->PB;
-   GLint count = PB->count;
-   GLint *pbx = PB->x;
-   GLint *pby = PB->y;
-   GLdepth *pbz = PB->z;
-   GLfloat *pbfog = PB->fog;
-   GLfloat *pbs = PB->s[0];
-   GLfloat *pbt = PB->t[0];
-   GLfloat *pbu = PB->u[0];
-   GLchan (*pbrgba)[4] = PB->rgba;
-
-   PB->mono = GL_FALSE;
-
-   if (ctx->Line.StippleFlag) {
-      /* stippled */
-#define INTERP_XY 1
-#define INTERP_Z 1
-#define INTERP_FOG 1
-#define INTERP_RGB 1
-#define INTERP_ALPHA 1
-#define INTERP_TEX 1
-#define WIDE 1
-#define STIPPLE 1
-#define PLOT(X,Y)					\
-	{						\
-	   pbx[count] = X;				\
-	   pby[count] = Y;				\
-	   pbz[count] = Z;				\
- 	   pbfog[count] = fog0;				\
-	   pbs[count] = fragTexcoord[0];		\
-	   pbt[count] = fragTexcoord[1];		\
-	   pbu[count] = fragTexcoord[2];		\
-	   pbrgba[count][RCOMP] = FixedToInt(r0);	\
-	   pbrgba[count][GCOMP] = FixedToInt(g0);	\
-	   pbrgba[count][BCOMP] = FixedToInt(b0);	\
-	   pbrgba[count][ACOMP] = FixedToInt(a0);	\
-	   count++;					\
-	   CHECK_FULL(count);				\
-	}
-#include "s_linetemp.h"
+/* Z, fog, wide, stipple RGBA line */
+#define NAME general_rgba_line
+#define INTERP_RGBA
+#define INTERP_Z
+#define INTERP_FOG
+#define RENDER_SPAN(span)					\
+   if (ctx->Line.StippleFlag) {					\
+      span.arrayMask |= SPAN_MASK;				\
+      compute_stipple_mask(ctx, span.end, span.array->mask);	\
+   }								\
+   if (ctx->Line.Width > 1.0) {					\
+      draw_wide_line(ctx, &span, dx > dy);			\
+   }								\
+   else {							\
+      _mesa_write_rgba_span(ctx, &span);			\
    }
-   else {
-      /* unstippled */
-#define INTERP_XY 1
-#define INTERP_Z 1
-#define INTERP_FOG 1
-#define INTERP_RGB 1
-#define INTERP_ALPHA 1
-#define INTERP_TEX 1
-#define WIDE 1
-#define PLOT(X,Y)					\
-	{						\
-	   pbx[count] = X;				\
-	   pby[count] = Y;				\
-	   pbz[count] = Z;				\
- 	   pbfog[count] = fog0;				\
-	   pbs[count] = fragTexcoord[0];		\
-	   pbt[count] = fragTexcoord[1];		\
-	   pbu[count] = fragTexcoord[2];		\
-	   pbrgba[count][RCOMP] = FixedToInt(r0);	\
-	   pbrgba[count][GCOMP] = FixedToInt(g0);	\
-	   pbrgba[count][BCOMP] = FixedToInt(b0);	\
-	   pbrgba[count][ACOMP] = FixedToInt(a0);	\
-	   count++;					\
-	   CHECK_FULL(count);				\
-	}
 #include "s_linetemp.h"
-   }
-
-   PB->count = count;
-   _mesa_flush_pb(ctx);
-}
-
-
-/* Smooth-shaded, multitextured, any width, maybe stippled, separate specular
- * color interpolation.
- */
-static void smooth_multitextured_line( GLcontext *ctx,
-				       const SWvertex *vert0,
-				       const SWvertex *vert1 )
-{
-   struct pixel_buffer *PB = SWRAST_CONTEXT(ctx)->PB;
-   GLint count = PB->count;
-   GLint *pbx = PB->x;
-   GLint *pby = PB->y;
-   GLdepth *pbz = PB->z;
-   GLfloat *pbfog = PB->fog;
-   GLchan (*pbrgba)[4] = PB->rgba;
-   GLchan (*pbspec)[3] = PB->spec;
 
-   PB->mono = GL_FALSE;
 
-   if (ctx->Line.StippleFlag) {
-      /* stippled */
-#define INTERP_XY 1
-#define INTERP_Z 1
-#define INTERP_FOG 1
-#define INTERP_RGB 1
-#define INTERP_SPEC 1
-#define INTERP_ALPHA 1
-#define INTERP_MULTITEX 1
-#define WIDE 1
-#define STIPPLE 1
-#define PLOT(X,Y)						\
-	{							\
-	   GLuint u;						\
-	   pbx[count] = X;					\
-	   pby[count] = Y;					\
-	   pbz[count] = Z;					\
- 	   pbfog[count] = fog0;					\
-	   pbrgba[count][RCOMP] = FixedToInt(r0);		\
-	   pbrgba[count][GCOMP] = FixedToInt(g0);		\
-	   pbrgba[count][BCOMP] = FixedToInt(b0);		\
-	   pbrgba[count][ACOMP] = FixedToInt(a0);		\
-	   pbspec[count][RCOMP] = FixedToInt(sr0);		\
-	   pbspec[count][GCOMP] = FixedToInt(sg0);		\
-	   pbspec[count][BCOMP] = FixedToInt(sb0);		\
-	   for (u = 0; u < ctx->Const.MaxTextureUnits; u++) {	\
-	      if (ctx->Texture.Unit[u]._ReallyEnabled) {	\
-	         PB->s[u][count] = fragTexcoord[u][0];		\
-	         PB->t[u][count] = fragTexcoord[u][1];		\
-	         PB->u[u][count] = fragTexcoord[u][2];		\
-	      }							\
-	   }							\
-	   count++;						\
-	   CHECK_FULL(count);					\
-	}
-#include "s_linetemp.h"
+/* Single-texture line, w/ fog, Z, specular, etc. */
+#define NAME textured_line
+#define INTERP_RGBA
+#define INTERP_Z
+#define INTERP_FOG
+#define INTERP_TEX
+#define RENDER_SPAN(span)					\
+   if (ctx->Line.StippleFlag) {					\
+      span.arrayMask |= SPAN_MASK;				\
+      compute_stipple_mask(ctx, span.end, span.array->mask);	\
+   }								\
+   if (ctx->Line.Width > 1.0) {					\
+      draw_wide_line(ctx, &span, dx > dy);			\
+   }								\
+   else {							\
+      _mesa_write_texture_span(ctx, &span);			\
    }
-   else {
-      /* unstippled */
-#define INTERP_XY 1
-#define INTERP_Z 1
-#define INTERP_FOG 1
-#define INTERP_RGB 1
-#define INTERP_SPEC 1
-#define INTERP_ALPHA 1
-#define INTERP_MULTITEX 1
-#define WIDE 1
-#define PLOT(X,Y)						\
-	{							\
-	   GLuint u;						\
-	   pbx[count] = X;					\
-	   pby[count] = Y;					\
-	   pbz[count] = Z;					\
- 	   pbfog[count] = fog0;					\
-	   pbrgba[count][RCOMP] = FixedToInt(r0);		\
-	   pbrgba[count][GCOMP] = FixedToInt(g0);		\
-	   pbrgba[count][BCOMP] = FixedToInt(b0);		\
-	   pbrgba[count][ACOMP] = FixedToInt(a0);		\
-	   pbspec[count][RCOMP] = FixedToInt(sr0);		\
-	   pbspec[count][GCOMP] = FixedToInt(sg0);		\
-	   pbspec[count][BCOMP] = FixedToInt(sb0);		\
-	   for (u = 0; u < ctx->Const.MaxTextureUnits; u++) {	\
-	      if (ctx->Texture.Unit[u]._ReallyEnabled) {	\
-	         PB->s[u][count] = fragTexcoord[u][0];		\
-	         PB->t[u][count] = fragTexcoord[u][1];		\
-	         PB->u[u][count] = fragTexcoord[u][2];		\
-	      }							\
-	   }							\
-	   count++;						\
-	   CHECK_FULL(count);					\
-	}
 #include "s_linetemp.h"
-   }
-
-   PB->count = count;
-   _mesa_flush_pb(ctx);
-}
 
 
-/* Flat-shaded, multitextured, any width, maybe stippled, separate specular
- * color interpolation.
- */
-static void flat_multitextured_line( GLcontext *ctx,
-                                     const SWvertex *vert0,
-				     const SWvertex *vert1 )
-{
-   struct pixel_buffer *PB = SWRAST_CONTEXT(ctx)->PB;
-   GLint count = PB->count;
-   GLint *pbx = PB->x;
-   GLint *pby = PB->y;
-   GLdepth *pbz = PB->z;
-   GLfloat *pbfog = PB->fog;
-   GLchan (*pbrgba)[4] = PB->rgba;
-   GLchan (*pbspec)[3] = PB->spec;
-   GLchan *color = (GLchan*) vert1->color;
-   GLchan sRed   = vert1->specular[0];
-   GLchan sGreen = vert1->specular[1];
-   GLchan sBlue  = vert1->specular[2];
-
-   PB->mono = GL_FALSE;
-
-   if (ctx->Line.StippleFlag) {
-      /* stippled */
-#define INTERP_XY 1
-#define INTERP_Z 1
-#define INTERP_FOG 1
-#define INTERP_ALPHA 1
-#define INTERP_MULTITEX 1
-#define WIDE 1
-#define STIPPLE 1
-#define PLOT(X,Y)						\
-	{							\
-	   GLuint u;						\
-	   pbx[count] = X;					\
-	   pby[count] = Y;					\
-	   pbz[count] = Z;					\
- 	   pbfog[count] = fog0;					\
-	   pbrgba[count][RCOMP] = color[0];			\
-	   pbrgba[count][GCOMP] = color[1];			\
-	   pbrgba[count][BCOMP] = color[2];			\
-	   pbrgba[count][ACOMP] = color[3];			\
-	   pbspec[count][RCOMP] = sRed;				\
-	   pbspec[count][GCOMP] = sGreen;			\
-	   pbspec[count][BCOMP] = sBlue;			\
-	   for (u = 0; u < ctx->Const.MaxTextureUnits; u++) {	\
-	      if (ctx->Texture.Unit[u]._ReallyEnabled) {	\
-	         PB->s[u][count] = fragTexcoord[u][0];		\
-	         PB->t[u][count] = fragTexcoord[u][1];		\
-	         PB->u[u][count] = fragTexcoord[u][2];		\
-	      }							\
-	   }							\
-	   count++;						\
-	   CHECK_FULL(count);					\
-	}
-#include "s_linetemp.h"
+/* Multi-texture or separate specular line, w/ fog, Z, specular, etc. */
+#define NAME multitextured_line
+#define INTERP_RGBA
+#define INTERP_SPEC
+#define INTERP_Z
+#define INTERP_FOG
+#define INTERP_MULTITEX
+#define RENDER_SPAN(span)					\
+   if (ctx->Line.StippleFlag) {					\
+      span.arrayMask |= SPAN_MASK;				\
+      compute_stipple_mask(ctx, span.end, span.array->mask);	\
+   }								\
+   if (ctx->Line.Width > 1.0) {					\
+      draw_wide_line(ctx, &span, dx > dy);			\
+   }								\
+   else {							\
+      _mesa_write_texture_span(ctx, &span);			\
    }
-   else {
-      /* unstippled */
-#define INTERP_XY 1
-#define INTERP_Z 1
-#define INTERP_FOG 1
-#define INTERP_ALPHA 1
-#define INTERP_MULTITEX 1
-#define WIDE 1
-#define PLOT(X,Y)						\
-	{							\
-	   GLuint u;						\
-	   pbx[count] = X;					\
-	   pby[count] = Y;					\
-	   pbz[count] = Z;					\
- 	   pbfog[count] = fog0;					\
-	   pbrgba[count][RCOMP] = color[0];			\
-	   pbrgba[count][GCOMP] = color[1];			\
-	   pbrgba[count][BCOMP] = color[2];			\
-	   pbrgba[count][ACOMP] = color[3];			\
-	   pbspec[count][RCOMP] = sRed;				\
-	   pbspec[count][GCOMP] = sGreen;			\
-	   pbspec[count][BCOMP] = sBlue;			\
-	   for (u = 0; u < ctx->Const.MaxTextureUnits; u++) {	\
-	      if (ctx->Texture.Unit[u]._ReallyEnabled) {	\
-	         PB->s[u][count] = fragTexcoord[u][0];		\
-	         PB->t[u][count] = fragTexcoord[u][1];		\
-	         PB->u[u][count] = fragTexcoord[u][2];		\
-	      }							\
-	   }							\
-	   count++;						\
-	   CHECK_FULL(count);					\
-	}
 #include "s_linetemp.h"
-   }
 
-   PB->count = count;
-   _mesa_flush_pb(ctx);
-}
 
 
-void _swrast_add_spec_terms_line( GLcontext *ctx,
-				  const SWvertex *v0,
-				  const SWvertex *v1 )
+void
+_swrast_add_spec_terms_line( GLcontext *ctx,
+                             const SWvertex *v0,
+                             const SWvertex *v1 )
 {
    SWvertex *ncv0 = (SWvertex *)v0;
    SWvertex *ncv1 = (SWvertex *)v1;
@@ -954,46 +247,46 @@ _mesa_print_line_function(GLcontext *ctx)
 {
    SWcontext *swrast = SWRAST_CONTEXT(ctx);
 
-   printf("Line Func == ");
-   if (swrast->Line == flat_ci_line)
-      printf("flat_ci_line\n");
-   else if (swrast->Line == flat_ci_z_line)
-      printf("flat_ci_z_line\n");
-   else if (swrast->Line == flat_rgba_line)
-      printf("flat_rgba_line\n");
-   else if (swrast->Line == flat_rgba_z_line)
-      printf("flat_rgba_z_line\n");
-   else if (swrast->Line == smooth_ci_line)
-      printf("smooth_ci_line\n");
-   else if (swrast->Line == smooth_ci_z_line)
-      printf("smooth_ci_z_line\n");
-   else if (swrast->Line == smooth_rgba_line)
-      printf("smooth_rgba_line\n");
-   else if (swrast->Line == smooth_rgba_z_line)
-      printf("smooth_rgba_z_line\n");
-   else if (swrast->Line == general_smooth_ci_line)
-      printf("general_smooth_ci_line\n");
-   else if (swrast->Line == general_flat_ci_line)
-      printf("general_flat_ci_line\n");
-   else if (swrast->Line == general_smooth_rgba_line)
-      printf("general_smooth_rgba_line\n");
-   else if (swrast->Line == general_flat_rgba_line)
-      printf("general_flat_rgba_line\n");
-   else if (swrast->Line == flat_textured_line)
-      printf("flat_textured_line\n");
-   else if (swrast->Line == smooth_textured_line)
-      printf("smooth_textured_line\n");
-   else if (swrast->Line == smooth_multitextured_line)
-      printf("smooth_multitextured_line\n");
-   else if (swrast->Line == flat_multitextured_line)
-      printf("flat_multitextured_line\n");
+   _mesa_printf("Line Func == ");
+   if (swrast->Line == simple_ci_line)
+      _mesa_printf("simple_ci_line\n");
+   else if (swrast->Line == simple_rgba_line)
+      _mesa_printf("simple_rgba_line\n");
+   else if (swrast->Line == general_ci_line)
+      _mesa_printf("general_ci_line\n");
+   else if (swrast->Line == general_rgba_line)
+      _mesa_printf("general_rgba_line\n");
+   else if (swrast->Line == textured_line)
+      _mesa_printf("textured_line\n");
+   else if (swrast->Line == multitextured_line)
+      _mesa_printf("multitextured_line\n");
    else
-      printf("Driver func %p\n", swrast->Line);
+      _mesa_printf("Driver func %p\n", (void *) swrast->Line);
 }
 #endif
 
 
 
+#ifdef DEBUG
+
+/* record the current line function name */
+static const char *lineFuncName = NULL;
+
+#define USE(lineFunc)                   \
+do {                                    \
+    lineFuncName = #lineFunc;           \
+    /*_mesa_printf("%s\n", lineFuncName);*/   \
+    swrast->Line = lineFunc;            \
+} while (0)
+
+#else
+
+#define USE(lineFunc)  swrast->Line = lineFunc
+
+#endif
+
+
+
 /*
  * Determine which line drawing function to use given the current
  * rendering context.
@@ -1007,83 +300,44 @@ _swrast_choose_line( GLcontext *ctx )
    SWcontext *swrast = SWRAST_CONTEXT(ctx);
    const GLboolean rgbmode = ctx->Visual.rgbMode;
 
-   if (ctx->RenderMode==GL_RENDER) {
+   if (ctx->RenderMode == GL_RENDER) {
       if (ctx->Line.SmoothFlag) {
          /* antialiased lines */
          _swrast_choose_aa_line_function(ctx);
          ASSERT(swrast->Triangle);
       }
-      else if (ctx->Texture._ReallyEnabled) {
-         if (ctx->Texture._ReallyEnabled > TEXTURE0_ANY ||	     
-	     (ctx->_TriangleCaps & DD_SEPARATE_SPECULAR)) {
+      else if (ctx->Texture._EnabledUnits) {
+         /* textured lines */
+         if (ctx->Texture._EnabledUnits > 0x1 || (ctx->_TriangleCaps & DD_SEPARATE_SPECULAR)) {
             /* multi-texture and/or separate specular color */
-            if (ctx->Light.ShadeModel==GL_SMOOTH)
-               swrast->Line = smooth_multitextured_line;
-            else
-               swrast->Line = flat_multitextured_line;
+            USE(multitextured_line);
          }
          else {
-            if (ctx->Light.ShadeModel==GL_SMOOTH) {
-                swrast->Line = smooth_textured_line;
-            }
-            else {
-                swrast->Line = flat_textured_line;
-            }
+            USE(textured_line);
          }
       }
-      else if (ctx->Line.Width!=1.0 || ctx->Line.StippleFlag) {
-         if (ctx->Light.ShadeModel==GL_SMOOTH) {
-            if (rgbmode)
-               swrast->Line = general_smooth_rgba_line;
-            else
-               swrast->Line = general_smooth_ci_line;
-         }
-         else {
-            if (rgbmode)
-               swrast->Line = general_flat_rgba_line;
-            else
-               swrast->Line = general_flat_ci_line;
-         }
+      else if (ctx->Depth.Test || ctx->Fog.Enabled || ctx->Line.Width != 1.0
+               || ctx->Line.StippleFlag) {
+         /* no texture, but Z, fog, width>1, stipple, etc. */
+         if (rgbmode)
+            USE(general_rgba_line);
+         else
+            USE(general_ci_line);
       }
       else {
-	 if (ctx->Light.ShadeModel==GL_SMOOTH) {
-	    /* Width==1, non-stippled, smooth-shaded */
-            if (ctx->Depth.Test || ctx->Fog.Enabled) {
-               if (rgbmode)
-                  swrast->Line = smooth_rgba_z_line;
-               else
-                  swrast->Line = smooth_ci_z_line;
-            }
-            else {
-               if (rgbmode)
-                  swrast->Line = smooth_rgba_line;
-               else
-                  swrast->Line = smooth_ci_line;
-            }
-	 }
-         else {
-	    /* Width==1, non-stippled, flat-shaded */
-            if (ctx->Depth.Test || ctx->Fog.Enabled) {
-               if (rgbmode)
-                  swrast->Line = flat_rgba_z_line;
-               else
-                  swrast->Line = flat_ci_z_line;
-            }
-            else {
-               if (rgbmode)
-                  swrast->Line = flat_rgba_line;
-               else
-                  swrast->Line = flat_ci_line;
-            }
-         }
+         /* simplest lines */
+         if (rgbmode)
+            USE(simple_rgba_line);
+         else
+            USE(simple_ci_line);
       }
    }
-   else if (ctx->RenderMode==GL_FEEDBACK) {
-      swrast->Line = _mesa_feedback_line;
+   else if (ctx->RenderMode == GL_FEEDBACK) {
+      USE(_mesa_feedback_line);
    }
    else {
-      /* GL_SELECT mode */
-      swrast->Line = _mesa_select_line;
+      ASSERT(ctx->RenderMode == GL_SELECT);
+      USE(_mesa_select_line);
    }
 
    /*_mesa_print_line_function(ctx);*/