diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2004-01-23 18:51:00 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2004-01-23 18:51:00 +0000 |
| commit | 292615071a3867ab90dc7c444f72bcfadd2869f3 (patch) | |
| tree | d7d7996ff7cb5cb117049ace6bd77f275e6266cf /src/mesa | |
| parent | 7f7b2d86bc9f6a1811bab65c3bd2a3af83fb135e (diff) | |
more fixing for tdfxUpdateTexturePalette
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/tdfx/tdfx_state.c | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/tdfx/tdfx_tex.c | 6 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/tdfx/tdfx_tex.h | 3 |
3 files changed, 3 insertions, 9 deletions
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); |