From 292615071a3867ab90dc7c444f72bcfadd2869f3 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Fri, 23 Jan 2004 18:51:00 +0000 Subject: more fixing for tdfxUpdateTexturePalette --- Make-config | 2 +- src/mesa/drivers/dri/tdfx/tdfx_state.c | 3 --- src/mesa/drivers/dri/tdfx/tdfx_tex.c | 6 +++--- src/mesa/drivers/dri/tdfx/tdfx_tex.h | 3 --- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/Make-config b/Make-config index 835be9d42d..031e8ddf88 100644 --- 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 c5c2cdb6f8..61306981cc 100644 --- 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 e4240afc4d..515ae7c809 100644 --- 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 ceb2e57598..a3bcee4b69 100644 --- 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); -- cgit v1.2.3