removed Driver.UseGlobalTexturePalette()

diff --git a/src/mesa/drivers/glide/fxdd.c b/src/mesa/drivers/glide/fxdd.c
index bc1e55a..be48efd 100644 (file)
--- a/src/mesa/drivers/glide/fxdd.c
+++ b/src/mesa/drivers/glide/fxdd.c
@@ -990,7 +990,6 @@ void fxSetupDDPointers(GLcontext *ctx)
   ctx->Driver.BindTexture=fxDDTexBind;
   ctx->Driver.DeleteTexture=fxDDTexDel;
   ctx->Driver.UpdateTexturePalette=fxDDTexPalette;
-  ctx->Driver.UseGlobalTexturePalette=fxDDTexUseGlbPalette;
 
   ctx->Driver.RectFunc=NULL;
 

diff --git a/src/mesa/drivers/glide/fxsetup.c b/src/mesa/drivers/glide/fxsetup.c
index d190803..7d4340d 100644 (file)
--- a/src/mesa/drivers/glide/fxsetup.c
+++ b/src/mesa/drivers/glide/fxsetup.c
@@ -1615,6 +1615,9 @@ void fxDDEnable(GLcontext *ctx, GLenum cap, GLboolean state)
      fxMesa->new_state |= FX_NEW_SCISSOR;
      ctx->Driver.RenderStart = fxSetupFXUnits;
      break;
+  case GL_SHARED_TEXTURE_PALETTE_EXT:
+     fxDDTexUseGlbPalette(ctx, state);
+     break;
   case GL_FOG:
      fxMesa->new_state |= FX_NEW_FOG;
      ctx->Driver.RenderStart = fxSetupFXUnits;

diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index 78397c4..fd6874c 100644 (file)
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -1,4 +1,4 @@
-/* $Id: dd.h,v 1.16 2000/03/07 17:11:29 brianp Exp $ */
+/* $Id: dd.h,v 1.17 2000/03/07 18:24:49 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -626,11 +626,6 @@ struct dd_function_table {
     * was changed.
     */
 
-   void (*UseGlobalTexturePalette)( GLcontext *ctx, GLboolean state );
-   /*
-    * Called via glEnable/Disable(GL_SHARED_TEXTURE_PALETTE_EXT)
-    */
-
    void (*ActiveTexture)( GLcontext *ctx, GLuint texUnitNumber );
    /*
     * Called by glActiveTextureARB to set current texture unit.

diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c
index 8a1b79f..94defaa 100644 (file)
--- a/src/mesa/main/enable.c
+++ b/src/mesa/main/enable.c
@@ -1,4 +1,4 @@
-/* $Id: enable.c,v 1.10 1999/11/11 01:22:26 brianp Exp $ */
+/* $Id: enable.c,v 1.11 2000/03/07 18:24:49 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -328,8 +328,6 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state )
         break;
       case GL_SHARED_TEXTURE_PALETTE_EXT:
          ctx->Texture.SharedPalette = state;
-         if (ctx->Driver.UseGlobalTexturePalette)
-            (*ctx->Driver.UseGlobalTexturePalette)( ctx, state );
          break;
       case GL_STENCIL_TEST:
         if (state && ctx->Visual->StencilBits==0) {