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

replaced _mesa_base_tex_format() with base_colortab_format()

This commit is contained in:
Brian Paul 2000-05-24 14:03:04 +00:00
parent 478beace47
commit 98b88b3e70
1 changed files with 61 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/mesa/main/colortab.c
View File

@ -1,4 +1,4 @@
/* $Id: colortab.c,v 1.17 2000/05/10 14:39:53 brianp Exp $ */
/* $Id: colortab.c,v 1.18 2000/05/24 14:03:04 brianp Exp $ */
/*
* Mesa 3-D graphics library
@ -36,11 +36,69 @@
#include "mem.h"
#include "mmath.h"
#include "span.h"
#include "teximage.h"
#endif
/*
* Given an internalFormat token passed to glColorTable,
* return the corresponding base format.
* Return -1 if invalid token.
*/
static GLint
base_colortab_format( GLenum format )
{
switch (format) {
case GL_ALPHA:
case GL_ALPHA4:
case GL_ALPHA8:
case GL_ALPHA12:
case GL_ALPHA16:
return GL_ALPHA;
case GL_LUMINANCE:
case GL_LUMINANCE4:
case GL_LUMINANCE8:
case GL_LUMINANCE12:
case GL_LUMINANCE16:
return GL_LUMINANCE;
case GL_LUMINANCE_ALPHA:
case GL_LUMINANCE4_ALPHA4:
case GL_LUMINANCE6_ALPHA2:
case GL_LUMINANCE8_ALPHA8:
case GL_LUMINANCE12_ALPHA4:
case GL_LUMINANCE12_ALPHA12:
case GL_LUMINANCE16_ALPHA16:
return GL_LUMINANCE_ALPHA;
case GL_INTENSITY:
case GL_INTENSITY4:
case GL_INTENSITY8:
case GL_INTENSITY12:
case GL_INTENSITY16:
return GL_INTENSITY;
case GL_RGB:
case GL_R3_G3_B2:
case GL_RGB4:
case GL_RGB5:
case GL_RGB8:
case GL_RGB10:
case GL_RGB12:
case GL_RGB16:
return GL_RGB;
case GL_RGBA:
case GL_RGBA2:
case GL_RGBA4:
case GL_RGB5_A1:
case GL_RGBA8:
case GL_RGB10_A2:
case GL_RGBA12:
case GL_RGBA16:
return GL_RGBA;
default:
return -1; /* error */
}
}
void
_mesa_init_colortable( struct gl_color_table *p )
{
@ -248,7 +306,7 @@ _mesa_ColorTable( GLenum target, GLenum internalFormat,
return;
}
baseFormat = _mesa_base_tex_format(internalFormat);
baseFormat = base_colortab_format(internalFormat);
if (baseFormat < 0 || baseFormat == GL_COLOR_INDEX) {
gl_error(ctx, GL_INVALID_ENUM, "glColorTable(internalFormat)");
return;