4 files changed, 15 insertions, 43 deletions
diff --git a/src/mesa/drivers/glide/fxdrv.h b/src/mesa/drivers/glide/fxdrv.h
index c85c73d8e23..e3a865b0d45 100644
--- a/src/mesa/drivers/glide/fxdrv.h
+++ b/src/mesa/drivers/glide/fxdrv.h
@@ -644,9 +644,9 @@ extern int fxTexGetInfo(int, int, GrLOD_t *, GrAspectRatio_t *,
 extern void fxDDScissor( GLcontext *ctx,
 			      GLint x, GLint y, GLsizei w, GLsizei h );
 extern void fxDDFogfv( GLcontext *ctx, GLenum pname, const GLfloat *params );
-extern GLboolean fxDDColorMask(GLcontext *ctx, 
-			       GLboolean r, GLboolean g, 
-			       GLboolean b, GLboolean a );
+extern void fxDDColorMask(GLcontext *ctx, 
+                          GLboolean r, GLboolean g, 
+                          GLboolean b, GLboolean a );
 
 extern void fxDDWriteDepthSpan(GLcontext *ctx, GLuint n, GLint x, GLint y,
                                const GLdepth depth[], const GLubyte mask[]);
diff --git a/src/mesa/drivers/glide/fxsetup.c b/src/mesa/drivers/glide/fxsetup.c
index f1a56650bde..b6bbb0c85b6 100644
--- a/src/mesa/drivers/glide/fxsetup.c
+++ b/src/mesa/drivers/glide/fxsetup.c
@@ -1398,9 +1398,9 @@ static void fxSetupDepthTest(GLcontext *ctx)
 /**************************** Color Mask SetUp **************************/
 /************************************************************************/
 
-GLboolean fxDDColorMask(GLcontext *ctx, 
-			GLboolean r, GLboolean g, 
-			GLboolean b, GLboolean a )
+void fxDDColorMask(GLcontext *ctx, 
+                   GLboolean r, GLboolean g, 
+                   GLboolean b, GLboolean a )
 {
   fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
   fxMesa->new_state |= FX_NEW_COLOR_MASK;
diff --git a/src/mesa/drivers/windows/wmesa.c b/src/mesa/drivers/windows/wmesa.c
index 00f156a1026..f0a1c84fe5c 100644
--- a/src/mesa/drivers/windows/wmesa.c
+++ b/src/mesa/drivers/windows/wmesa.c
@@ -1,4 +1,4 @@
-/* $Id: wmesa.c,v 1.4 2000/08/02 20:29:03 brianp Exp $ */
+/* $Id: wmesa.c,v 1.5 2000/09/07 15:45:28 brianp Exp $ */
 
 /*
 *   File name   :   wmesa.c
@@ -22,6 +22,14 @@
 
 /*
  * $Log: wmesa.c,v $
+ * Revision 1.5  2000/09/07 15:45:28  brianp
+ * Removed ctx->Driver.LogicOp().
+ * ctx->Driver.Index/ColorMask() now return void.
+ * Removed SWmasking and SWLogicOpEnabled variables.
+ * LogicOps and color/index masking are no longer special-case device
+ * driver functions.  The Xlib driver was the only driver that used
+ * them.  Things are more uniform now.
+ *
  * Revision 1.4  2000/08/02 20:29:03  brianp
  * updates from [email protected]
  *
@@ -562,27 +570,6 @@ static void set_color( GLcontext* ctx, GLubyte r, GLubyte g, GLubyte b, GLubyte
 }
 
 
-
-/* Set the index mode bitplane mask. */
-static GLboolean index_mask(GLcontext* ctx, GLuint mask)
-{
-    /* can't implement */
-    return GL_FALSE;
-}
-
-
-
-/* Set the RGBA drawing mask. */
-static GLboolean color_mask( GLcontext* ctx,
-                            GLboolean rmask, GLboolean gmask,
-                            GLboolean bmask, GLboolean amask)
-{
-    /* can't implement */
-    return GL_FALSE;
-}
-
-
-
 static void dither( GLcontext* ctx, GLboolean enable )
 {
    if (!Current)
@@ -1177,8 +1164,6 @@ void setup_DD_pointers( GLcontext* ctx )
 
     ctx->Driver.Index = set_index;
     ctx->Driver.Color = set_color;
-    ctx->Driver.IndexMask = index_mask;
-    ctx->Driver.ColorMask = color_mask;
 
     ctx->Driver.Dither = dither;
 
diff --git a/src/mesa/drivers/windows/wmesa_stereo.c b/src/mesa/drivers/windows/wmesa_stereo.c
index ea721a13b66..fe3c315bd9a 100644
--- a/src/mesa/drivers/windows/wmesa_stereo.c
+++ b/src/mesa/drivers/windows/wmesa_stereo.c
@@ -299,18 +299,6 @@ static GLboolean color_mask( GLcontext* ctx,
 
 
 
-/*
- * Set the pixel logic operation.  Return GL_TRUE if the device driver
- * can perform the operation, otherwise return GL_FALSE.  If GL_FALSE
- * is returned, the logic op will be done in software by Mesa.
- */
-GLboolean logicop( GLcontext* ctx, GLenum op )
-{
-   /* can't implement */
-   return GL_FALSE;
-}
-
-
 static void dither( GLcontext* ctx, GLboolean enable )
 {
    /* No op */
@@ -1046,7 +1034,6 @@ void setup_DD_pointers( GLcontext* ctx )
    ctx->Driver.IndexMask = index_mask;
    ctx->Driver.ColorMask = color_mask;
 
-   ctx->Driver.LogicOp = logicop;
    ctx->Driver.Dither = dither;
 
    ctx->Driver.SetBuffer = set_buffer;