diff options
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/main/colortab.c | 10 | ||||
| -rw-r--r-- | src/mesa/main/context.c | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/mesa/main/colortab.c b/src/mesa/main/colortab.c index f6f281ae1a..7597d10773 100644 --- a/src/mesa/main/colortab.c +++ b/src/mesa/main/colortab.c @@ -1,4 +1,4 @@ -/* $Id: colortab.c,v 1.6 1999/11/11 17:53:14 brianp Exp $ */ +/* $Id: colortab.c,v 1.7 1999/11/19 22:51:29 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -119,7 +119,7 @@ _mesa_ColorTableEXT( GLenum target, GLenum internalFormat, GET_CURRENT_CONTEXT(ctx); struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit]; struct gl_texture_object *texObj; - struct gl_palette *palette; + struct gl_color_table *palette; GLboolean proxy = GL_FALSE; ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glColorTableEXT"); @@ -216,7 +216,7 @@ _mesa_ColorSubTableEXT( GLenum target, GLsizei start, GET_CURRENT_CONTEXT(ctx); struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit]; struct gl_texture_object *texObj; - struct gl_palette *palette; + struct gl_color_table *palette; GLint comps; GLubyte *dest; @@ -290,7 +290,7 @@ _mesa_GetColorTableEXT( GLenum target, GLenum format, { GET_CURRENT_CONTEXT(ctx); struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit]; - struct gl_palette *palette; + struct gl_color_table *palette; GLubyte rgba[MAX_TEXTURE_PALETTE_SIZE][4]; GLint i; @@ -395,7 +395,7 @@ _mesa_GetColorTableParameterivEXT( GLenum target, GLenum pname, GLint *params ) { GET_CURRENT_CONTEXT(ctx); struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit]; - struct gl_palette *palette; + struct gl_color_table *palette; ASSERT_OUTSIDE_BEGIN_END(ctx, "glGetColorTableParameterEXT"); diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index e5ab604783..a7fbddcbdb 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -1,4 +1,4 @@ -/* $Id: context.c,v 1.21 1999/11/19 22:26:52 brianp Exp $ */ +/* $Id: context.c,v 1.22 1999/11/19 22:51:29 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -544,7 +544,7 @@ static void init_2d_map( struct gl_2d_map *map, int n, const float *initial ) } -static void init_palette( struct gl_palette *p ) +static void init_color_table( struct gl_color_table *p ) { p->Table[0] = 255; p->Table[1] = 255; @@ -883,7 +883,7 @@ static void initialize_context( GLcontext *ctx ) for (i=0; i<MAX_TEXTURE_UNITS; i++) init_texture_unit( ctx, i ); - init_palette(&ctx->Texture.Palette); + init_color_table(&ctx->Texture.Palette); /* Transformation group */ ctx->Transform.MatrixMode = GL_MODELVIEW; |