AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more fixing for tdfxUpdateTexturePalette

Browse Source
This commit is contained in:
Brian Paul
2004-01-23 18:51:00 +00:00
parent 7f7b2d86bc
commit 292615071a
4 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Make-config
+1 -1
View File
@@ -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" \
src/mesa/drivers/dri/tdfx/tdfx_state.c
-3
View File
@@ -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;
src/mesa/drivers/dri/tdfx/tdfx_tex.c
+3 -3
View File
@@ -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;
}
src/mesa/drivers/dri/tdfx/tdfx_tex.h
-3
View File
@@ -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);