removed ctx->Driver.Dither function

2 files changed, 17 insertions, 42 deletions

diff --git a/src/mesa/drivers/windows/wmesa.c b/src/mesa/drivers/windows/wmesa.c
index f0a1c84fe5..33a8f19631 100644
--- a/src/mesa/drivers/windows/wmesa.c
+++ b/src/mesa/drivers/windows/wmesa.c
@@ -1,4 +1,4 @@
-/* $Id: wmesa.c,v 1.5 2000/09/07 15:45:28 brianp Exp $ */
+/* $Id: wmesa.c,v 1.6 2000/09/08 21:44:56 brianp Exp $ */
 
 /*
 *   File name   :   wmesa.c
@@ -22,6 +22,9 @@
 
 /*
  * $Log: wmesa.c,v $
+ * Revision 1.6  2000/09/08 21:44:56  brianp
+ * removed ctx->Driver.Dither function
+ *
  * Revision 1.5  2000/09/07 15:45:28  brianp
  * Removed ctx->Driver.LogicOp().
  * ctx->Driver.Index/ColorMask() now return void.
@@ -570,24 +573,26 @@ static void set_color( GLcontext* ctx, GLubyte r, GLubyte g, GLubyte b, GLubyte
 }
 
 
-static void dither( GLcontext* ctx, GLboolean enable )
+static void enable( GLcontext* ctx, GLenum pname, GLboolean enable )
 {
    if (!Current)
       return;
 
-    if(enable == GL_FALSE){
-        Current->dither_flag = GL_FALSE;
-        if(Current->cColorBits == 8)
+   if (pname == GL_DITHER) {
+      if(enable == GL_FALSE){
+         Current->dither_flag = GL_FALSE;
+         if(Current->cColorBits == 8)
             Current->pixelformat = PF_INDEX8;
-    }
-    else{
-        if (Current->rgb_flag && Current->cColorBits == 8){
+      }
+      else{
+         if (Current->rgb_flag && Current->cColorBits == 8){
             Current->pixelformat = PF_DITHER8;
             Current->dither_flag = GL_TRUE;
-        }
-        else
+         }
+         else
             Current->dither_flag = GL_FALSE;
-    }
+      }
+   }
 }
 
 
@@ -1165,7 +1170,7 @@ void setup_DD_pointers( GLcontext* ctx )
     ctx->Driver.Index = set_index;
     ctx->Driver.Color = set_color;
 
-    ctx->Driver.Dither = dither;
+    ctx->Driver.Enable = enable;
 
     ctx->Driver.SetBuffer = set_buffer;
     ctx->Driver.GetBufferSize = buffer_size;
diff --git a/src/mesa/drivers/windows/wmesa_stereo.c b/src/mesa/drivers/windows/wmesa_stereo.c
index fe3c315bd9..934e6a5f83 100644
--- a/src/mesa/drivers/windows/wmesa_stereo.c
+++ b/src/mesa/drivers/windows/wmesa_stereo.c
@@ -279,32 +279,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 )

-{

-   /* No op */

-}

-

-

 

 static GLboolean set_buffer( GLcontext* ctx, GLenum mode )

 {

@@ -1031,10 +1005,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;

 

    ctx->Driver.SetBuffer = set_buffer;

    ctx->Driver.GetBufferSize = buffer_size;