New SWspan and SWspanarrays typedefs.

40 files changed, 116 insertions, 117 deletions

diff --git a/src/mesa/swrast/s_aaline.c b/src/mesa/swrast/s_aaline.c
index b8c214f689..b3a209923f 100644
--- a/src/mesa/swrast/s_aaline.c
+++ b/src/mesa/swrast/s_aaline.c
@@ -76,7 +76,7 @@ struct LineInfo
    GLfloat texWidth[MAX_TEXTURE_COORD_UNITS];
    GLfloat texHeight[MAX_TEXTURE_COORD_UNITS];
 
-   struct sw_span span;
+   SWspan span;
 };
 
 
diff --git a/src/mesa/swrast/s_aatritemp.h b/src/mesa/swrast/s_aatritemp.h
index 23c262f836..b5470a0298 100644
--- a/src/mesa/swrast/s_aatritemp.h
+++ b/src/mesa/swrast/s_aatritemp.h
@@ -51,7 +51,7 @@
    GLboolean ltor;
    GLfloat majDx, majDy;  /* major (i.e. long) edge dx and dy */
    
-   struct sw_span span;
+   SWspan span;
    
 #ifdef DO_Z
    GLfloat zPlane[4];
@@ -279,7 +279,7 @@
          while (coverage > 0.0F) {
             /* (cx,cy) = center of fragment */
             const GLfloat cx = ix + 0.5F, cy = iy + 0.5F;
-            struct span_arrays *array = span.array;
+            SWspanarrays *array = span.array;
 #ifdef DO_INDEX
             array->coverage[count] = (GLfloat) compute_coveragei(pMin, pMid, pMax, ix, iy);
 #else
@@ -383,7 +383,7 @@
          while (coverage > 0.0F) {
             /* (cx,cy) = center of fragment */
             const GLfloat cx = ix + 0.5F, cy = iy + 0.5F;
-            struct span_arrays *array = span.array;
+            SWspanarrays *array = span.array;
 #ifdef DO_INDEX
             array->coverage[ix] = (GLfloat) compute_coveragei(pMin, pMax, pMid, ix, iy);
 #else
@@ -452,7 +452,7 @@
          /* shift all values to the left */
          /* XXX this is temporary */
          {
-            struct span_arrays *array = span.array;
+            SWspanarrays *array = span.array;
             GLint j;
             for (j = 0; j < (GLint) n; j++) {
 #ifdef DO_RGBA
@@ -482,7 +482,7 @@
 #ifdef DO_MULTITEX
          /* shift texcoords */
          {
-            struct span_arrays *array = span.array;
+            SWspanarrays *array = span.array;
             GLuint unit;
             for (unit = 0; unit < ctx->Const.MaxTextureUnits; unit++) {
                if (ctx->Texture.Unit[unit]._ReallyEnabled) {
diff --git a/src/mesa/swrast/s_accum.c b/src/mesa/swrast/s_accum.c
index 46da9b89da..64b6d6b84e 100644
--- a/src/mesa/swrast/s_accum.c
+++ b/src/mesa/swrast/s_accum.c
@@ -469,7 +469,7 @@ accum_return(GLcontext *ctx, GLfloat value,
       for (i = 0; i < height; i++) {
          GLshort accumRow[4 * MAX_WIDTH];
          GLshort *acc;
-         struct sw_span span;
+         SWspan span;
 
          /* init color span */
          INIT_SPAN(span, GL_BITMAP, width, 0, SPAN_RGBA);
diff --git a/src/mesa/swrast/s_alpha.c b/src/mesa/swrast/s_alpha.c
index 8776e6128d..dadb51319c 100644
--- a/src/mesa/swrast/s_alpha.c
+++ b/src/mesa/swrast/s_alpha.c
@@ -90,7 +90,7 @@ do {						\
  *          1 if one or more pixels passed the alpha test.
  */
 GLint
-_swrast_alpha_test(const GLcontext *ctx, struct sw_span *span)
+_swrast_alpha_test(const GLcontext *ctx, SWspan *span)
 {
    const GLuint n = span->end;
    GLubyte *mask = span->array->mask;
diff --git a/src/mesa/swrast/s_alpha.h b/src/mesa/swrast/s_alpha.h
index add0f74c45..a85ef8a83a 100644
--- a/src/mesa/swrast/s_alpha.h
+++ b/src/mesa/swrast/s_alpha.h
@@ -33,7 +33,7 @@
 
 
 extern GLint
-_swrast_alpha_test( const GLcontext *ctx, struct sw_span *span );
+_swrast_alpha_test( const GLcontext *ctx, SWspan *span );
 
 
 #endif
diff --git a/src/mesa/swrast/s_arbshader.c b/src/mesa/swrast/s_arbshader.c
index c3f85ee157..eeb5cd97ec 100644
--- a/src/mesa/swrast/s_arbshader.c
+++ b/src/mesa/swrast/s_arbshader.c
@@ -38,7 +38,7 @@
 #if FEATURE_ARB_fragment_shader
 
 void
-_swrast_exec_arbshader(GLcontext *ctx, struct sw_span *span)
+_swrast_exec_arbshader(GLcontext *ctx, SWspan *span)
 {
    struct gl2_program_intf **pro;
    GLuint i;
diff --git a/src/mesa/swrast/s_arbshader.h b/src/mesa/swrast/s_arbshader.h
index 805cd4da38..5df80c870b 100644
--- a/src/mesa/swrast/s_arbshader.h
+++ b/src/mesa/swrast/s_arbshader.h
@@ -30,7 +30,7 @@
 
 #if FEATURE_ARB_fragment_shader
 
-extern void _swrast_exec_arbshader (GLcontext *ctx, struct sw_span *span);
+extern void _swrast_exec_arbshader (GLcontext *ctx, SWspan *span);
 
 #endif /* FEATURE_ARB_fragment_shader */
 
diff --git a/src/mesa/swrast/s_atifragshader.c b/src/mesa/swrast/s_atifragshader.c
index 08640e146b..286239400b 100644
--- a/src/mesa/swrast/s_atifragshader.c
+++ b/src/mesa/swrast/s_atifragshader.c
@@ -259,7 +259,7 @@ struct ati_fs_opcode_st ati_fs_opcodes[] = {
 
 static void
 handle_pass_op(struct atifs_machine *machine, struct atifs_setupinst *texinst,
-	       const struct sw_span *span, GLuint column, GLuint idx)
+	       const SWspan *span, GLuint column, GLuint idx)
 {
    GLuint swizzle = texinst->swizzle;
    GLuint pass_tex = texinst->src;
@@ -279,7 +279,7 @@ handle_pass_op(struct atifs_machine *machine, struct atifs_setupinst *texinst,
 
 static void
 handle_sample_op(GLcontext * ctx, struct atifs_machine *machine,
-		 struct atifs_setupinst *texinst, const struct sw_span *span,
+		 struct atifs_setupinst *texinst, const SWspan *span,
 		 GLuint column, GLuint idx)
 {
 /* sample from unit idx using texinst->src as coords */
@@ -307,7 +307,7 @@ do {						\
 static GLboolean
 execute_shader(GLcontext * ctx,
 	       const struct ati_fragment_shader *shader, GLuint maxInst,
-	       struct atifs_machine *machine, const struct sw_span *span,
+	       struct atifs_machine *machine, const SWspan *span,
 	       GLuint column)
 {
    GLuint pc;
@@ -548,7 +548,7 @@ execute_shader(GLcontext * ctx,
 static void
 init_machine(GLcontext * ctx, struct atifs_machine *machine,
 	     const struct ati_fragment_shader *shader,
-	     const struct sw_span *span, GLuint col)
+	     const SWspan *span, GLuint col)
 {
    GLint i, j;
 
@@ -582,7 +582,7 @@ init_machine(GLcontext * ctx, struct atifs_machine *machine,
  * Execute the current fragment program, operating on the given span.
  */
 void
-_swrast_exec_fragment_shader(GLcontext * ctx, struct sw_span *span)
+_swrast_exec_fragment_shader(GLcontext * ctx, SWspan *span)
 {
    const struct ati_fragment_shader *shader = ctx->ATIFragmentShader.Current;
    GLuint i;
diff --git a/src/mesa/swrast/s_atifragshader.h b/src/mesa/swrast/s_atifragshader.h
index 269be1f2e4..871a0c0455 100644
--- a/src/mesa/swrast/s_atifragshader.h
+++ b/src/mesa/swrast/s_atifragshader.h
@@ -31,7 +31,7 @@
 
 
 extern void
-_swrast_exec_fragment_shader( GLcontext *ctx, struct sw_span *span );
+_swrast_exec_fragment_shader( GLcontext *ctx, SWspan *span );
 
 
 #endif
diff --git a/src/mesa/swrast/s_bitmap.c b/src/mesa/swrast/s_bitmap.c
index dd5008cf6b..ab0db3203e 100644
--- a/src/mesa/swrast/s_bitmap.c
+++ b/src/mesa/swrast/s_bitmap.c
@@ -51,7 +51,7 @@ _swrast_Bitmap( GLcontext *ctx, GLint px, GLint py,
    SWcontext *swrast = SWRAST_CONTEXT(ctx);
    GLint row, col;
    GLuint count = 0;
-   struct sw_span span;
+   SWspan span;
 
    ASSERT(ctx->RenderMode == GL_RENDER);
 
@@ -188,7 +188,7 @@ _swrast_Bitmap( GLcontext *ctx, GLint px, GLint py,
 {
    SWcontext *swrast = SWRAST_CONTEXT(ctx);
    GLint row, col;
-   struct sw_span span;
+   SWspan span;
 
    ASSERT(ctx->RenderMode == GL_RENDER);
    ASSERT(bitmap);
diff --git a/src/mesa/swrast/s_blend.c b/src/mesa/swrast/s_blend.c
index a8d45bbf5f..82c5e84294 100644
--- a/src/mesa/swrast/s_blend.c
+++ b/src/mesa/swrast/s_blend.c
@@ -984,8 +984,7 @@ _swrast_choose_blend_func(GLcontext *ctx, GLenum chanType)
  * pixel coordinates.
  */
 void
-_swrast_blend_span(GLcontext *ctx, struct gl_renderbuffer *rb,
-                   struct sw_span *span)
+_swrast_blend_span(GLcontext *ctx, struct gl_renderbuffer *rb, SWspan *span)
 {
    SWcontext *swrast = SWRAST_CONTEXT(ctx);
    void *rbPixels;
diff --git a/src/mesa/swrast/s_blend.h b/src/mesa/swrast/s_blend.h
index 5b8e3b7592..0b8cbed1a0 100644
--- a/src/mesa/swrast/s_blend.h
+++ b/src/mesa/swrast/s_blend.h
@@ -32,8 +32,7 @@
 
 
 extern void
-_swrast_blend_span(GLcontext *ctx, struct gl_renderbuffer *rb,
-                   struct sw_span *span);
+_swrast_blend_span(GLcontext *ctx, struct gl_renderbuffer *rb, SWspan *span);
 
 
 extern void
diff --git a/src/mesa/swrast/s_buffers.c b/src/mesa/swrast/s_buffers.c
index 67a96658e5..0174069922 100644
--- a/src/mesa/swrast/s_buffers.c
+++ b/src/mesa/swrast/s_buffers.c
@@ -48,7 +48,7 @@ clear_rgba_buffer_with_masking(GLcontext *ctx, struct gl_renderbuffer *rb)
    const GLint height = ctx->DrawBuffer->_Ymax - ctx->DrawBuffer->_Ymin;
    const GLint width  = ctx->DrawBuffer->_Xmax - ctx->DrawBuffer->_Xmin;
    GLchan clearColor[4];
-   struct sw_span span;
+   SWspan span;
    GLint i;
 
    ASSERT(ctx->Visual.rgbMode);
@@ -89,7 +89,7 @@ clear_ci_buffer_with_masking(GLcontext *ctx, struct gl_renderbuffer *rb)
    const GLint y = ctx->DrawBuffer->_Ymin;
    const GLint height = ctx->DrawBuffer->_Ymax - ctx->DrawBuffer->_Ymin;
    const GLint width  = ctx->DrawBuffer->_Xmax - ctx->DrawBuffer->_Xmin;
-   struct sw_span span;
+   SWspan span;
    GLint i;
 
    ASSERT(!ctx->Visual.rgbMode);
diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c
index 950561b5fc..18f5fe497b 100644
--- a/src/mesa/swrast/s_context.c
+++ b/src/mesa/swrast/s_context.c
@@ -671,7 +671,7 @@ _swrast_CreateContext( GLcontext *ctx )
    for (i = 0; i < MAX_TEXTURE_IMAGE_UNITS; i++)
       swrast->TextureSample[i] = NULL;
 
-   swrast->SpanArrays = MALLOC_STRUCT(span_arrays);
+   swrast->SpanArrays = MALLOC_STRUCT(sw_span_arrays);
    if (!swrast->SpanArrays) {
       FREE(swrast);
       return GL_FALSE;
diff --git a/src/mesa/swrast/s_context.h b/src/mesa/swrast/s_context.h
index b044790214..6ccee5438e 100644
--- a/src/mesa/swrast/s_context.h
+++ b/src/mesa/swrast/s_context.h
@@ -49,7 +49,7 @@
 
 /**
  * \defgroup SpanFlags SPAN_XXX-flags
- * Bitmasks to indicate which span_arrays need to be computed
+ * Bitmasks to indicate which sw_span_arrays need to be computed
  * (sw_span::interpMask) or have already been filled in (sw_span::arrayMask)
  */
 /*@{*/
@@ -87,14 +87,14 @@ struct arrays2 {
 
 
 /**
- * \struct span_arrays 
+ * \sw_span_arrays 
  * \brief Arrays of fragment values.
  *
  * These will either be computed from the x/xStep values above or
  * filled in by glDraw/CopyPixels, etc.
  * These arrays are separated out of sw_span to conserve memory.
  */
-struct span_arrays {
+typedef struct sw_span_arrays {
    GLenum ChanType; /**< Color channel type, GL_UNSIGNED_BYTE, GL_FLOAT */
    union {
       struct {
@@ -126,11 +126,11 @@ struct span_arrays {
 
    /** This mask indicates which fragments are alive or culled */
    GLubyte mask[MAX_WIDTH];
-};
+} SWspanarrays;
 
 
 /**
- * \struct sw_span
+ * \SWspan
  * \brief Contains data for either a horizontal line or a set of
  * pixels that are passed through a pipeline of functions before being
  * drawn.
@@ -151,7 +151,7 @@ struct span_arrays {
  * stream of these structures which would be consumed by one or more
  * span-processing threads which could run in parallel.
  */
-struct sw_span {
+typedef struct sw_span {
    GLint x, y;
 
    /** Only need to process pixels between start <= i < end */
@@ -228,8 +228,9 @@ struct sw_span {
     * a lot of memory.  The span_arrays struct is about 400KB while the
     * sw_span struct is only about 512 bytes.
     */
-   struct span_arrays *array;
-};
+   SWspanarrays *array;
+} SWspan;
+
 
 
 #define INIT_SPAN(S, PRIMITIVE, END, INTERP_MASK, ARRAY_MASK)	\
@@ -304,7 +305,7 @@ typedef void (*validate_texture_image_func)(GLcontext *ctx,
 
 /**
  * \struct SWcontext
- * \brief SWContext?
+ * \brief  Per-context state that's private to the software rasterizer module.
  */
 typedef struct
 {
@@ -387,12 +388,12 @@ typedef struct
     * this object is big and causes problems when allocated on the stack
     * on some systems.
     */
-   struct span_arrays *SpanArrays;
+   SWspanarrays *SpanArrays;
 
    /**
     * Used to buffer N GL_POINTS, instead of rendering one by one.
     */
-   struct sw_span PointSpan;
+   SWspan PointSpan;
 
    /** Internal hooks, kept up to date by the same mechanism as above.
     */
diff --git a/src/mesa/swrast/s_copypix.c b/src/mesa/swrast/s_copypix.c
index 88fd445132..2654df3e48 100644
--- a/src/mesa/swrast/s_copypix.c
+++ b/src/mesa/swrast/s_copypix.c
@@ -135,7 +135,7 @@ copy_conv_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy,
    const GLboolean zoom = ctx->Pixel.ZoomX != 1.0F || ctx->Pixel.ZoomY != 1.0F;
    const GLuint transferOps = ctx->_ImageTransferState;
    GLfloat *dest, *tmpImage, *convImage;
-   struct sw_span span;
+   SWspan span;
 
    INIT_SPAN(span, GL_BITMAP, 0, 0, SPAN_RGBA);
 
@@ -253,7 +253,7 @@ copy_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy,
    const GLboolean zoom = ctx->Pixel.ZoomX != 1.0F || ctx->Pixel.ZoomY != 1.0F;
    GLint overlapping;
    const GLuint transferOps = ctx->_ImageTransferState;
-   struct sw_span span;
+   SWspan span;
 
    if (!ctx->ReadBuffer->_ColorReadBuffer) {
       /* no readbuffer - OK */
@@ -387,7 +387,7 @@ copy_ci_pixels( GLcontext *ctx, GLint srcx, GLint srcy,
    const GLboolean zoom = ctx->Pixel.ZoomX != 1.0F || ctx->Pixel.ZoomY != 1.0F;
    const GLboolean shift_or_offset = ctx->Pixel.IndexShift || ctx->Pixel.IndexOffset;
    GLint overlapping;
-   struct sw_span span;
+   SWspan span;
 
    if (!ctx->ReadBuffer->_ColorReadBuffer) {
       /* no readbuffer - OK */
@@ -530,7 +530,7 @@ copy_depth_pixels( GLcontext *ctx, GLint srcx, GLint srcy,
    GLint j;
    const GLboolean zoom = ctx->Pixel.ZoomX != 1.0F || ctx->Pixel.ZoomY != 1.0F;
    GLint overlapping;
-   struct sw_span span;
+   SWspan span;
 
    if (!readRb) {
       /* no readbuffer - OK */
diff --git a/src/mesa/swrast/s_depth.c b/src/mesa/swrast/s_depth.c
index 1001cea352..cb584b5de8 100644
--- a/src/mesa/swrast/s_depth.c
+++ b/src/mesa/swrast/s_depth.c
@@ -503,7 +503,7 @@ depth_test_span32( GLcontext *ctx, GLuint n,
  * Apply depth test to span of fragments.
  */
 static GLuint
-depth_test_span( GLcontext *ctx, struct sw_span *span)
+depth_test_span( GLcontext *ctx, SWspan *span)
 {
    struct gl_framebuffer *fb = ctx->DrawBuffer;
    struct gl_renderbuffer *rb = fb->_DepthBuffer;
@@ -1051,7 +1051,7 @@ direct_depth_test_pixels32(GLcontext *ctx, GLuint *zStart, GLuint stride,
 
 
 static GLuint
-depth_test_pixels( GLcontext *ctx, struct sw_span *span )
+depth_test_pixels( GLcontext *ctx, SWspan *span )
 {
    struct gl_framebuffer *fb = ctx->DrawBuffer;
    struct gl_renderbuffer *rb = fb->_DepthBuffer;
@@ -1101,7 +1101,7 @@ depth_test_pixels( GLcontext *ctx, struct sw_span *span )
  * \return approx number of pixels that passed (only zero is reliable)
  */
 GLuint
-_swrast_depth_test_span( GLcontext *ctx, struct sw_span *span)
+_swrast_depth_test_span( GLcontext *ctx, SWspan *span)
 {
    if (span->arrayMask & SPAN_XY)
       return depth_test_pixels(ctx, span);
@@ -1118,7 +1118,7 @@ _swrast_depth_test_span( GLcontext *ctx, struct sw_span *span)
  * \return GL_TRUE if any fragments pass, GL_FALSE if no fragments pass
  */
 GLboolean
-_swrast_depth_bounds_test( GLcontext *ctx, struct sw_span *span )
+_swrast_depth_bounds_test( GLcontext *ctx, SWspan *span )
 {
    struct gl_framebuffer *fb = ctx->DrawBuffer;
    struct gl_renderbuffer *rb = fb->_DepthBuffer;
diff --git a/src/mesa/swrast/s_depth.h b/src/mesa/swrast/s_depth.h
index f93d95fa3d..d1ed050efd 100644
--- a/src/mesa/swrast/s_depth.h
+++ b/src/mesa/swrast/s_depth.h
@@ -32,11 +32,11 @@
 
 
 extern GLuint
-_swrast_depth_test_span( GLcontext *ctx, struct sw_span *span);
+_swrast_depth_test_span( GLcontext *ctx, SWspan *span);
 
 
 extern GLboolean
-_swrast_depth_bounds_test( GLcontext *ctx, struct sw_span *span );
+_swrast_depth_bounds_test( GLcontext *ctx, SWspan *span );
 
 
 extern void
diff --git a/src/mesa/swrast/s_drawpix.c b/src/mesa/swrast/s_drawpix.c
index cf8adbe40a..ac09401bba 100644
--- a/src/mesa/swrast/s_drawpix.c
+++ b/src/mesa/swrast/s_drawpix.c
@@ -54,7 +54,7 @@ fast_draw_pixels(GLcontext *ctx, GLint x, GLint y,
    const GLint imgX = x, imgY = y;
    struct gl_renderbuffer *rb = ctx->DrawBuffer->_ColorDrawBuffers[0][0];
    SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   struct sw_span span;
+   SWspan span;
 
    INIT_SPAN(span, GL_BITMAP, 0, 0, SPAN_RGBA);
 
@@ -459,7 +459,7 @@ draw_index_pixels( GLcontext *ctx, GLint x, GLint y,
    const GLint imgX = x, imgY = y;
    const GLboolean zoom = ctx->Pixel.ZoomX!=1.0 || ctx->Pixel.ZoomY!=1.0;
    GLint row, skipPixels;
-   struct sw_span span;
+   SWspan span;
 
    INIT_SPAN(span, GL_BITMAP, 0, 0, SPAN_INDEX);
 
@@ -565,7 +565,7 @@ draw_depth_pixels( GLcontext *ctx, GLint x, GLint y,
    const GLboolean scaleOrBias
       = ctx->Pixel.DepthScale != 1.0 || ctx->Pixel.DepthBias != 0.0;
    const GLboolean zoom = ctx->Pixel.ZoomX != 1.0 || ctx->Pixel.ZoomY != 1.0;
-   struct sw_span span;
+   SWspan span;
 
    INIT_SPAN(span, GL_BITMAP, 0, 0, SPAN_Z);
 
@@ -683,7 +683,7 @@ draw_rgba_pixels( GLcontext *ctx, GLint x, GLint y,
    GLboolean quickDraw;
    GLfloat *convImage = NULL;
    GLuint transferOps = ctx->_ImageTransferState;
-   struct sw_span span;
+   SWspan span;
 
    INIT_SPAN(span, GL_BITMAP, 0, 0, SPAN_RGBA);
 
diff --git a/src/mesa/swrast/s_fog.c b/src/mesa/swrast/s_fog.c
index daa74ca0ca..1d6c4cd024 100644
--- a/src/mesa/swrast/s_fog.c
+++ b/src/mesa/swrast/s_fog.c
@@ -107,7 +107,7 @@ do {									\
  * _PreferPixelFog should be in sync with that state!
  */
 void
-_swrast_fog_rgba_span( const GLcontext *ctx, struct sw_span *span )
+_swrast_fog_rgba_span( const GLcontext *ctx, SWspan *span )
 {
    const SWcontext *swrast = SWRAST_CONTEXT(ctx);
    const GLfloat rFog = ctx->Fog.Color[RCOMP] * CHAN_MAX;
@@ -263,7 +263,7 @@ _swrast_fog_rgba_span( const GLcontext *ctx, struct sw_span *span )
  * As above, but color index mode.
  */
 void
-_swrast_fog_ci_span( const GLcontext *ctx, struct sw_span *span )
+_swrast_fog_ci_span( const GLcontext *ctx, SWspan *span )
 {
    const SWcontext *swrast = SWRAST_CONTEXT(ctx);
    const GLuint haveW = (span->interpMask & SPAN_W);
diff --git a/src/mesa/swrast/s_fog.h b/src/mesa/swrast/s_fog.h
index f5744b1d95..9639bee2cc 100644
--- a/src/mesa/swrast/s_fog.h
+++ b/src/mesa/swrast/s_fog.h
@@ -36,10 +36,10 @@ extern GLfloat
 _swrast_z_to_fogfactor(GLcontext *ctx, GLfloat z);
 
 extern void
-_swrast_fog_rgba_span( const GLcontext *ctx, struct sw_span *span );
+_swrast_fog_rgba_span( const GLcontext *ctx, SWspan *span );
 
 extern void
-_swrast_fog_ci_span( const GLcontext *ctx, struct sw_span *span );
+_swrast_fog_ci_span( const GLcontext *ctx, SWspan *span );
 
 
 #endif
diff --git a/src/mesa/swrast/s_lines.c b/src/mesa/swrast/s_lines.c
index 1abe85c541..ff507249b0 100644
--- a/src/mesa/swrast/s_lines.c
+++ b/src/mesa/swrast/s_lines.c
@@ -61,7 +61,7 @@ compute_stipple_mask( GLcontext *ctx, GLuint len, GLubyte mask[] )
  * 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 )
+draw_wide_line( GLcontext *ctx, SWspan *span, GLboolean xMajor )
 {
    GLint width, start;
 
diff --git a/src/mesa/swrast/s_linetemp.h b/src/mesa/swrast/s_linetemp.h
index f7c5ab4923..f5b2d95653 100644
--- a/src/mesa/swrast/s_linetemp.h
+++ b/src/mesa/swrast/s_linetemp.h
@@ -70,7 +70,7 @@
 static void
 NAME( GLcontext *ctx, const SWvertex *vert0, const SWvertex *vert1 )
 {
-   struct sw_span span;
+   SWspan span;
    GLuint interpFlags = 0;
    GLint x0 = (GLint) vert0->win[0];
    GLint x1 = (GLint) vert1->win[0];
diff --git a/src/mesa/swrast/s_logic.c b/src/mesa/swrast/s_logic.c
index 214e4e7735..719b17962d 100644
--- a/src/mesa/swrast/s_logic.c
+++ b/src/mesa/swrast/s_logic.c
@@ -188,7 +188,7 @@ logicop_uint4(GLcontext *ctx, GLuint n, GLuint src[], const GLuint dest[],
  */
 void
 _swrast_logicop_ci_span(GLcontext *ctx, struct gl_renderbuffer *rb,
-                        struct sw_span *span)
+                        SWspan *span)
 {
    GLuint dest[MAX_WIDTH];
    GLuint *index = span->array->index;
@@ -216,7 +216,7 @@ _swrast_logicop_ci_span(GLcontext *ctx, struct gl_renderbuffer *rb,
  */
 void
 _swrast_logicop_rgba_span(GLcontext *ctx, struct gl_renderbuffer *rb,
-                          struct sw_span *span)
+                          SWspan *span)
 {
    void *rbPixels;
 
diff --git a/src/mesa/swrast/s_logic.h b/src/mesa/swrast/s_logic.h
index 55fbf66025..0bc2c3f8a8 100644
--- a/src/mesa/swrast/s_logic.h
+++ b/src/mesa/swrast/s_logic.h
@@ -33,12 +33,12 @@
 
 extern void
 _swrast_logicop_ci_span(GLcontext *ctx, struct gl_renderbuffer *rb,
-                        struct sw_span *span);
+                        SWspan *span);
 
 
 extern void
 _swrast_logicop_rgba_span(GLcontext *ctx, struct gl_renderbuffer *rb,
-                          struct sw_span *span);
+                          SWspan *span);
 
 
 #endif
diff --git a/src/mesa/swrast/s_masking.c b/src/mesa/swrast/s_masking.c
index 4a82bbe8e6..65c984dd3e 100644
--- a/src/mesa/swrast/s_masking.c
+++ b/src/mesa/swrast/s_masking.c
@@ -41,7 +41,7 @@
  */
 void
 _swrast_mask_rgba_span(GLcontext *ctx, struct gl_renderbuffer *rb,
-                       struct sw_span *span)
+                       SWspan *span)
 {
    const GLuint n = span->end;
    void *rbPixels;
@@ -108,7 +108,7 @@ _swrast_mask_rgba_span(GLcontext *ctx, struct gl_renderbuffer *rb,
  */
 void
 _swrast_mask_ci_span(GLcontext *ctx, struct gl_renderbuffer *rb,
-                     struct sw_span *span)
+                     SWspan *span)
 {
    const GLuint srcMask = ctx->Color.IndexMask;
    const GLuint dstMask = ~srcMask;
diff --git a/src/mesa/swrast/s_masking.h b/src/mesa/swrast/s_masking.h
index 2dba6cea4c..0596cb3f45 100644
--- a/src/mesa/swrast/s_masking.h
+++ b/src/mesa/swrast/s_masking.h
@@ -33,11 +33,11 @@
 
 extern void
 _swrast_mask_rgba_span(GLcontext *ctx, struct gl_renderbuffer *rb,
-                       struct sw_span *span);
+                       SWspan *span);
 
 
 extern void
 _swrast_mask_ci_span(GLcontext *ctx, struct gl_renderbuffer *rb,
-                     struct sw_span *span);
+                     SWspan *span);
 
 #endif
diff --git a/src/mesa/swrast/s_nvfragprog.c b/src/mesa/swrast/s_nvfragprog.c
index 97dbed04a8..658b6efe32 100644
--- a/src/mesa/swrast/s_nvfragprog.c
+++ b/src/mesa/swrast/s_nvfragprog.c
@@ -193,7 +193,7 @@ fetch_vector4( GLcontext *ctx,
 static GLboolean
 fetch_vector4_deriv( GLcontext *ctx,
                      const struct prog_src_register *source,
-                     const struct sw_span *span,
+                     const SWspan *span,
                      char xOrY, GLint column, GLfloat result[4] )
 {
    GLfloat src[4];
@@ -478,7 +478,7 @@ static void
 init_machine_deriv( GLcontext *ctx,
                     const struct fp_machine *machine,
                     const struct gl_fragment_program *program,
-                    const struct sw_span *span, char xOrY,
+                    const SWspan *span, char xOrY,
                     struct fp_machine *dMachine )
 {
    GLuint u;
@@ -589,7 +589,7 @@ init_machine_deriv( GLcontext *ctx,
 static GLboolean
 execute_program( GLcontext *ctx,
                  const struct gl_fragment_program *program, GLuint maxInst,
-                 struct fp_machine *machine, const struct sw_span *span,
+                 struct fp_machine *machine, const SWspan *span,
                  GLuint column )
 {
    GLuint pc;
@@ -1382,7 +1382,7 @@ execute_program( GLcontext *ctx,
 static void
 init_machine( GLcontext *ctx, struct fp_machine *machine,
               const struct gl_fragment_program *program,
-              const struct sw_span *span, GLuint col )
+              const SWspan *span, GLuint col )
 {
    GLuint inputsRead = program->Base.InputsRead;
    GLuint u;
@@ -1456,7 +1456,7 @@ init_machine( GLcontext *ctx, struct fp_machine *machine,
  * Execute the current fragment program, operating on the given span.
  */
 void
-_swrast_exec_fragment_program( GLcontext *ctx, struct sw_span *span )
+_swrast_exec_fragment_program( GLcontext *ctx, SWspan *span )
 {
    const struct gl_fragment_program *program = ctx->FragmentProgram._Current;
    GLuint i;
diff --git a/src/mesa/swrast/s_nvfragprog.h b/src/mesa/swrast/s_nvfragprog.h
index ac5a15fe9b..188bacc3d8 100644
--- a/src/mesa/swrast/s_nvfragprog.h
+++ b/src/mesa/swrast/s_nvfragprog.h
@@ -31,7 +31,7 @@
 
 
 extern void
-_swrast_exec_fragment_program( GLcontext *ctx, struct sw_span *span );
+_swrast_exec_fragment_program( GLcontext *ctx, SWspan *span );
 
 
 #endif
diff --git a/src/mesa/swrast/s_pointtemp.h b/src/mesa/swrast/s_pointtemp.h
index 432bf05add..6316833a68 100644
--- a/src/mesa/swrast/s_pointtemp.h
+++ b/src/mesa/swrast/s_pointtemp.h
@@ -92,7 +92,7 @@ NAME ( GLcontext *ctx, const SWvertex *vert )
    GLuint u;
 #endif
    SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   struct sw_span *span = &(swrast->PointSpan);
+   SWspan *span = &(swrast->PointSpan);
 
    /* Cull primitives with malformed coordinates.
     */
diff --git a/src/mesa/swrast/s_span.c b/src/mesa/swrast/s_span.c
index 8c4ee3e909..7ae9f7ffb6 100644
--- a/src/mesa/swrast/s_span.c
+++ b/src/mesa/swrast/s_span.c
@@ -56,7 +56,7 @@
  * Used during setup for glDraw/CopyPixels.
  */
 void
-_swrast_span_default_z( GLcontext *ctx, struct sw_span *span )
+_swrast_span_default_z( GLcontext *ctx, SWspan *span )
 {
    const GLfloat depthMax = ctx->DrawBuffer->_DepthMaxF;
    if (ctx->DrawBuffer->Visual.depthBits <= 16)
@@ -73,7 +73,7 @@ _swrast_span_default_z( GLcontext *ctx, struct sw_span *span )
  * Used during setup for glDraw/CopyPixels.
  */
 void
-_swrast_span_default_fog( GLcontext *ctx, struct sw_span *span )
+_swrast_span_default_fog( GLcontext *ctx, SWspan *span )
 {
    span->fog = _swrast_z_to_fogfactor(ctx, ctx->Current.RasterDistance);
    span->fogStep = span->dfogdx = span->dfogdy = 0.0F;
@@ -86,7 +86,7 @@ _swrast_span_default_fog( GLcontext *ctx, struct sw_span *span )
  * Used during setup for glDraw/CopyPixels.
  */
 void
-_swrast_span_default_color( GLcontext *ctx, struct sw_span *span )
+_swrast_span_default_color( GLcontext *ctx, SWspan *span )
 {
    if (ctx->Visual.rgbMode) {
       GLchan r, g, b, a;
@@ -124,7 +124,7 @@ _swrast_span_default_color( GLcontext *ctx, struct sw_span *span )
  * Used during setup for glDraw/CopyPixels.
  */
 void
-_swrast_span_default_texcoords( GLcontext *ctx, struct sw_span *span )
+_swrast_span_default_texcoords( GLcontext *ctx, SWspan *span )
 {
    GLuint i;
    for (i = 0; i < ctx->Const.MaxTextureCoordUnits; i++) {
@@ -154,7 +154,7 @@ _swrast_span_default_texcoords( GLcontext *ctx, struct sw_span *span )
  * \param specular  if true, interpolate specular, else interpolate rgba.
  */
 static void
-interpolate_colors(GLcontext *ctx, struct sw_span *span, GLboolean specular)
+interpolate_colors(GLcontext *ctx, SWspan *span, GLboolean specular)
 {
    const GLuint n = span->end;
    GLuint i;
@@ -366,7 +366,7 @@ interpolate_colors(GLcontext *ctx, struct sw_span *span, GLboolean specular)
 
 /* Fill in the span.color.index array from the interpolation values */
 static void
-interpolate_indexes(GLcontext *ctx, struct sw_span *span)
+interpolate_indexes(GLcontext *ctx, SWspan *span)
 {
    GLfixed index = span->index;
    const GLint indexStep = span->indexStep;
@@ -398,7 +398,7 @@ interpolate_indexes(GLcontext *ctx, struct sw_span *span)
 
 /* Fill in the span.array.fog values from the interpolation values */
 static void
-interpolate_fog(const GLcontext *ctx, struct sw_span *span)
+interpolate_fog(const GLcontext *ctx, SWspan *span)
 {
    GLfloat *fog = span->array->fog;
    const GLfloat fogStep = span->fogStep;
@@ -418,7 +418,7 @@ interpolate_fog(const GLcontext *ctx, struct sw_span *span)
 
 /* Fill in the span.zArray array from the interpolation values */
 void
-_swrast_span_interpolate_z( const GLcontext *ctx, struct sw_span *span )
+_swrast_span_interpolate_z( const GLcontext *ctx, SWspan *span )
 {
    const GLuint n = span->end;
    GLuint i;
@@ -506,7 +506,7 @@ _swrast_compute_lambda(GLfloat dsdx, GLfloat dsdy, GLfloat dtdx, GLfloat dtdy,
  * or user-written code.
  */
 static void
-interpolate_texcoords(GLcontext *ctx, struct sw_span *span)
+interpolate_texcoords(GLcontext *ctx, SWspan *span)
 {
    ASSERT(span->interpMask & SPAN_TEXTURE);
    ASSERT(!(span->arrayMask & SPAN_TEXTURE));
@@ -790,7 +790,7 @@ interpolate_texcoords(GLcontext *ctx, struct sw_span *span)
  * Fill in the span.varying array from the interpolation values.
  */
 static void
-interpolate_varying(GLcontext *ctx, struct sw_span *span)
+interpolate_varying(GLcontext *ctx, SWspan *span)
 {
    GLuint i, j;
 
@@ -822,7 +822,7 @@ interpolate_varying(GLcontext *ctx, struct sw_span *span)
  * Apply the current polygon stipple pattern to a span of pixels.
  */
 static void
-stipple_polygon_span( GLcontext *ctx, struct sw_span *span )
+stipple_polygon_span( GLcontext *ctx, SWspan *span )
 {
    const GLuint highbit = 0x80000000;
    const GLuint stipple = ctx->PolygonStipple[span->y % 32];
@@ -855,7 +855,7 @@ stipple_polygon_span( GLcontext *ctx, struct sw_span *span )
  *           GL_FALSE  nothing visible
  */
 static GLuint
-clip_span( GLcontext *ctx, struct sw_span *span )
+clip_span( GLcontext *ctx, SWspan *span )
 {
    const GLint xmin = ctx->DrawBuffer->_Xmin;
    const GLint xmax = ctx->DrawBuffer->_Xmax;
@@ -923,7 +923,7 @@ clip_span( GLcontext *ctx, struct sw_span *span )
  * to their original values before returning.
  */
 void
-_swrast_write_index_span( GLcontext *ctx, struct sw_span *span)
+_swrast_write_index_span( GLcontext *ctx, SWspan *span)
 {
    const SWcontext *swrast = SWRAST_CONTEXT(ctx);
    const GLbitfield origInterpMask = span->interpMask;
@@ -1154,7 +1154,7 @@ _swrast_write_index_span( GLcontext *ctx, struct sw_span *span)
  * GL_LIGHT_MODEL_COLOR_CONTROL = GL_SEPARATE_SPECULAR_COLOR.
  */
 static void
-add_specular(GLcontext *ctx, struct sw_span *span)
+add_specular(GLcontext *ctx, SWspan *span)
 {
    switch (span->array->ChanType) {
    case GL_UNSIGNED_BYTE:
@@ -1214,7 +1214,7 @@ add_specular(GLcontext *ctx, struct sw_span *span)
  * Convert the span's color arrays to the given type.
  */
 static void
-convert_color_type(GLcontext *ctx, struct sw_span *span, GLenum newType)
+convert_color_type(GLcontext *ctx, SWspan *span, GLenum newType)
 {
    const GLubyte *mask = span->array->mask;
    GLubyte (*rgba1)[4] = span->array->color.sz1.rgba;
@@ -1315,7 +1315,7 @@ convert_color_type(GLcontext *ctx, struct sw_span *span, GLenum newType)
  * to their original values before returning.
  */
 void
-_swrast_write_rgba_span( GLcontext *ctx, struct sw_span *span)
+_swrast_write_rgba_span( GLcontext *ctx, SWspan *span)
 {
    const GLuint colorMask = *((GLuint *) ctx->Color.ColorMask);
    SWcontext *swrast = SWRAST_CONTEXT(ctx);
@@ -1859,7 +1859,7 @@ _swrast_get_row(GLcontext *ctx, struct gl_renderbuffer *rb,
  */
 void *
 _swrast_get_dest_rgba(GLcontext *ctx, struct gl_renderbuffer *rb,
-                      struct sw_span *span)
+                      SWspan *span)
 {
    GLuint pixelSize;
    void *rbPixels;
diff --git a/src/mesa/swrast/s_span.h b/src/mesa/swrast/s_span.h
index 4e8ba8e132..efc98f290c 100644
--- a/src/mesa/swrast/s_span.h
+++ b/src/mesa/swrast/s_span.h
@@ -32,19 +32,19 @@
 
 
 extern void
-_swrast_span_default_z( GLcontext *ctx, struct sw_span *span );
+_swrast_span_default_z( GLcontext *ctx, SWspan *span );
 
 extern void
-_swrast_span_interpolate_z( const GLcontext *ctx, struct sw_span *span );
+_swrast_span_interpolate_z( const GLcontext *ctx, SWspan *span );
 
 extern void
-_swrast_span_default_fog( GLcontext *ctx, struct sw_span *span );
+_swrast_span_default_fog( GLcontext *ctx, SWspan *span );
 
 extern void
-_swrast_span_default_color( GLcontext *ctx, struct sw_span *span );
+_swrast_span_default_color( GLcontext *ctx, SWspan *span );
 
 extern void
-_swrast_span_default_texcoords( GLcontext *ctx, struct sw_span *span );
+_swrast_span_default_texcoords( GLcontext *ctx, SWspan *span );
 
 extern GLfloat
 _swrast_compute_lambda(GLfloat dsdx, GLfloat dsdy, GLfloat dtdx, GLfloat dtdy,
@@ -52,11 +52,11 @@ _swrast_compute_lambda(GLfloat dsdx, GLfloat dsdy, GLfloat dtdx, GLfloat dtdy,
                        GLfloat s, GLfloat t, GLfloat q, GLfloat invQ);
 
 extern void
-_swrast_write_index_span( GLcontext *ctx, struct sw_span *span);
+_swrast_write_index_span( GLcontext *ctx, SWspan *span);
 
 
 extern void
-_swrast_write_rgba_span( GLcontext *ctx, struct sw_span *span);
+_swrast_write_rgba_span( GLcontext *ctx, SWspan *span);
 
 
 extern void
@@ -85,6 +85,6 @@ _swrast_get_row(GLcontext *ctx, struct gl_renderbuffer *rb,
 
 extern void *
 _swrast_get_dest_rgba(GLcontext *ctx, struct gl_renderbuffer *rb,
-                      struct sw_span *span);
+                      SWspan *span);
 
 #endif
diff --git a/src/mesa/swrast/s_stencil.c b/src/mesa/swrast/s_stencil.c
index 1c78f848e1..dbab6b3c20 100644
--- a/src/mesa/swrast/s_stencil.c
+++ b/src/mesa/swrast/s_stencil.c
@@ -406,7 +406,7 @@ do_stencil_test( GLcontext *ctx, GLuint face, GLuint n, GLstencil stencil[],
  *
  */
 static GLboolean
-stencil_and_ztest_span(GLcontext *ctx, struct sw_span *span, GLuint face)
+stencil_and_ztest_span(GLcontext *ctx, SWspan *span, GLuint face)
 {
    struct gl_framebuffer *fb = ctx->DrawBuffer;
    struct gl_renderbuffer *rb = fb->_StencilBuffer;
@@ -900,7 +900,7 @@ stencil_test_pixels( GLcontext *ctx, GLuint face, GLuint n,
  *         GL_TRUE - one or more fragments passed the testing
  */
 static GLboolean
-stencil_and_ztest_pixels( GLcontext *ctx, struct sw_span *span, GLuint face )
+stencil_and_ztest_pixels( GLcontext *ctx, SWspan *span, GLuint face )
 {
    struct gl_framebuffer *fb = ctx->DrawBuffer;
    struct gl_renderbuffer *rb = fb->_StencilBuffer;
@@ -1007,7 +1007,7 @@ stencil_and_ztest_pixels( GLcontext *ctx, struct sw_span *span, GLuint face )
  * GL_FALSE = all fragments failed.
  */
 GLboolean
-_swrast_stencil_and_ztest_span(GLcontext *ctx, struct sw_span *span)
+_swrast_stencil_and_ztest_span(GLcontext *ctx, SWspan *span)
 {
    /* span->facing can only be non-zero if using two-sided stencil */
    ASSERT(ctx->Stencil._TestTwoSide || span->facing == 0);
diff --git a/src/mesa/swrast/s_stencil.h b/src/mesa/swrast/s_stencil.h
index fabc25250d..1fcb538fec 100644
--- a/src/mesa/swrast/s_stencil.h
+++ b/src/mesa/swrast/s_stencil.h
@@ -33,7 +33,7 @@
 
 
 extern GLboolean
-_swrast_stencil_and_ztest_span(GLcontext *ctx, struct sw_span *span);
+_swrast_stencil_and_ztest_span(GLcontext *ctx, SWspan *span);
 
 
 extern void
diff --git a/src/mesa/swrast/s_texcombine.c b/src/mesa/swrast/s_texcombine.c
index ac26c9cebb..efa2ed3488 100644
--- a/src/mesa/swrast/s_texcombine.c
+++ b/src/mesa/swrast/s_texcombine.c
@@ -1073,7 +1073,7 @@ texture_apply( const GLcontext *ctx,
  * Apply texture mapping to a span of fragments.
  */
 void
-_swrast_texture_span( GLcontext *ctx, struct sw_span *span )
+_swrast_texture_span( GLcontext *ctx, SWspan *span )
 {
    SWcontext *swrast = SWRAST_CONTEXT(ctx);
    GLchan primary_rgba[MAX_WIDTH][4];
diff --git a/src/mesa/swrast/s_texcombine.h b/src/mesa/swrast/s_texcombine.h
index eca967c540..3bf70e0b86 100644
--- a/src/mesa/swrast/s_texcombine.h
+++ b/src/mesa/swrast/s_texcombine.h
@@ -31,6 +31,6 @@
 #include "swrast.h"
 
 extern void
-_swrast_texture_span( GLcontext *ctx, struct sw_span *span );
+_swrast_texture_span( GLcontext *ctx, SWspan *span );
 
 #endif
diff --git a/src/mesa/swrast/s_triangle.c b/src/mesa/swrast/s_triangle.c
index 5a1fc8aec1..b17c435460 100644
--- a/src/mesa/swrast/s_triangle.c
+++ b/src/mesa/swrast/s_triangle.c
@@ -279,7 +279,7 @@ ilerp_2d(GLint ia, GLint ib, GLint v00, GLint v10, GLint v01, GLint v11)
  * texture env modes.
  */
 static INLINE void
-affine_span(GLcontext *ctx, struct sw_span *span,
+affine_span(GLcontext *ctx, SWspan *span,
             struct affine_info *info)
 {
    GLchan sample[4];  /* the filtered texture sample */
@@ -602,7 +602,7 @@ struct persp_info
 
 
 static INLINE void
-fast_persp_span(GLcontext *ctx, struct sw_span *span,
+fast_persp_span(GLcontext *ctx, SWspan *span,
 		struct persp_info *info)
 {
    GLchan sample[4];  /* the filtered texture sample */
diff --git a/src/mesa/swrast/s_tritemp.h b/src/mesa/swrast/s_tritemp.h
index 29a7a94da1..9e0a8a3d32 100644
--- a/src/mesa/swrast/s_tritemp.h
+++ b/src/mesa/swrast/s_tritemp.h
@@ -216,7 +216,7 @@ static void NAME(GLcontext *ctx, const SWvertex *v0,
 #endif
    GLinterp vMin_fx, vMin_fy, vMid_fx, vMid_fy, vMax_fx, vMax_fy;
 
-   struct sw_span span;
+   SWspan span;
 
    INIT_SPAN(span, GL_POLYGON, 0, 0, 0);
 
diff --git a/src/mesa/swrast/s_zoom.c b/src/mesa/swrast/s_zoom.c
index 77cf8ca899..6691f005f0 100644
--- a/src/mesa/swrast/s_zoom.c
+++ b/src/mesa/swrast/s_zoom.c
@@ -119,11 +119,11 @@ unzoom_x(GLfloat zoomX, GLint imageX, GLint zx)
  * index/depth_span().
  */
 static void
-zoom_span( GLcontext *ctx, GLint imgX, GLint imgY, const struct sw_span *span,
+zoom_span( GLcontext *ctx, GLint imgX, GLint imgY, const SWspan *span,
            const GLvoid *src, GLenum format )
 {
-   struct sw_span zoomed;
-   struct span_arrays zoomed_arrays;  /* this is big! */
+   SWspan zoomed;
+   SWspanarrays zoomed_arrays;  /* this is big! */
    GLint x0, x1, y0, y1;
    GLint zoomedWidth;
 
@@ -287,7 +287,7 @@ zoom_span( GLcontext *ctx, GLint imgX, GLint imgY, const struct sw_span *span,
 
 void
 _swrast_write_zoomed_rgba_span( GLcontext *ctx, GLint imgX, GLint imgY,
-                               const struct sw_span *span,
+                               const SWspan *span,
                                CONST GLchan rgba[][4])
 {
    zoom_span(ctx, imgX, imgY, span, (const GLvoid *) rgba, GL_RGBA);
@@ -296,7 +296,7 @@ _swrast_write_zoomed_rgba_span( GLcontext *ctx, GLint imgX, GLint imgY,
 
 void
 _swrast_write_zoomed_rgb_span(GLcontext *ctx, GLint imgX, GLint imgY,
-                              const struct sw_span *span,
+                              const SWspan *span,
                               CONST GLchan rgb[][3])
 {
    zoom_span(ctx, imgX, imgY, span, (const GLvoid *) rgb, GL_RGB);
@@ -305,7 +305,7 @@ _swrast_write_zoomed_rgb_span(GLcontext *ctx, GLint imgX, GLint imgY,
 
 void
 _swrast_write_zoomed_index_span(GLcontext *ctx, GLint imgX, GLint imgY,
-                                const struct sw_span *span)
+                                const SWspan *span)
 {
    zoom_span(ctx, imgX, imgY, span,
              (const GLvoid *) span->array->index, GL_COLOR_INDEX);
@@ -314,7 +314,7 @@ _swrast_write_zoomed_index_span(GLcontext *ctx, GLint imgX, GLint imgY,
 
 void
 _swrast_write_zoomed_depth_span(GLcontext *ctx, GLint imgX, GLint imgY,
-                                const struct sw_span *span)
+                                const SWspan *span)
 {
    zoom_span(ctx, imgX, imgY, span,
              (const GLvoid *) span->array->z, GL_DEPTH_COMPONENT);
diff --git a/src/mesa/swrast/s_zoom.h b/src/mesa/swrast/s_zoom.h
index d10c270245..a7750dcaa3 100644
--- a/src/mesa/swrast/s_zoom.h
+++ b/src/mesa/swrast/s_zoom.h
@@ -31,21 +31,21 @@
 
 extern void
 _swrast_write_zoomed_rgba_span(GLcontext *ctx, GLint imgX, GLint imgY,
-                               const struct sw_span *span,
+                               const SWspan *span,
                                CONST GLchan rgb[][4]);
 
 extern void
 _swrast_write_zoomed_rgb_span(GLcontext *ctx, GLint imgX, GLint imgY,
-                              const struct sw_span *span,
+                              const SWspan *span,
                               CONST GLchan rgb[][3]);
 
 extern void
 _swrast_write_zoomed_index_span(GLcontext *ctx, GLint imgX, GLint imgY,
-                                const struct sw_span *span);
+                                const SWspan *span);
 
 extern void
 _swrast_write_zoomed_depth_span(GLcontext *ctx, GLint imgX, GLint imgY,
-                                const struct sw_span *span);
+                                const SWspan *span);
 
 
 extern void