more fixing for tdfxUpdateTexturePalette

diff --git a/Make-config b/Make-config
index 835be9d42d7128cde740d3437c659b885ef3b25f..031e8ddf88a914c176c03e977f4cd2e5577bcdbe 100644 (file)
--- a/Make-config
+++ b/Make-config
@@ -739,7 +739,7 @@ linux-solo:
        "GLUT_LIB = libglut.so" \
        "CC = gcc" \
        "CXX = g++" \
-       "CFLAGS = -g -std=c99 -pedantic -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE" \
+       "CFLAGS = -Wmissing-prototypes -g -std=c99 -pedantic -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE" \
        "CXXFLAGS = -g -Wall -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE" \
        "GLUT_CFLAGS = -fexceptions" \
        "GL_LIB_DEPS = -lm -lpthread -lexpat" \

diff --git a/src/mesa/drivers/dri/tdfx/tdfx_state.c b/src/mesa/drivers/dri/tdfx/tdfx_state.c
index c5c2cdb6f85436b1aa526959ce43c13d3a64ea1a..61306981ccad6241e909b4c0e00c2aeaeefcaa64 100644 (file)
--- a/src/mesa/drivers/dri/tdfx/tdfx_state.c
+++ b/src/mesa/drivers/dri/tdfx/tdfx_state.c
@@ -1404,9 +1404,6 @@ void tdfxDDInitStateFuncs( GLcontext *ctx )
    ctx->Driver.Scissor                 = tdfxDDScissor;
    ctx->Driver.ShadeModel              = tdfxDDShadeModel;
 
-/*     ctx->Driver.GetTexImage         = tdfxDDGetTexImage; */
-   ctx->Driver.UpdateTexturePalette    = tdfxDDTexturePalette;
-
    if ( fxMesa->haveHwStencil ) {
       ctx->Driver.StencilFunc          = tdfxDDStencilFunc;
       ctx->Driver.StencilMask          = tdfxDDStencilMask;

diff --git a/src/mesa/drivers/dri/tdfx/tdfx_tex.c b/src/mesa/drivers/dri/tdfx/tdfx_tex.c
index e4240afc4d14aa943f8e599ad7dc74ca0c169abd..515ae7c809afb5fb44e746bc15c9808ad1868687 100644 (file)
--- a/src/mesa/drivers/dri/tdfx/tdfx_tex.c
+++ b/src/mesa/drivers/dri/tdfx/tdfx_tex.c
@@ -536,8 +536,8 @@ convertPalette(FxU32 data[256], const struct gl_color_table *table)
 
 
 
-void
-tdfxTexturePalette(GLcontext * ctx, struct gl_texture_object *tObj)
+static void
+tdfxUpdateTexturePalette(GLcontext * ctx, struct gl_texture_object *tObj)
 {
     tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
 
@@ -1498,6 +1498,6 @@ void tdfxInitTextureFuncs( struct dd_function_table *functions )
    functions->TexImage2D               = tdfxTexImage2D;
    functions->TexSubImage2D            = tdfxTexSubImage2D;
    functions->IsTextureResident                = tdfxIsTextureResident;
-   functions->UpdateTexturePalette      = tdfxTexturePalette;
+   functions->UpdateTexturePalette      = tdfxUpdateTexturePalette;
 }
 

diff --git a/src/mesa/drivers/dri/tdfx/tdfx_tex.h b/src/mesa/drivers/dri/tdfx/tdfx_tex.h
index ceb2e575987651ff8e9bd339be8340a88bd9552d..a3bcee4b6956d187a9491da146e1b4c7d99db2a0 100644 (file)
--- a/src/mesa/drivers/dri/tdfx/tdfx_tex.h
+++ b/src/mesa/drivers/dri/tdfx/tdfx_tex.h
@@ -54,9 +54,6 @@ extern void
 tdfxTexValidate(GLcontext * ctx, struct gl_texture_object *tObj);
 
 
-extern void
-tdfxTexturePalette(GLcontext * ctx, struct gl_texture_object *tObj);
-
 #if 000 /* DEAD? */
 extern void
 fxDDTexUseGlobalPalette(GLcontext * ctx, GLboolean state);