Merge remote-tracking branch 'origin/released'

9 files changed, 445 insertions, 1143 deletions

diff --git a/mesalib/src/mesa/drivers/common/meta.c b/mesalib/src/mesa/drivers/common/meta.c
index c5c59ebee..e62267394 100644
--- a/mesalib/src/mesa/drivers/common/meta.c
+++ b/mesalib/src/mesa/drivers/common/meta.c
@@ -65,6 +65,7 @@
 #include "main/teximage.h"
 #include "main/texparam.h"
 #include "main/texstate.h"
+#include "main/transformfeedback.h"
 #include "main/uniforms.h"
 #include "main/varray.h"
 #include "main/viewport.h"
@@ -180,6 +181,8 @@ struct save_state
 
    /** Miscellaneous (always disabled) */
    GLboolean Lighting;
+   GLboolean RasterDiscard;
+   GLboolean TransformFeedbackNeedsResume;
 };
 
 /**
@@ -422,6 +425,15 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state)
    memset(save, 0, sizeof(*save));
    save->SavedState = state;
 
+   /* Pausing transform feedback needs to be done early, or else we won't be
+    * able to change other state.
+    */
+   save->TransformFeedbackNeedsResume =
+      ctx->TransformFeedback.CurrentObject->Active &&
+      !ctx->TransformFeedback.CurrentObject->Paused;
+   if (save->TransformFeedbackNeedsResume)
+      _mesa_PauseTransformFeedback();
+
    if (state & MESA_META_ALPHA_TEST) {
       save->AlphaEnabled = ctx->Color.AlphaEnabled;
       save->AlphaFunc = ctx->Color.AlphaFunc;
@@ -702,6 +714,9 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state)
       save->Lighting = ctx->Light.Enabled;
       if (ctx->Light.Enabled)
          _mesa_set_enable(ctx, GL_LIGHTING, GL_FALSE);
+      save->RasterDiscard = ctx->RasterDiscard;
+      if (ctx->RasterDiscard)
+         _mesa_set_enable(ctx, GL_RASTERIZER_DISCARD, GL_FALSE);
    }
 }
 
@@ -981,6 +996,11 @@ _mesa_meta_end(struct gl_context *ctx)
    if (save->Lighting) {
       _mesa_set_enable(ctx, GL_LIGHTING, GL_TRUE);
    }
+   if (save->RasterDiscard) {
+      _mesa_set_enable(ctx, GL_RASTERIZER_DISCARD, GL_TRUE);
+   }
+   if (save->TransformFeedbackNeedsResume)
+      _mesa_ResumeTransformFeedback();
 }
 
 
diff --git a/mesalib/src/mesa/drivers/dri/common/depthtmp.h b/mesalib/src/mesa/drivers/dri/common/depthtmp.h
index c6e2bb75c..d8f259f67 100644
--- a/mesalib/src/mesa/drivers/dri/common/depthtmp.h
+++ b/mesalib/src/mesa/drivers/dri/common/depthtmp.h
@@ -71,63 +71,6 @@ static void TAG(WriteDepthSpan)( struct gl_context *ctx,
 }
 
 
-#if HAVE_HW_DEPTH_SPANS
-/* implement MonoWriteDepthSpan() in terms of WriteDepthSpan() */
-static void
-TAG(WriteMonoDepthSpan)( struct gl_context *ctx, struct gl_renderbuffer *rb,
-                         GLuint n, GLint x, GLint y,
-                         const void *value, const GLubyte mask[] )
-{
-   const GLuint depthVal = *((GLuint *) value);
-   GLuint depths[MAX_WIDTH];
-   GLuint i;
-   for (i = 0; i < n; i++)
-      depths[i] = depthVal;
-   TAG(WriteDepthSpan)(ctx, rb, n, x, y, depths, mask);
-}
-#else
-static void TAG(WriteMonoDepthSpan)( struct gl_context *ctx,
-                                     struct gl_renderbuffer *rb,
-                                     GLuint n, GLint x, GLint y,
-                                     const void *value,
-                                     const GLubyte mask[] )
-{
-   HW_WRITE_LOCK()
-      {
-         const GLuint depth = *((GLuint *) value);
-	 GLint x1;
-	 GLint n1;
-	 LOCAL_DEPTH_VARS;
-
-	 y = Y_FLIP( y );
-
-	 HW_CLIPLOOP()
-	    {
-	       GLint i = 0;
-	       CLIPSPAN( x, y, n, x1, n1, i );
-
-	       if ( DBG ) fprintf( stderr, "%s %d..%d (x1 %d) = %u\n",
-				   __FUNCTION__, (int)i, (int)n1, (int)x1, (GLuint)depth );
-
-	       if ( mask ) {
-		  for ( ; n1>0 ; i++, x1++, n1-- ) {
-		     if ( mask[i] ) WRITE_DEPTH( x1, y, depth );
-		  }
-	       } else {
-		  for ( ; n1>0 ; x1++, n1-- ) {
-		     WRITE_DEPTH( x1, y, depth );
-		  }
-	       }
-	    }
-	 HW_ENDCLIPLOOP();
-      }
-   HW_WRITE_UNLOCK();
-
-   (void) ctx;
-}
-#endif
-
-
 static void TAG(WriteDepthPixels)( struct gl_context *ctx,
                                    struct gl_renderbuffer *rb,
 				   GLuint n,
@@ -258,10 +201,7 @@ static void TAG(InitDepthPointers)(struct gl_renderbuffer *rb)
    rb->GetRow = TAG(ReadDepthSpan);
    rb->GetValues = TAG(ReadDepthPixels);
    rb->PutRow = TAG(WriteDepthSpan);
-   rb->PutRowRGB = NULL;
-   rb->PutMonoRow = TAG(WriteMonoDepthSpan);
    rb->PutValues = TAG(WriteDepthPixels);
-   rb->PutMonoValues = NULL;
 }
 
 
diff --git a/mesalib/src/mesa/drivers/dri/common/dri_util.c b/mesalib/src/mesa/drivers/dri/common/dri_util.c
index 1640c1448..a153d525d 100644
--- a/mesalib/src/mesa/drivers/dri/common/dri_util.c
+++ b/mesalib/src/mesa/drivers/dri/common/dri_util.c
@@ -454,14 +454,18 @@ const __DRIcoreExtension driCoreExtension = {
 
 /** DRI2 interface */
 const __DRIdri2Extension driDRI2Extension = {
-    { __DRI_DRI2, __DRI_DRI2_VERSION },
+    /* Force the version to 2 because the underlying drivers don't (can't!)
+     * support the extra requirements of CreateContextAttribs.
+     */
+    { __DRI_DRI2, 2 },
     dri2CreateNewScreen,
     dri2CreateNewDrawable,
     dri2CreateNewContext,
     dri2GetAPIMask,
     dri2CreateNewContextForAPI,
     dri2AllocateBuffer,
-    dri2ReleaseBuffer
+    dri2ReleaseBuffer,
+    NULL
 };
 
 const __DRI2configQueryExtension dri2ConfigQueryExtension = {
diff --git a/mesalib/src/mesa/drivers/dri/common/drisw_util.c b/mesalib/src/mesa/drivers/dri/common/drisw_util.c
index 614339eeb..a19123f70 100644
--- a/mesalib/src/mesa/drivers/dri/common/drisw_util.c
+++ b/mesalib/src/mesa/drivers/dri/common/drisw_util.c
@@ -288,8 +288,12 @@ const __DRIcoreExtension driCoreExtension = {
 };
 
 const __DRIswrastExtension driSWRastExtension = {
-    { __DRI_SWRAST, __DRI_SWRAST_VERSION },
+    /* Force the version to 2 because the underlying driver don't (can't!)
+     * support the extra requirements of CreateContextAttribs.
+     */
+    { __DRI_SWRAST, 2 },
     driCreateNewScreen,
     driCreateNewDrawable,
-    driCreateNewContextForAPI
+    driCreateNewContextForAPI,
+    NULL
 };
diff --git a/mesalib/src/mesa/drivers/dri/common/spantmp2.h b/mesalib/src/mesa/drivers/dri/common/spantmp2.h
index 83cfbb164..744dfcd3b 100644
--- a/mesalib/src/mesa/drivers/dri/common/spantmp2.h
+++ b/mesalib/src/mesa/drivers/dri/common/spantmp2.h
@@ -63,9 +63,6 @@
 #define PUT_VALUE(_x, _y, _v) *(volatile GLushort *)(GET_PTR(_x, _y)) = (_v)
 #endif /* GET_VALUE */
 
-#define INIT_MONO_PIXEL(p, color) \
-  p = PACK_COLOR_565( color[0], color[1], color[2] )
-
 #define WRITE_RGBA( _x, _y, r, g, b, a )				\
    PUT_VALUE(_x, _y, ((((int)r & 0xf8) << 8) |				\
 		      (((int)g & 0xfc) << 3) |				\
@@ -97,9 +94,6 @@
 #define PUT_VALUE(_x, _y, _v) *(volatile GLushort *)(GET_PTR(_x, _y)) = (_v)
 #endif /* GET_VALUE */
 
-#define INIT_MONO_PIXEL(p, color) \
-  p = PACK_COLOR_565_REV( color[0], color[1], color[2] )
-
 #define WRITE_RGBA( _x, _y, r, g, b, a )				\
    PUT_VALUE(_x, _y, PACK_COLOR_565_REV( r, g, b ))
 
@@ -130,9 +124,6 @@
 #define PUT_VALUE(_x, _y, _v) *(volatile GLushort *)(GET_PTR(_x, _y)) = (_v)
 #endif /* GET_VALUE */
 
-#define INIT_MONO_PIXEL(p, color) \
-   p = PACK_COLOR_4444_REV(color[3], color[0], color[1], color[2])
-
 #define WRITE_RGBA( _x, _y, r, g, b, a )				\
    PUT_VALUE(_x, _y, PACK_COLOR_4444_REV(a, r, g, b))			\
 
@@ -163,9 +154,6 @@
 #define PUT_VALUE(_x, _y, _v) *(volatile GLushort *)(GET_PTR(_x, _y)) = (_v)
 #endif /* GET_VALUE */
 
-#define INIT_MONO_PIXEL(p, color) \
-   p = PACK_COLOR_4444(color[3], color[0], color[1], color[2])
-
 #define WRITE_RGBA( _x, _y, r, g, b, a )				\
    PUT_VALUE(_x, _y, PACK_COLOR_4444(a, r, g, b))			\
 
@@ -196,9 +184,6 @@
 #define PUT_VALUE(_x, _y, _v) *(volatile GLushort *)(GET_PTR(_x, _y)) = (_v)
 #endif /* GET_VALUE */
 
-#define INIT_MONO_PIXEL(p, color) \
-   p = PACK_COLOR_1555(color[3], color[0], color[1], color[2])
-
 #define WRITE_RGBA( _x, _y, r, g, b, a )				\
    PUT_VALUE(_x, _y, PACK_COLOR_1555(a, r, g, b))			\
 
@@ -228,9 +213,6 @@
 #define PUT_VALUE(_x, _y, _v) *(volatile GLushort *)(GET_PTR(_x, _y)) = (_v)
 #endif /* GET_VALUE */
 
-#define INIT_MONO_PIXEL(p, color) \
-   p = PACK_COLOR_1555_REV(color[3], color[0], color[1], color[2])
-
 #define WRITE_RGBA( _x, _y, r, g, b, a )				\
    PUT_VALUE(_x, _y, PACK_COLOR_1555_REV(a, r, g, b))			\
 
@@ -261,9 +243,6 @@
 #define PUT_VALUE(_x, _y, _v) *(volatile GLuint *)(GET_PTR(_x, _y)) = (_v)
 #endif /* GET_VALUE */
 
-# define INIT_MONO_PIXEL(p, color)                       \
-     p = PACK_COLOR_8888(color[3], color[0], color[1], color[2]) 
-
 # define WRITE_RGBA(_x, _y, r, g, b, a)                                 \
    PUT_VALUE(_x, _y, ((r << 16) |					\
 		      (g << 8) |					\
@@ -316,9 +295,6 @@
 #define PUT_VALUE(_x, _y, _v) *(volatile GLuint *)(GET_PTR(_x, _y)) = (_v)
 #endif /* GET_VALUE */
 
-# define INIT_MONO_PIXEL(p, color)                       \
-     p = PACK_COLOR_8888(color[2], color[1], color[0], color[3]) 
-
 # define WRITE_RGBA(_x, _y, r, g, b, a)                                 \
    PUT_VALUE(_x, _y, ((r << 8) |					\
 		      (g << 16) |					\
@@ -374,9 +350,6 @@
 #define PUT_VALUE(_x, _y, _v) *(volatile GLuint *)(GET_PTR(_x, _y)) = (_v)
 #endif /* GET_VALUE */
 
-# define INIT_MONO_PIXEL(p, color)                       \
-     p = PACK_COLOR_8888(0xff, color[0], color[1], color[2])
-
 # define WRITE_RGBA(_x, _y, r, g, b, a)					\
    PUT_VALUE(_x, _y, ((r << 16) |					\
 		      (g << 8) |					\
@@ -428,9 +401,6 @@
 #define PUT_VALUE(_x, _y, _v) *(volatile GLubyte *)(GET_PTR(_x, _y)) = (_v)
 #endif /* GET_VALUE */
 
-# define INIT_MONO_PIXEL(p, color)                       \
-     p = color[3]
-
 # define WRITE_RGBA(_x, _y, r, g, b, a)                                 \
    PUT_VALUE(_x, _y, a | (r & 0 /* quiet warnings */))
 
@@ -505,46 +475,6 @@ static void TAG(WriteRGBASpan)( struct gl_context *ctx,
    HW_WRITE_UNLOCK();
 }
 
-static void TAG(WriteRGBSpan)( struct gl_context *ctx,
-                               struct gl_renderbuffer *rb,
-			       GLuint n, GLint x, GLint y,
-			       const void *values, const GLubyte mask[] )
-{
-   (void) ctx;
-
-   HW_WRITE_LOCK()
-      {
-         const GLubyte (*rgb)[3] = (const GLubyte (*)[3]) values;
-	 GLint x1;
-	 GLint n1;
-	 LOCAL_VARS;
-
-	 y = Y_FLIP(y);
-
-	 HW_WRITE_CLIPLOOP()
-	    {
-	       GLint i = 0;
-	       CLIPSPAN(x,y,n,x1,n1,i);
-
-	       if (DBG) fprintf(stderr, "WriteRGBSpan %d..%d (x1 %d)\n",
-				(int)i, (int)n1, (int)x1);
-
-	       if (mask)
-	       {
-		  for (;n1>0;i++,x1++,n1--)
-		     if (mask[i])
-			WRITE_RGBA( x1, y, rgb[i][0], rgb[i][1], rgb[i][2], 255 );
-	       }
-	       else
-	       {
-		  for (;n1>0;i++,x1++,n1--)
-		     WRITE_RGBA( x1, y, rgb[i][0], rgb[i][1], rgb[i][2], 255 );
-	       }
-	    }
-	 HW_ENDCLIPLOOP();
-      }
-   HW_WRITE_UNLOCK();
-}
 
 static void TAG(WriteRGBAPixels)( struct gl_context *ctx,
                                   struct gl_renderbuffer *rb,
@@ -594,91 +524,6 @@ static void TAG(WriteRGBAPixels)( struct gl_context *ctx,
 }
 
 
-static void TAG(WriteMonoRGBASpan)( struct gl_context *ctx,	
-                                    struct gl_renderbuffer *rb,
-				    GLuint n, GLint x, GLint y, 
-				    const void *value, const GLubyte mask[] )
-{
-   (void) ctx;
-
-   HW_WRITE_LOCK()
-      {
-         const GLubyte *color = (const GLubyte *) value;
-	 GLint x1;
-	 GLint n1;
-	 LOCAL_VARS;
-	 INIT_MONO_PIXEL(p, color);
-
-	 y = Y_FLIP( y );
-
-	 if (DBG) fprintf(stderr, "WriteMonoRGBASpan\n");
-
-	 HW_WRITE_CLIPLOOP()
-	    {
-	       GLint i = 0;
-	       CLIPSPAN(x,y,n,x1,n1,i);
-	       if (mask)
-	       {
-	          for (;n1>0;i++,x1++,n1--)
-		     if (mask[i])
-		        WRITE_PIXEL( x1, y, p );
-	       }
-	       else
-	       {
-	          for (;n1>0;i++,x1++,n1--)
-		     WRITE_PIXEL( x1, y, p );
-	       }
-	    }
-	 HW_ENDCLIPLOOP();
-      }
-   HW_WRITE_UNLOCK();
-}
-
-
-static void TAG(WriteMonoRGBAPixels)( struct gl_context *ctx,
-                                      struct gl_renderbuffer *rb,
-				      GLuint n,
-				      const GLint x[], const GLint y[],
-				      const void *value,
-				      const GLubyte mask[] ) 
-{
-   (void) ctx;
-
-   HW_WRITE_LOCK()
-      {
-         const GLubyte *color = (const GLubyte *) value;
-	 GLint i;
-	 LOCAL_VARS;
-	 INIT_MONO_PIXEL(p, color);
-
-	 if (DBG) fprintf(stderr, "WriteMonoRGBAPixels\n");
-
-	 HW_WRITE_CLIPLOOP()
-	    {
-	       if (mask)
-	       {
-		  for (i=0;i<n;i++)
-		     if (mask[i]) {
-			int fy = Y_FLIP(y[i]);
-			if (CLIPPIXEL( x[i], fy ))
-			   WRITE_PIXEL( x[i], fy, p );
-		     }
-	       }
-	       else
-	       {
-		  for (i=0;i<n;i++) {
-		     int fy = Y_FLIP(y[i]);
-		     if (CLIPPIXEL( x[i], fy ))
-			WRITE_PIXEL( x[i], fy, p );
-		  }
-	       }
-	    }
-	 HW_ENDCLIPLOOP();
-      }
-   HW_WRITE_UNLOCK();
-}
-
-
 static void TAG(ReadRGBASpan)( struct gl_context *ctx,
                                struct gl_renderbuffer *rb,
 			       GLuint n, GLint x, GLint y, void *values)
@@ -878,10 +723,7 @@ static void TAG(ReadRGBAPixels)( struct gl_context *ctx,
 static void TAG(InitPointers)(struct gl_renderbuffer *rb)
 {
    rb->PutRow = TAG(WriteRGBASpan);
-   rb->PutRowRGB = TAG(WriteRGBSpan);
-   rb->PutMonoRow = TAG(WriteMonoRGBASpan);
    rb->PutValues = TAG(WriteRGBAPixels);
-   rb->PutMonoValues = TAG(WriteMonoRGBAPixels);
    rb->GetValues = TAG(ReadRGBAPixels);
 
 #if defined(GET_PTR)
@@ -923,7 +765,6 @@ static void TAG(InitPointers)(struct gl_renderbuffer *rb)
 }
 
 
-#undef INIT_MONO_PIXEL
 #undef WRITE_PIXEL
 #undef WRITE_RGBA
 #undef READ_RGBA
diff --git a/mesalib/src/mesa/drivers/dri/common/stenciltmp.h b/mesalib/src/mesa/drivers/dri/common/stenciltmp.h
index 2ea2e207a..950d3c4df 100644
--- a/mesalib/src/mesa/drivers/dri/common/stenciltmp.h
+++ b/mesalib/src/mesa/drivers/dri/common/stenciltmp.h
@@ -1,245 +1,186 @@
-

-#include "spantmp_common.h"

-

-#ifndef DBG

-#define DBG 0

-#endif

-

-#ifndef HAVE_HW_STENCIL_SPANS

-#define HAVE_HW_STENCIL_SPANS 0

-#endif

-

-#ifndef HAVE_HW_STENCIL_PIXELS

-#define HAVE_HW_STENCIL_PIXELS 0

-#endif

-

-static void TAG(WriteStencilSpan)( struct gl_context *ctx,

-                                   struct gl_renderbuffer *rb,

-				   GLuint n, GLint x, GLint y,

-				   const void *values, const GLubyte mask[] )

-{

-   HW_WRITE_LOCK()

-      {

-         const GLubyte *stencil = (const GLubyte *) values;

-	 GLint x1;

-	 GLint n1;

-	 LOCAL_STENCIL_VARS;

-

-	 y = Y_FLIP(y);

-

-#if HAVE_HW_STENCIL_SPANS

-	 (void) x1; (void) n1;

-

-	 if (DBG) fprintf(stderr, "WriteStencilSpan 0..%d (x1 %d)\n",

-			  (int)n1, (int)x1);

-

-	 WRITE_STENCIL_SPAN();

-#else /* HAVE_HW_STENCIL_SPANS */

-	 HW_CLIPLOOP() 

-	    {

-	       GLint i = 0;

-	       CLIPSPAN(x,y,n,x1,n1,i);

-

-	       if (DBG) fprintf(stderr, "WriteStencilSpan %d..%d (x1 %d)\n",

-				(int)i, (int)n1, (int)x1);

-

-	       if (mask)

-	       {

-		  for (;n1>0;i++,x1++,n1--)

-		     if (mask[i])

-			WRITE_STENCIL( x1, y, stencil[i] );

-	       }

-	       else

-	       {

-		  for (;n1>0;i++,x1++,n1--)

-		     WRITE_STENCIL( x1, y, stencil[i] );

-	       }

-	    }

-	 HW_ENDCLIPLOOP();

-#endif /* !HAVE_HW_STENCIL_SPANS */

-      }

-   HW_WRITE_UNLOCK();

-}

-

-#if HAVE_HW_STENCIL_SPANS

-/* implement MonoWriteDepthSpan() in terms of WriteDepthSpan() */

-static void

-TAG(WriteMonoStencilSpan)( struct gl_context *ctx, struct gl_renderbuffer *rb,

-                           GLuint n, GLint x, GLint y,

-                           const void *value, const GLubyte mask[] )

-{

-   const GLuint stenVal = *((GLuint *) value);

-   GLuint stens[MAX_WIDTH];

-   GLuint i;

-   for (i = 0; i < n; i++)

-      stens[i] = stenVal;

-   TAG(WriteStencilSpan)(ctx, rb, n, x, y, stens, mask);

-}

-#else /* HAVE_HW_STENCIL_SPANS */

-static void TAG(WriteMonoStencilSpan)( struct gl_context *ctx,

-                                       struct gl_renderbuffer *rb,

-                                       GLuint n, GLint x, GLint y,

-                                       const void *value,

-                                       const GLubyte mask[] )

-{

-   HW_WRITE_LOCK()

-      {

-         const GLubyte stencil = *((const GLubyte *) value);

-	 GLint x1;

-	 GLint n1;

-	 LOCAL_STENCIL_VARS;

-

-	 y = Y_FLIP(y);

-

-	 HW_CLIPLOOP() 

-	    {

-	       GLint i = 0;

-	       CLIPSPAN(x,y,n,x1,n1,i);

-

-	       if (DBG) fprintf(stderr, "WriteStencilSpan %d..%d (x1 %d)\n",

-				(int)i, (int)n1, (int)x1);

-

-	       if (mask)

-	       {

-		  for (;n1>0;i++,x1++,n1--)

-		     if (mask[i])

-			WRITE_STENCIL( x1, y, stencil );

-	       }

-	       else

-	       {

-		  for (;n1>0;i++,x1++,n1--)

-		     WRITE_STENCIL( x1, y, stencil );

-	       }

-	    }

-	 HW_ENDCLIPLOOP();

-      }

-   HW_WRITE_UNLOCK();

-}

-#endif /* !HAVE_HW_STENCIL_SPANS */

-

-

-static void TAG(WriteStencilPixels)( struct gl_context *ctx,

-                                     struct gl_renderbuffer *rb,

-				     GLuint n,

-				     const GLint x[], const GLint y[],

-				     const void *values, const GLubyte mask[] )

-{

-   HW_WRITE_LOCK()

-      {

-         const GLubyte *stencil = (const GLubyte *) values;

-	 GLuint i;

-	 LOCAL_STENCIL_VARS;

-

-	 if (DBG) fprintf(stderr, "WriteStencilPixels\n");

-

-#if HAVE_HW_STENCIL_PIXELS

-	 (void) i;

-

-	 WRITE_STENCIL_PIXELS();

-#else /* HAVE_HW_STENCIL_PIXELS */

-	 HW_CLIPLOOP()

-	    {

-	       for (i=0;i<n;i++)

-	       {

-		  if (mask[i]) {

-		     const int fy = Y_FLIP(y[i]);

-		     if (CLIPPIXEL(x[i],fy))

-			WRITE_STENCIL( x[i], fy, stencil[i] );

-		  }

-	       }

-	    }

-	 HW_ENDCLIPLOOP();

-#endif /* !HAVE_HW_STENCIL_PIXELS */

-      }

-   HW_WRITE_UNLOCK();

-}

-

-

-/* Read stencil spans and pixels

- */

-static void TAG(ReadStencilSpan)( struct gl_context *ctx,

-                                  struct gl_renderbuffer *rb,

-				  GLuint n, GLint x, GLint y,

-				  void *values)

-{

-   HW_READ_LOCK()

-      {

-         GLubyte *stencil = (GLubyte *) values;

-	 GLint x1,n1;

-	 LOCAL_STENCIL_VARS;

-

-	 y = Y_FLIP(y);

-

-	 if (DBG) fprintf(stderr, "ReadStencilSpan\n");

-

-#if HAVE_HW_STENCIL_SPANS

-	 (void) x1; (void) n1;

-

-	 READ_STENCIL_SPAN();

-#else /* HAVE_HW_STENCIL_SPANS */

-	 HW_CLIPLOOP() 

-	    {

-	       GLint i = 0;

-	       CLIPSPAN(x,y,n,x1,n1,i);

-	       for (;n1>0;i++,n1--)

-		  READ_STENCIL( stencil[i], (x+i), y );

-	    }

-	 HW_ENDCLIPLOOP();

-#endif /* !HAVE_HW_STENCIL_SPANS */

-      }

-   HW_READ_UNLOCK();

-}

-

-static void TAG(ReadStencilPixels)( struct gl_context *ctx,

-                                    struct gl_renderbuffer *rb,

-                                    GLuint n, const GLint x[], const GLint y[],

-				    void *values )

-{

-   HW_READ_LOCK()

-      {

-         GLubyte *stencil = (GLubyte *) values;

-	 GLuint i;

-	 LOCAL_STENCIL_VARS;

-

-	 if (DBG) fprintf(stderr, "ReadStencilPixels\n");

- 

-#if HAVE_HW_STENCIL_PIXELS

-	 (void) i;

-

-	 READ_STENCIL_PIXELS();

-#else /* HAVE_HW_STENCIL_PIXELS */

-	 HW_CLIPLOOP()

-	    {

-	       for (i=0;i<n;i++) {

-		  int fy = Y_FLIP( y[i] );

-		  if (CLIPPIXEL( x[i], fy ))

-		     READ_STENCIL( stencil[i], x[i], fy );

-	       }

-	    }

-	 HW_ENDCLIPLOOP();

-#endif /* !HAVE_HW_STENCIL_PIXELS */

-      }

-   HW_READ_UNLOCK();

-}

-

-

-

-/**

- * Initialize the given renderbuffer's span routines to point to

- * the stencil functions we generated above.

- */

-static void TAG(InitStencilPointers)(struct gl_renderbuffer *rb)

-{

-   rb->GetRow = TAG(ReadStencilSpan);

-   rb->GetValues = TAG(ReadStencilPixels);

-   rb->PutRow = TAG(WriteStencilSpan);

-   rb->PutRowRGB = NULL;

-   rb->PutMonoRow = TAG(WriteMonoStencilSpan);

-   rb->PutValues = TAG(WriteStencilPixels);

-   rb->PutMonoValues = NULL;

-}

-

-

-#undef WRITE_STENCIL

-#undef READ_STENCIL

-#undef TAG

+
+#include "spantmp_common.h"
+
+#ifndef DBG
+#define DBG 0
+#endif
+
+#ifndef HAVE_HW_STENCIL_SPANS
+#define HAVE_HW_STENCIL_SPANS 0
+#endif
+
+#ifndef HAVE_HW_STENCIL_PIXELS
+#define HAVE_HW_STENCIL_PIXELS 0
+#endif
+
+static void TAG(WriteStencilSpan)( struct gl_context *ctx,
+                                   struct gl_renderbuffer *rb,
+				   GLuint n, GLint x, GLint y,
+				   const void *values, const GLubyte mask[] )
+{
+   HW_WRITE_LOCK()
+      {
+         const GLubyte *stencil = (const GLubyte *) values;
+	 GLint x1;
+	 GLint n1;
+	 LOCAL_STENCIL_VARS;
+
+	 y = Y_FLIP(y);
+
+#if HAVE_HW_STENCIL_SPANS
+	 (void) x1; (void) n1;
+
+	 if (DBG) fprintf(stderr, "WriteStencilSpan 0..%d (x1 %d)\n",
+			  (int)n1, (int)x1);
+
+	 WRITE_STENCIL_SPAN();
+#else /* HAVE_HW_STENCIL_SPANS */
+	 HW_CLIPLOOP() 
+	    {
+	       GLint i = 0;
+	       CLIPSPAN(x,y,n,x1,n1,i);
+
+	       if (DBG) fprintf(stderr, "WriteStencilSpan %d..%d (x1 %d)\n",
+				(int)i, (int)n1, (int)x1);
+
+	       if (mask)
+	       {
+		  for (;n1>0;i++,x1++,n1--)
+		     if (mask[i])
+			WRITE_STENCIL( x1, y, stencil[i] );
+	       }
+	       else
+	       {
+		  for (;n1>0;i++,x1++,n1--)
+		     WRITE_STENCIL( x1, y, stencil[i] );
+	       }
+	    }
+	 HW_ENDCLIPLOOP();
+#endif /* !HAVE_HW_STENCIL_SPANS */
+      }
+   HW_WRITE_UNLOCK();
+}
+
+
+static void TAG(WriteStencilPixels)( struct gl_context *ctx,
+                                     struct gl_renderbuffer *rb,
+				     GLuint n,
+				     const GLint x[], const GLint y[],
+				     const void *values, const GLubyte mask[] )
+{
+   HW_WRITE_LOCK()
+      {
+         const GLubyte *stencil = (const GLubyte *) values;
+	 GLuint i;
+	 LOCAL_STENCIL_VARS;
+
+	 if (DBG) fprintf(stderr, "WriteStencilPixels\n");
+
+#if HAVE_HW_STENCIL_PIXELS
+	 (void) i;
+
+	 WRITE_STENCIL_PIXELS();
+#else /* HAVE_HW_STENCIL_PIXELS */
+	 HW_CLIPLOOP()
+	    {
+	       for (i=0;i<n;i++)
+	       {
+		  if (mask[i]) {
+		     const int fy = Y_FLIP(y[i]);
+		     if (CLIPPIXEL(x[i],fy))
+			WRITE_STENCIL( x[i], fy, stencil[i] );
+		  }
+	       }
+	    }
+	 HW_ENDCLIPLOOP();
+#endif /* !HAVE_HW_STENCIL_PIXELS */
+      }
+   HW_WRITE_UNLOCK();
+}
+
+
+/* Read stencil spans and pixels
+ */
+static void TAG(ReadStencilSpan)( struct gl_context *ctx,
+                                  struct gl_renderbuffer *rb,
+				  GLuint n, GLint x, GLint y,
+				  void *values)
+{
+   HW_READ_LOCK()
+      {
+         GLubyte *stencil = (GLubyte *) values;
+	 GLint x1,n1;
+	 LOCAL_STENCIL_VARS;
+
+	 y = Y_FLIP(y);
+
+	 if (DBG) fprintf(stderr, "ReadStencilSpan\n");
+
+#if HAVE_HW_STENCIL_SPANS
+	 (void) x1; (void) n1;
+
+	 READ_STENCIL_SPAN();
+#else /* HAVE_HW_STENCIL_SPANS */
+	 HW_CLIPLOOP() 
+	    {
+	       GLint i = 0;
+	       CLIPSPAN(x,y,n,x1,n1,i);
+	       for (;n1>0;i++,n1--)
+		  READ_STENCIL( stencil[i], (x+i), y );
+	    }
+	 HW_ENDCLIPLOOP();
+#endif /* !HAVE_HW_STENCIL_SPANS */
+      }
+   HW_READ_UNLOCK();
+}
+
+static void TAG(ReadStencilPixels)( struct gl_context *ctx,
+                                    struct gl_renderbuffer *rb,
+                                    GLuint n, const GLint x[], const GLint y[],
+				    void *values )
+{
+   HW_READ_LOCK()
+      {
+         GLubyte *stencil = (GLubyte *) values;
+	 GLuint i;
+	 LOCAL_STENCIL_VARS;
+
+	 if (DBG) fprintf(stderr, "ReadStencilPixels\n");
+ 
+#if HAVE_HW_STENCIL_PIXELS
+	 (void) i;
+
+	 READ_STENCIL_PIXELS();
+#else /* HAVE_HW_STENCIL_PIXELS */
+	 HW_CLIPLOOP()
+	    {
+	       for (i=0;i<n;i++) {
+		  int fy = Y_FLIP( y[i] );
+		  if (CLIPPIXEL( x[i], fy ))
+		     READ_STENCIL( stencil[i], x[i], fy );
+	       }
+	    }
+	 HW_ENDCLIPLOOP();
+#endif /* !HAVE_HW_STENCIL_PIXELS */
+      }
+   HW_READ_UNLOCK();
+}
+
+
+
+/**
+ * Initialize the given renderbuffer's span routines to point to
+ * the stencil functions we generated above.
+ */
+static void TAG(InitStencilPointers)(struct gl_renderbuffer *rb)
+{
+   rb->GetRow = TAG(ReadStencilSpan);
+   rb->GetValues = TAG(ReadStencilPixels);
+   rb->PutRow = TAG(WriteStencilSpan);
+   rb->PutValues = TAG(WriteStencilPixels);
+}
+
+
+#undef WRITE_STENCIL
+#undef READ_STENCIL
+#undef TAG
diff --git a/mesalib/src/mesa/drivers/dri/swrast/swrast_span.c b/mesalib/src/mesa/drivers/dri/swrast/swrast_span.c
index 772d09f5a..ba6174f9d 100644
--- a/mesalib/src/mesa/drivers/dri/swrast/swrast_span.c
+++ b/mesalib/src/mesa/drivers/dri/swrast/swrast_span.c
@@ -276,37 +276,25 @@ swrast_set_span_funcs_back(struct swrast_renderbuffer *xrb,
 	xrb->Base.GetRow = get_row_A8R8G8B8;
 	xrb->Base.GetValues = get_values_A8R8G8B8;
 	xrb->Base.PutRow = put_row_A8R8G8B8;
-	xrb->Base.PutRowRGB = put_row_rgb_A8R8G8B8;
-	xrb->Base.PutMonoRow = put_mono_row_A8R8G8B8;
 	xrb->Base.PutValues = put_values_A8R8G8B8;
-	xrb->Base.PutMonoValues = put_mono_values_A8R8G8B8;
 	break;
     case PF_X8R8G8B8:
 	xrb->Base.GetRow = get_row_X8R8G8B8;
 	xrb->Base.GetValues = get_values_X8R8G8B8;
 	xrb->Base.PutRow = put_row_X8R8G8B8;
-	xrb->Base.PutRowRGB = put_row_rgb_X8R8G8B8;
-	xrb->Base.PutMonoRow = put_mono_row_X8R8G8B8;
 	xrb->Base.PutValues = put_values_X8R8G8B8;
-	xrb->Base.PutMonoValues = put_mono_values_X8R8G8B8;
 	break;
     case PF_R5G6B5:
 	xrb->Base.GetRow = get_row_R5G6B5;
 	xrb->Base.GetValues = get_values_R5G6B5;
 	xrb->Base.PutRow = put_row_R5G6B5;
-	xrb->Base.PutRowRGB = put_row_rgb_R5G6B5;
-	xrb->Base.PutMonoRow = put_mono_row_R5G6B5;
 	xrb->Base.PutValues = put_values_R5G6B5;
-	xrb->Base.PutMonoValues = put_mono_values_R5G6B5;
 	break;
     case PF_R3G3B2:
 	xrb->Base.GetRow = get_row_R3G3B2;
 	xrb->Base.GetValues = get_values_R3G3B2;
 	xrb->Base.PutRow = put_row_R3G3B2;
-	xrb->Base.PutRowRGB = put_row_rgb_R3G3B2;
-	xrb->Base.PutMonoRow = put_mono_row_R3G3B2;
 	xrb->Base.PutValues = put_values_R3G3B2;
-	xrb->Base.PutMonoValues = put_mono_values_R3G3B2;
 	break;
     default:
 	assert(0);
@@ -332,37 +320,25 @@ swrast_set_span_funcs_front(struct swrast_renderbuffer *xrb,
 	xrb->Base.GetRow = get_row_A8R8G8B8_front;
 	xrb->Base.GetValues = get_values_A8R8G8B8_front;
 	xrb->Base.PutRow = put_row_A8R8G8B8_front;
-	xrb->Base.PutRowRGB = put_row_rgb_A8R8G8B8_front;
-	xrb->Base.PutMonoRow = put_mono_row_A8R8G8B8_front;
 	xrb->Base.PutValues = put_values_A8R8G8B8_front;
-	xrb->Base.PutMonoValues = put_mono_values_A8R8G8B8_front;
 	break;
     case PF_X8R8G8B8:
 	xrb->Base.GetRow = get_row_X8R8G8B8_front;
 	xrb->Base.GetValues = get_values_X8R8G8B8_front;
 	xrb->Base.PutRow = put_row_X8R8G8B8_front;
-	xrb->Base.PutRowRGB = put_row_rgb_X8R8G8B8_front;
-	xrb->Base.PutMonoRow = put_mono_row_X8R8G8B8_front;
 	xrb->Base.PutValues = put_values_X8R8G8B8_front;
-	xrb->Base.PutMonoValues = put_mono_values_X8R8G8B8_front;
 	break;
     case PF_R5G6B5:
 	xrb->Base.GetRow = get_row_R5G6B5_front;
 	xrb->Base.GetValues = get_values_R5G6B5_front;
 	xrb->Base.PutRow = put_row_R5G6B5_front;
-	xrb->Base.PutRowRGB = put_row_rgb_R5G6B5_front;
-	xrb->Base.PutMonoRow = put_mono_row_R5G6B5_front;
 	xrb->Base.PutValues = put_values_R5G6B5_front;
-	xrb->Base.PutMonoValues = put_mono_values_R5G6B5_front;
 	break;
     case PF_R3G3B2:
 	xrb->Base.GetRow = get_row_R3G3B2_front;
 	xrb->Base.GetValues = get_values_R3G3B2_front;
 	xrb->Base.PutRow = put_row_R3G3B2_front;
-	xrb->Base.PutRowRGB = put_row_rgb_R3G3B2_front;
-	xrb->Base.PutMonoRow = put_mono_row_R3G3B2_front;
 	xrb->Base.PutValues = put_values_R3G3B2_front;
-	xrb->Base.PutMonoValues = put_mono_values_R3G3B2_front;
 	break;
     default:
 	assert(0);
diff --git a/mesalib/src/mesa/drivers/dri/swrast/swrast_spantemp.h b/mesalib/src/mesa/drivers/dri/swrast/swrast_spantemp.h
index 0d2703ca5..50671193e 100644
--- a/mesalib/src/mesa/drivers/dri/swrast/swrast_spantemp.h
+++ b/mesalib/src/mesa/drivers/dri/swrast/swrast_spantemp.h
@@ -1,319 +1,223 @@
-/*

- * Mesa 3-D graphics library

- * Version:  6.5.1

- *

- * Copyright (C) 1999-2006  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"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * The above copyright notice and this permission notice shall be included

- * in all copies or substantial portions of the Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- */

-

-

-/*

- * Modified version of swrast/s_spantemp.h for front-buffer rendering. The

- * no-mask paths use a scratch row to avoid repeated calls to the loader.

- *

- * For the mask paths we always use an array of 4 elements of RB_TYPE. This is

- * to satisfy the xorg loader requirement of an image pitch of 32 bits and

- * should be ok for other loaders also.

- */

-

-

-#ifndef _SWRAST_SPANTEMP_ONCE

-#define _SWRAST_SPANTEMP_ONCE

-

-static INLINE void

-PUT_PIXEL( struct gl_context *glCtx, GLint x, GLint y, GLvoid *p )

-{

-    __DRIcontext *ctx = swrast_context(glCtx)->cPriv;

-    __DRIdrawable *draw = swrast_drawable(glCtx->DrawBuffer)->dPriv;

-

-    __DRIscreen *screen = ctx->driScreenPriv;

-

-    screen->swrast_loader->putImage(draw, __DRI_SWRAST_IMAGE_OP_DRAW,

-				    x, y, 1, 1, (char *)p,

-				    draw->loaderPrivate);

-}

-

-

-static INLINE void

-GET_PIXEL( struct gl_context *glCtx, GLint x, GLint y, GLubyte *p )

-{

-    __DRIcontext *ctx = swrast_context(glCtx)->cPriv;

-    __DRIdrawable *read = swrast_drawable(glCtx->ReadBuffer)->dPriv;

-

-    __DRIscreen *screen = ctx->driScreenPriv;

-

-    screen->swrast_loader->getImage(read, x, y, 1, 1, (char *)p,

-				    read->loaderPrivate);

-}

-

-static INLINE void

-PUT_ROW( struct gl_context *glCtx, GLint x, GLint y, GLuint n, char *row )

-{

-    __DRIcontext *ctx = swrast_context(glCtx)->cPriv;

-    __DRIdrawable *draw = swrast_drawable(glCtx->DrawBuffer)->dPriv;

-

-    __DRIscreen *screen = ctx->driScreenPriv;

-

-    screen->swrast_loader->putImage(draw, __DRI_SWRAST_IMAGE_OP_DRAW,

-				    x, y, n, 1, row,

-				    draw->loaderPrivate);

-}

-

-static INLINE void

-GET_ROW( struct gl_context *glCtx, GLint x, GLint y, GLuint n, char *row )

-{

-    __DRIcontext *ctx = swrast_context(glCtx)->cPriv;

-    __DRIdrawable *read = swrast_drawable(glCtx->ReadBuffer)->dPriv;

-

-    __DRIscreen *screen = ctx->driScreenPriv;

-

-    screen->swrast_loader->getImage(read, x, y, n, 1, row,

-				    read->loaderPrivate);

-}

-

-#endif /* _SWRAST_SPANTEMP_ONCE */

-

-

-/*

- * Templates for the span/pixel-array write/read functions called via

- * the gl_renderbuffer's GetRow, GetValues, PutRow, PutMonoRow, PutValues

- * and PutMonoValues functions.

- *

- * Define the following macros before including this file:

- *   NAME(BASE)  to generate the function name (i.e. add prefix or suffix)

- *   RB_TYPE  the renderbuffer DataType

- *   SPAN_VARS  to declare any local variables

- *   INIT_PIXEL_PTR(P, X, Y)  to initialize a pointer to a pixel

- *   INC_PIXEL_PTR(P)  to increment a pixel pointer by one pixel

- *   STORE_PIXEL(DST, X, Y, VALUE)  to store pixel values in buffer

- *   FETCH_PIXEL(DST, SRC)  to fetch pixel values from buffer

- *

- * Note that in the STORE_PIXEL macros, we also pass in the (X,Y) coordinates

- * for the pixels to be stored.  This is useful when dithering and probably

- * ignored otherwise.

- */

-

-#include "main/macros.h"

-

-

-#if !defined(RB_COMPONENTS)

-#define RB_COMPONENTS 4

-#endif

-

-

-static void

-NAME(get_row)( struct gl_context *ctx, struct gl_renderbuffer *rb,

-               GLuint count, GLint x, GLint y, void *values )

-{

-#ifdef SPAN_VARS

-   SPAN_VARS

-#endif

-   RB_TYPE (*dest)[RB_COMPONENTS] = (RB_TYPE (*)[RB_COMPONENTS]) values;

-   GLuint i;

-   char *row = swrast_drawable(ctx->ReadBuffer)->row;

-   INIT_PIXEL_PTR(pixel, x, y);

-   GET_ROW( ctx, x, YFLIP(xrb, y), count, row );

-   for (i = 0; i < count; i++) {

-      FETCH_PIXEL(dest[i], pixel);

-      INC_PIXEL_PTR(pixel);

-   }

-   (void) rb;

-}

-

-

-static void

-NAME(get_values)( struct gl_context *ctx, struct gl_renderbuffer *rb,

-                  GLuint count, const GLint x[], const GLint y[], void *values )

-{

-#ifdef SPAN_VARS

-   SPAN_VARS

-#endif

-   RB_TYPE (*dest)[RB_COMPONENTS] = (RB_TYPE (*)[RB_COMPONENTS]) values;

-   GLuint i;

-   for (i = 0; i < count; i++) {

-      RB_TYPE pixel[4];

-      GET_PIXEL(ctx, x[i], YFLIP(xrb, y[i]), pixel);

-      FETCH_PIXEL(dest[i], pixel);

-   }

-   (void) rb;

-}

-

-

-static void

-NAME(put_row)( struct gl_context *ctx, struct gl_renderbuffer *rb,

-               GLuint count, GLint x, GLint y,

-               const void *values, const GLubyte mask[] )

-{

-#ifdef SPAN_VARS

-   SPAN_VARS

-#endif

-   const RB_TYPE (*src)[RB_COMPONENTS] = (const RB_TYPE (*)[RB_COMPONENTS]) values;

-   GLuint i;

-   if (mask) {

-      for (i = 0; i < count; i++) {

-         if (mask[i]) {

-            RB_TYPE row[4];

-            INIT_PIXEL_PTR(pixel, x, y);

-            STORE_PIXEL(pixel, x + i, y, src[i]);

-            PUT_PIXEL(ctx, x + i, YFLIP(xrb, y), pixel);

-         }

-      }

-   }

-   else {

-      char *row = swrast_drawable(ctx->DrawBuffer)->row;

-      INIT_PIXEL_PTR(pixel, x, y);

-      for (i = 0; i < count; i++) {

-         STORE_PIXEL(pixel, x + i, y, src[i]);

-         INC_PIXEL_PTR(pixel);

-      }

-      PUT_ROW( ctx, x, YFLIP(xrb, y), count, row );

-   }

-   (void) rb;

-}

-

-

-static void

-NAME(put_row_rgb)( struct gl_context *ctx, struct gl_renderbuffer *rb,

-                   GLuint count, GLint x, GLint y,

-                   const void *values, const GLubyte mask[] )

-{

-#ifdef SPAN_VARS

-   SPAN_VARS

-#endif

-   const RB_TYPE (*src)[3] = (const RB_TYPE (*)[3]) values;

-   GLuint i;

-   if (mask) {

-      for (i = 0; i < count; i++) {

-         if (mask[i]) {

-            RB_TYPE row[4];

-            INIT_PIXEL_PTR(pixel, x, y);

-#ifdef STORE_PIXEL_RGB

-            STORE_PIXEL_RGB(pixel, x + i, y, src[i]);

-#else

-            STORE_PIXEL(pixel, x + i, y, src[i]);

-#endif

-            PUT_PIXEL(ctx, x + i, YFLIP(xrb, y), pixel);

-         }

-      }

-   }

-   else {

-      char *row = swrast_drawable(ctx->DrawBuffer)->row;

-      INIT_PIXEL_PTR(pixel, x, y);

-      for (i = 0; i < count; i++) {

-#ifdef STORE_PIXEL_RGB

-         STORE_PIXEL_RGB(pixel, x + i, y, src[i]);

-#else

-         STORE_PIXEL(pixel, x + i, y, src[i]);

-#endif

-         INC_PIXEL_PTR(pixel);

-      }

-      PUT_ROW( ctx, x, YFLIP(xrb, y), count, row );

-   }

-   (void) rb;

-}

-

-

-static void

-NAME(put_mono_row)( struct gl_context *ctx, struct gl_renderbuffer *rb,

-                    GLuint count, GLint x, GLint y,

-                    const void *value, const GLubyte mask[] )

-{

-#ifdef SPAN_VARS

-   SPAN_VARS

-#endif

-   const RB_TYPE *src = (const RB_TYPE *) value;

-   GLuint i;

-   if (mask) {

-      for (i = 0; i < count; i++) {

-         if (mask[i]) {

-            RB_TYPE row[4];

-            INIT_PIXEL_PTR(pixel, x, y);

-            STORE_PIXEL(pixel, x + i, y, src);

-            PUT_PIXEL(ctx, x + i, YFLIP(xrb, y), pixel);

-         }

-      }

-   }

-   else {

-      char *row = swrast_drawable(ctx->DrawBuffer)->row;

-      INIT_PIXEL_PTR(pixel, x, y);

-      for (i = 0; i < count; i++) {

-         STORE_PIXEL(pixel, x + i, y, src);

-         INC_PIXEL_PTR(pixel);

-      }

-      PUT_ROW( ctx, x, YFLIP(xrb, y), count, row );

-   }

-   (void) rb;

-}

-

-

-static void

-NAME(put_values)( struct gl_context *ctx, struct gl_renderbuffer *rb,

-                  GLuint count, const GLint x[], const GLint y[],

-                  const void *values, const GLubyte mask[] )

-{

-#ifdef SPAN_VARS

-   SPAN_VARS

-#endif

-   const RB_TYPE (*src)[RB_COMPONENTS] = (const RB_TYPE (*)[RB_COMPONENTS]) values;

-   GLuint i;

-   ASSERT(mask);

-   for (i = 0; i < count; i++) {

-      if (mask[i]) {

-         RB_TYPE row[4];

-         INIT_PIXEL_PTR(pixel, x, y);

-         STORE_PIXEL(pixel, x[i], y[i], src[i]);

-         PUT_PIXEL(ctx, x[i], YFLIP(xrb, y[i]), pixel);

-      }

-   }

-   (void) rb;

-}

-

-

-static void

-NAME(put_mono_values)( struct gl_context *ctx, struct gl_renderbuffer *rb,

-                       GLuint count, const GLint x[], const GLint y[],

-                       const void *value, const GLubyte mask[] )

-{

-#ifdef SPAN_VARS

-   SPAN_VARS

-#endif

-   const RB_TYPE *src = (const RB_TYPE *) value;

-   GLuint i;

-   ASSERT(mask);

-   for (i = 0; i < count; i++) {

-      if (mask[i]) {

-         RB_TYPE row[4];

-         INIT_PIXEL_PTR(pixel, x, y);

-         STORE_PIXEL(pixel, x[i], y[i], src);

-         PUT_PIXEL(ctx, x[i], YFLIP(xrb, y[i]), pixel);

-      }

-   }

-   (void) rb;

-}

-

-

-#undef NAME

-#undef RB_TYPE

-#undef RB_COMPONENTS

-#undef SPAN_VARS

-#undef INIT_PIXEL_PTR

-#undef INC_PIXEL_PTR

-#undef STORE_PIXEL

-#undef STORE_PIXEL_RGB

-#undef FETCH_PIXEL

+/*
+ * Mesa 3-D graphics library
+ * Version:  6.5.1
+ *
+ * Copyright (C) 1999-2006  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"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/*
+ * Modified version of swrast/s_spantemp.h for front-buffer rendering. The
+ * no-mask paths use a scratch row to avoid repeated calls to the loader.
+ *
+ * For the mask paths we always use an array of 4 elements of RB_TYPE. This is
+ * to satisfy the xorg loader requirement of an image pitch of 32 bits and
+ * should be ok for other loaders also.
+ */
+
+
+#ifndef _SWRAST_SPANTEMP_ONCE
+#define _SWRAST_SPANTEMP_ONCE
+
+static INLINE void
+PUT_PIXEL( struct gl_context *glCtx, GLint x, GLint y, GLvoid *p )
+{
+    __DRIcontext *ctx = swrast_context(glCtx)->cPriv;
+    __DRIdrawable *draw = swrast_drawable(glCtx->DrawBuffer)->dPriv;
+
+    __DRIscreen *screen = ctx->driScreenPriv;
+
+    screen->swrast_loader->putImage(draw, __DRI_SWRAST_IMAGE_OP_DRAW,
+				    x, y, 1, 1, (char *)p,
+				    draw->loaderPrivate);
+}
+
+
+static INLINE void
+GET_PIXEL( struct gl_context *glCtx, GLint x, GLint y, GLubyte *p )
+{
+    __DRIcontext *ctx = swrast_context(glCtx)->cPriv;
+    __DRIdrawable *read = swrast_drawable(glCtx->ReadBuffer)->dPriv;
+
+    __DRIscreen *screen = ctx->driScreenPriv;
+
+    screen->swrast_loader->getImage(read, x, y, 1, 1, (char *)p,
+				    read->loaderPrivate);
+}
+
+static INLINE void
+PUT_ROW( struct gl_context *glCtx, GLint x, GLint y, GLuint n, char *row )
+{
+    __DRIcontext *ctx = swrast_context(glCtx)->cPriv;
+    __DRIdrawable *draw = swrast_drawable(glCtx->DrawBuffer)->dPriv;
+
+    __DRIscreen *screen = ctx->driScreenPriv;
+
+    screen->swrast_loader->putImage(draw, __DRI_SWRAST_IMAGE_OP_DRAW,
+				    x, y, n, 1, row,
+				    draw->loaderPrivate);
+}
+
+static INLINE void
+GET_ROW( struct gl_context *glCtx, GLint x, GLint y, GLuint n, char *row )
+{
+    __DRIcontext *ctx = swrast_context(glCtx)->cPriv;
+    __DRIdrawable *read = swrast_drawable(glCtx->ReadBuffer)->dPriv;
+
+    __DRIscreen *screen = ctx->driScreenPriv;
+
+    screen->swrast_loader->getImage(read, x, y, n, 1, row,
+				    read->loaderPrivate);
+}
+
+#endif /* _SWRAST_SPANTEMP_ONCE */
+
+
+/*
+ * Templates for the span/pixel-array write/read functions called via
+ * the gl_renderbuffer's GetRow, GetValues, PutRow and PutValues.
+ *
+ * Define the following macros before including this file:
+ *   NAME(BASE)  to generate the function name (i.e. add prefix or suffix)
+ *   RB_TYPE  the renderbuffer DataType
+ *   SPAN_VARS  to declare any local variables
+ *   INIT_PIXEL_PTR(P, X, Y)  to initialize a pointer to a pixel
+ *   INC_PIXEL_PTR(P)  to increment a pixel pointer by one pixel
+ *   STORE_PIXEL(DST, X, Y, VALUE)  to store pixel values in buffer
+ *   FETCH_PIXEL(DST, SRC)  to fetch pixel values from buffer
+ *
+ * Note that in the STORE_PIXEL macros, we also pass in the (X,Y) coordinates
+ * for the pixels to be stored.  This is useful when dithering and probably
+ * ignored otherwise.
+ */
+
+#include "main/macros.h"
+
+
+#if !defined(RB_COMPONENTS)
+#define RB_COMPONENTS 4
+#endif
+
+
+static void
+NAME(get_row)( struct gl_context *ctx, struct gl_renderbuffer *rb,
+               GLuint count, GLint x, GLint y, void *values )
+{
+#ifdef SPAN_VARS
+   SPAN_VARS
+#endif
+   RB_TYPE (*dest)[RB_COMPONENTS] = (RB_TYPE (*)[RB_COMPONENTS]) values;
+   GLuint i;
+   char *row = swrast_drawable(ctx->ReadBuffer)->row;
+   INIT_PIXEL_PTR(pixel, x, y);
+   GET_ROW( ctx, x, YFLIP(xrb, y), count, row );
+   for (i = 0; i < count; i++) {
+      FETCH_PIXEL(dest[i], pixel);
+      INC_PIXEL_PTR(pixel);
+   }
+   (void) rb;
+}
+
+
+static void
+NAME(get_values)( struct gl_context *ctx, struct gl_renderbuffer *rb,
+                  GLuint count, const GLint x[], const GLint y[], void *values )
+{
+#ifdef SPAN_VARS
+   SPAN_VARS
+#endif
+   RB_TYPE (*dest)[RB_COMPONENTS] = (RB_TYPE (*)[RB_COMPONENTS]) values;
+   GLuint i;
+   for (i = 0; i < count; i++) {
+      RB_TYPE pixel[4];
+      GET_PIXEL(ctx, x[i], YFLIP(xrb, y[i]), pixel);
+      FETCH_PIXEL(dest[i], pixel);
+   }
+   (void) rb;
+}
+
+
+static void
+NAME(put_row)( struct gl_context *ctx, struct gl_renderbuffer *rb,
+               GLuint count, GLint x, GLint y,
+               const void *values, const GLubyte mask[] )
+{
+#ifdef SPAN_VARS
+   SPAN_VARS
+#endif
+   const RB_TYPE (*src)[RB_COMPONENTS] = (const RB_TYPE (*)[RB_COMPONENTS]) values;
+   GLuint i;
+   if (mask) {
+      for (i = 0; i < count; i++) {
+         if (mask[i]) {
+            RB_TYPE row[4];
+            INIT_PIXEL_PTR(pixel, x, y);
+            STORE_PIXEL(pixel, x + i, y, src[i]);
+            PUT_PIXEL(ctx, x + i, YFLIP(xrb, y), pixel);
+         }
+      }
+   }
+   else {
+      char *row = swrast_drawable(ctx->DrawBuffer)->row;
+      INIT_PIXEL_PTR(pixel, x, y);
+      for (i = 0; i < count; i++) {
+         STORE_PIXEL(pixel, x + i, y, src[i]);
+         INC_PIXEL_PTR(pixel);
+      }
+      PUT_ROW( ctx, x, YFLIP(xrb, y), count, row );
+   }
+   (void) rb;
+}
+
+
+static void
+NAME(put_values)( struct gl_context *ctx, struct gl_renderbuffer *rb,
+                  GLuint count, const GLint x[], const GLint y[],
+                  const void *values, const GLubyte mask[] )
+{
+#ifdef SPAN_VARS
+   SPAN_VARS
+#endif
+   const RB_TYPE (*src)[RB_COMPONENTS] = (const RB_TYPE (*)[RB_COMPONENTS]) values;
+   GLuint i;
+   ASSERT(mask);
+   for (i = 0; i < count; i++) {
+      if (mask[i]) {
+         RB_TYPE row[4];
+         INIT_PIXEL_PTR(pixel, x, y);
+         STORE_PIXEL(pixel, x[i], y[i], src[i]);
+         PUT_PIXEL(ctx, x[i], YFLIP(xrb, y[i]), pixel);
+      }
+   }
+   (void) rb;
+}
+
+
+
+
+#undef NAME
+#undef RB_TYPE
+#undef RB_COMPONENTS
+#undef SPAN_VARS
+#undef INIT_PIXEL_PTR
+#undef INC_PIXEL_PTR
+#undef STORE_PIXEL
+#undef STORE_PIXEL_RGB
+#undef FETCH_PIXEL
diff --git a/mesalib/src/mesa/drivers/windows/gdi/wmesa.c b/mesalib/src/mesa/drivers/windows/gdi/wmesa.c
index 675ffdaaa..255d811ca 100644
--- a/mesalib/src/mesa/drivers/windows/gdi/wmesa.c
+++ b/mesalib/src/mesa/drivers/windows/gdi/wmesa.c
@@ -526,61 +526,6 @@ static void write_rgba_span_front(struct gl_context *ctx,
    }
 }
 
-/* Write a horizontal span of RGB color pixels with a boolean mask. */
-static void write_rgb_span_front(struct gl_context *ctx, 
-				 struct gl_renderbuffer *rb, 
-				 GLuint n, GLint x, GLint y,
-				 const void *values, 
-				 const GLubyte *mask)
-{
-    const GLubyte (*rgb)[3] = (const GLubyte (*)[3])values;
-    WMesaContext pwc = wmesa_context(ctx);
-    GLuint i;
-    
-    (void) ctx;
-    y=FLIP(y);
-    if (mask) {
-	for (i=0; i<n; i++)
-	    if (mask[i])
-		SetPixel(pwc->hDC, x+i, y, RGB(rgb[i][RCOMP], rgb[i][GCOMP], 
-					       rgb[i][BCOMP]));
-    }
-    else {
-	for (i=0; i<n; i++)
-	    SetPixel(pwc->hDC, x+i, y, RGB(rgb[i][RCOMP], rgb[i][GCOMP], 
-					   rgb[i][BCOMP]));
-    }
-    
-}
-
-/*
- * Write a horizontal span of pixels with a boolean mask.  The current color
- * is used for all pixels.
- */
-static void write_mono_rgba_span_front(struct gl_context *ctx, 
-                                       struct gl_renderbuffer *rb,
-                                       GLuint n, GLint x, GLint y,
-                                       const void *value, 
-                                       const GLubyte *mask)
-{
-    const GLchan *color = (const GLchan *)value;
-    GLuint i;
-    WMesaContext pwc = wmesa_context(ctx);
-    COLORREF colorref;
-
-    (void) ctx;
-    colorref = RGB(color[RCOMP], color[GCOMP], color[BCOMP]);
-    y=FLIP(y);
-    if (mask) {
-	for (i=0; i<n; i++)
-	    if (mask[i])
-		SetPixel(pwc->hDC, x+i, y, colorref);
-    }
-    else
-	for (i=0; i<n; i++)
-	    SetPixel(pwc->hDC, x+i, y, colorref);
-
-}
 
 /* Write an array of RGBA pixels with a boolean mask. */
 static void write_rgba_pixels_front(struct gl_context *ctx, 
@@ -603,28 +548,6 @@ static void write_rgba_pixels_front(struct gl_context *ctx,
 
 
 
-/*
- * Write an array of pixels with a boolean mask.  The current color
- * is used for all pixels.
- */
-static void write_mono_rgba_pixels_front(struct gl_context *ctx, 
-                                         struct gl_renderbuffer *rb,
-                                         GLuint n,
-                                         const GLint x[], const GLint y[],
-                                         const void *value,
-                                         const GLubyte *mask)
-{
-    const GLchan *color = (const GLchan *)value;
-    GLuint i;
-    WMesaContext pwc = wmesa_context(ctx);
-    COLORREF colorref;
-    (void) ctx;
-    colorref = RGB(color[RCOMP], color[GCOMP], color[BCOMP]);
-    for (i=0; i<n; i++)
-	if (mask[i])
-	    SetPixel(pwc->hDC, x[i], FLIP(y[i]), colorref);
-}
-
 /* Read a horizontal span of color pixels. */
 static void read_rgba_span_front(struct gl_context *ctx, 
                                  struct gl_renderbuffer *rb,
@@ -706,64 +629,6 @@ static void write_rgba_span_32(struct gl_context *ctx,
 }
 
 
-/* Write a horizontal span of RGB color pixels with a boolean mask. */
-static void write_rgb_span_32(struct gl_context *ctx, 
-			      struct gl_renderbuffer *rb, 
-			      GLuint n, GLint x, GLint y,
-			      const void *values, 
-			      const GLubyte *mask)
-{
-    const GLubyte (*rgb)[3] = (const GLubyte (*)[3])values;
-    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);
-    GLuint i;
-    LPDWORD lpdw;
-
-    (void) ctx;
-    
-    y=FLIP(y);
-    lpdw = ((LPDWORD)(pwfb->pbPixels + pwfb->ScanWidth * y)) + x;
-    if (mask) {
-	for (i=0; i<n; i++)
-	    if (mask[i])
-                lpdw[i] = BGR32(rgb[i][RCOMP], rgb[i][GCOMP], 
-				rgb[i][BCOMP]);
-    }
-    else {
-	for (i=0; i<n; i++)
-                *lpdw++ = BGR32(rgb[i][RCOMP], rgb[i][GCOMP], 
-				rgb[i][BCOMP]);
-    }
-}
-
-/*
- * Write a horizontal span of pixels with a boolean mask.  The current color
- * is used for all pixels.
- */
-static void write_mono_rgba_span_32(struct gl_context *ctx, 
-				    struct gl_renderbuffer *rb,
-				    GLuint n, GLint x, GLint y,
-				    const void *value, 
-				    const GLubyte *mask)
-{
-    const GLchan *color = (const GLchan *)value;
-    LPDWORD lpdw;
-    DWORD pixel;
-    GLuint i;
-    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);
-    lpdw = ((LPDWORD)(pwfb->pbPixels + pwfb->ScanWidth * y)) + x;
-    y=FLIP(y);
-    pixel = BGR32(color[RCOMP], color[GCOMP], color[BCOMP]);
-    if (mask) {
-	for (i=0; i<n; i++)
-	    if (mask[i])
-                lpdw[i] = pixel;
-    }
-    else
-	for (i=0; i<n; i++)
-                *lpdw++ = pixel;
-
-}
-
 /* Write an array of RGBA pixels with a boolean mask. */
 static void write_rgba_pixels_32(struct gl_context *ctx, 
 				 struct gl_renderbuffer *rb,
@@ -780,25 +645,6 @@ static void write_rgba_pixels_32(struct gl_context *ctx,
 			 rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP]);
 }
 
-/*
- * Write an array of pixels with a boolean mask.  The current color
- * is used for all pixels.
- */
-static void write_mono_rgba_pixels_32(struct gl_context *ctx, 
-				      struct gl_renderbuffer *rb,
-				      GLuint n,
-				      const GLint x[], const GLint y[],
-				      const void *value,
-				      const GLubyte *mask)
-{
-    const GLchan *color = (const GLchan *)value;
-    GLuint i;
-    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);
-    for (i=0; i<n; i++)
-	if (mask[i])
-	    WMSETPIXEL32(pwfb, FLIP(y[i]),x[i],color[RCOMP],
-			 color[GCOMP], color[BCOMP]);
-}
 
 /* Read a horizontal span of color pixels. */
 static void read_rgba_span_32(struct gl_context *ctx, 
@@ -892,71 +738,6 @@ static void write_rgba_span_24(struct gl_context *ctx,
 }
 
 
-/* Write a horizontal span of RGB color pixels with a boolean mask. */
-static void write_rgb_span_24(struct gl_context *ctx, 
-			      struct gl_renderbuffer *rb, 
-			      GLuint n, GLint x, GLint y,
-			      const void *values, 
-			      const GLubyte *mask)
-{
-    const GLubyte (*rgb)[3] = (const GLubyte (*)[3])values;
-    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);
-    GLuint i;
-    LPBYTE lpb;
-
-    (void) ctx;
-    
-    y=FLIP(y);
-    lpb = ((LPBYTE)(pwfb->pbPixels + pwfb->ScanWidth * y)) + (3 * x);
-    if (mask) {
-	for (i=0; i<n; i++)
-	    if (mask[i]) {
-            lpb[3*i] = rgb[i][BCOMP];
-            lpb[3*i+1] = rgb[i][GCOMP];
-            lpb[3*i+2] = rgb[i][RCOMP];
-	    }
-    }
-    else {
-    	for (i=0; i<n; i++) {
-    		*lpb++ = rgb[i][BCOMP];
-    		*lpb++ = rgb[i][GCOMP];
-    		*lpb++ = rgb[i][RCOMP];
-    	}
-    }
-}
-
-/*
- * Write a horizontal span of pixels with a boolean mask.  The current color
- * is used for all pixels.
- */
-static void write_mono_rgba_span_24(struct gl_context *ctx, 
-				    struct gl_renderbuffer *rb,
-				    GLuint n, GLint x, GLint y,
-				    const void *value, 
-				    const GLubyte *mask)
-{
-    const GLchan *color = (const GLchan *)value;
-    LPBYTE lpb;
-    GLuint i;
-    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);
-    lpb = ((LPBYTE)(pwfb->pbPixels + pwfb->ScanWidth * y)) + (3 * x);
-    y=FLIP(y);
-    if (mask) {
-	for (i=0; i<n; i++)
-	    if (mask[i]) {
-	    	lpb[3*i] = color[BCOMP];
-	    	lpb[3*i+1] = color[GCOMP];
-	    	lpb[3*i+2] = color[RCOMP];
-	    }
-    }
-    else
-	for (i=0; i<n; i++) {
-		*lpb++ = color[BCOMP];
-		*lpb++ = color[GCOMP];
-		*lpb++ = color[RCOMP];		
-	}
-}
-
 /* Write an array of RGBA pixels with a boolean mask. */
 static void write_rgba_pixels_24(struct gl_context *ctx, 
 				 struct gl_renderbuffer *rb,
@@ -973,25 +754,6 @@ static void write_rgba_pixels_24(struct gl_context *ctx,
 			 rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP]);
 }
 
-/*
- * Write an array of pixels with a boolean mask.  The current color
- * is used for all pixels.
- */
-static void write_mono_rgba_pixels_24(struct gl_context *ctx, 
-				      struct gl_renderbuffer *rb,
-				      GLuint n,
-				      const GLint x[], const GLint y[],
-				      const void *value,
-				      const GLubyte *mask)
-{
-    const GLchan *color = (const GLchan *)value;
-    GLuint i;
-    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);
-    for (i=0; i<n; i++)
-	if (mask[i])
-	    WMSETPIXEL24(pwfb, FLIP(y[i]),x[i],color[RCOMP],
-			 color[GCOMP], color[BCOMP]);
-}
 
 /* Read a horizontal span of color pixels. */
 static void read_rgba_span_24(struct gl_context *ctx, 
@@ -1077,64 +839,6 @@ static void write_rgba_span_16(struct gl_context *ctx,
 }
 
 
-/* Write a horizontal span of RGB color pixels with a boolean mask. */
-static void write_rgb_span_16(struct gl_context *ctx, 
-			      struct gl_renderbuffer *rb, 
-			      GLuint n, GLint x, GLint y,
-			      const void *values, 
-			      const GLubyte *mask)
-{
-    const GLubyte (*rgb)[3] = (const GLubyte (*)[3])values;
-    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);
-    GLuint i;
-    LPWORD lpw;
-
-    (void) ctx;
-    
-    y=FLIP(y);
-    lpw = ((LPWORD)(pwfb->pbPixels + pwfb->ScanWidth * y)) + x;
-    if (mask) {
-	for (i=0; i<n; i++)
-	    if (mask[i])
-                lpw[i] = BGR16(rgb[i][RCOMP], rgb[i][GCOMP], 
-			       rgb[i][BCOMP]);
-    }
-    else {
-	for (i=0; i<n; i++)
-                *lpw++ = BGR16(rgb[i][RCOMP], rgb[i][GCOMP], 
-			       rgb[i][BCOMP]);
-    }
-}
-
-/*
- * Write a horizontal span of pixels with a boolean mask.  The current color
- * is used for all pixels.
- */
-static void write_mono_rgba_span_16(struct gl_context *ctx, 
-				    struct gl_renderbuffer *rb,
-				    GLuint n, GLint x, GLint y,
-				    const void *value, 
-				    const GLubyte *mask)
-{
-    const GLchan *color = (const GLchan *)value;
-    LPWORD lpw;
-    WORD pixel;
-    GLuint i;
-    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);
-    (void) ctx;
-    lpw = ((LPWORD)(pwfb->pbPixels + pwfb->ScanWidth * y)) + x;
-    y=FLIP(y);
-    pixel = BGR16(color[RCOMP], color[GCOMP], color[BCOMP]);
-    if (mask) {
-	for (i=0; i<n; i++)
-	    if (mask[i])
-                lpw[i] = pixel;
-    }
-    else
-	for (i=0; i<n; i++)
-                *lpw++ = pixel;
-
-}
 
 /* Write an array of RGBA pixels with a boolean mask. */
 static void write_rgba_pixels_16(struct gl_context *ctx, 
@@ -1153,26 +857,6 @@ static void write_rgba_pixels_16(struct gl_context *ctx,
 			 rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP]);
 }
 
-/*
- * Write an array of pixels with a boolean mask.  The current color
- * is used for all pixels.
- */
-static void write_mono_rgba_pixels_16(struct gl_context *ctx, 
-				      struct gl_renderbuffer *rb,
-				      GLuint n,
-				      const GLint x[], const GLint y[],
-				      const void *value,
-				      const GLubyte *mask)
-{
-    const GLchan *color = (const GLchan *)value;
-    GLuint i;
-    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);
-    (void) ctx;
-    for (i=0; i<n; i++)
-	if (mask[i])
-	    WMSETPIXEL16(pwfb, FLIP(y[i]),x[i],color[RCOMP],
-			 color[GCOMP], color[BCOMP]);
-}
 
 /* Read a horizontal span of color pixels. */
 static void read_rgba_span_16(struct gl_context *ctx, 
@@ -1270,10 +954,7 @@ wmesa_set_renderbuffer_funcs(struct gl_renderbuffer *rb, int pixelformat,
 	switch(pixelformat) {
 	case PF_5R6G5B:
 	    rb->PutRow = write_rgba_span_16;
-	    rb->PutRowRGB = write_rgb_span_16;
-	    rb->PutMonoRow = write_mono_rgba_span_16;
 	    rb->PutValues = write_rgba_pixels_16;
-	    rb->PutMonoValues = write_mono_rgba_pixels_16;
 	    rb->GetRow = read_rgba_span_16;
 	    rb->GetValues = read_rgba_pixels_16;
 	    break;
@@ -1281,22 +962,16 @@ wmesa_set_renderbuffer_funcs(struct gl_renderbuffer *rb, int pixelformat,
 		if (cColorBits == 24)
 		{
 		    rb->PutRow = write_rgba_span_24;
-		    rb->PutRowRGB = write_rgb_span_24;
-		    rb->PutMonoRow = write_mono_rgba_span_24;
 		    rb->PutValues = write_rgba_pixels_24;
-		    rb->PutMonoValues = write_mono_rgba_pixels_24;
 		    rb->GetRow = read_rgba_span_24;
 		    rb->GetValues = read_rgba_pixels_24;
 		}
 		else
 		{
-	        rb->PutRow = write_rgba_span_32;
-	        rb->PutRowRGB = write_rgb_span_32;
-	        rb->PutMonoRow = write_mono_rgba_span_32;
-	        rb->PutValues = write_rgba_pixels_32;
-	        rb->PutMonoValues = write_mono_rgba_pixels_32;
-	        rb->GetRow = read_rgba_span_32;
-	        rb->GetValues = read_rgba_pixels_32;
+                    rb->PutRow = write_rgba_span_32;
+                    rb->PutValues = write_rgba_pixels_32;
+                    rb->GetRow = read_rgba_span_32;
+                    rb->GetValues = read_rgba_pixels_32;
 		}
 	    break;
 	default:
@@ -1306,10 +981,7 @@ wmesa_set_renderbuffer_funcs(struct gl_renderbuffer *rb, int pixelformat,
     else {
         /* front buffer (actual Windows window) */
 	rb->PutRow = write_rgba_span_front;
-	rb->PutRowRGB = write_rgb_span_front;
-	rb->PutMonoRow = write_mono_rgba_span_front;
 	rb->PutValues = write_rgba_pixels_front;
-	rb->PutMonoValues = write_mono_rgba_pixels_front;
 	rb->GetRow = read_rgba_span_front;
 	rb->GetValues = read_rgba_pixels_front;
     }