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.

2 files changed, 6 insertions, 6 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;