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.

1 files changed, 5 insertions, 5 deletions

diff --git a/src/mesa/main/blend.c b/src/mesa/main/blend.c
index 431fa603d27..b9b2b4788bb 100644
--- a/src/mesa/main/blend.c
+++ b/src/mesa/main/blend.c
@@ -1,4 +1,4 @@
-/* $Id: blend.c,v 1.17 2000/08/30 18:21:06 brianp Exp $ */
+/* $Id: blend.c,v 1.18 2000/09/07 15:45:27 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -875,7 +875,8 @@ _mesa_blend_span( GLcontext *ctx, GLuint n, GLint x, GLint y,
    GLubyte dest[MAX_WIDTH][4];
 
    /* Check if device driver can do the work */
-   if (ctx->Color.BlendEquation==GL_LOGIC_OP && !ctx->Color.SWLogicOpEnabled) {
+   if (ctx->Color.BlendEquation==GL_LOGIC_OP &&
+       !ctx->Color.ColorLogicOpEnabled) {
       return;
    }
 
@@ -890,8 +891,6 @@ _mesa_blend_span( GLcontext *ctx, GLuint n, GLint x, GLint y,
 
 
 
-
-
 /*
  * Apply the blending operator to an array of pixels.
  * Input:  n - number of pixels in span
@@ -907,7 +906,8 @@ _mesa_blend_pixels( GLcontext *ctx,
    GLubyte dest[PB_SIZE][4];
 
    /* Check if device driver can do the work */
-   if (ctx->Color.BlendEquation==GL_LOGIC_OP && !ctx->Color.SWLogicOpEnabled) {
+   if (ctx->Color.BlendEquation==GL_LOGIC_OP &&
+       !ctx->Color.ColorLogicOpEnabled) {
       return;
    }