renamed struct gl_palette as struct gl_color_table
This commit is contained in:
parent
7fb54ae3b3
commit
f0dee6578a
|
@ -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");
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue