-/* $Id: colortab.c,v 1.13 2000/04/12 00:27:37 brianp Exp $ */
+/* $Id: colortab.c,v 1.22 2000/10/28 18:34:48 brianp Exp $ */
/*
* Mesa 3-D graphics library
- * Version: 3.3
+ * Version: 3.5
*
* Copyright (C) 1999-2000 Brian Paul All Rights Reserved.
*
#include "context.h"
#include "image.h"
#include "macros.h"
+#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 )
+{
+ p->FloatTable = GL_FALSE;
+ /* allocate a width=1 table by default */
+ p->Table = CALLOC(4 * sizeof(GLchan));
+ if (p->Table) {
+ GLchan *t = (GLchan *) p->Table;
+ t[0] = CHAN_MAX;
+ t[1] = CHAN_MAX;
+ t[2] = CHAN_MAX;
+ t[3] = CHAN_MAX;
+ }
+ p->Size = 1;
+ p->IntFormat = GL_RGBA;
+ p->Format = GL_RGBA;
+ p->RedSize = CHAN_BITS;
+ p->GreenSize = CHAN_BITS;
+ p->BlueSize = CHAN_BITS;
+ p->AlphaSize = CHAN_BITS;
+ p->IntensitySize = 0;
+ p->LuminanceSize = 0;
+}
+
+
+
+void
+_mesa_free_colortable_data( struct gl_color_table *p )
+{
+ if (p->Table) {
+ FREE(p->Table);
+ p->Table = NULL;
+ }
+}
+
+
/*
* Examine table's format and set the component sizes accordingly.
*/
table->RedSize = 0;
table->GreenSize = 0;
table->BlueSize = 0;
- table->AlphaSize = 8;
+ table->AlphaSize = CHAN_BITS;
table->IntensitySize = 0;
table->LuminanceSize = 0;
break;
table->BlueSize = 0;
table->AlphaSize = 0;
table->IntensitySize = 0;
- table->LuminanceSize = 8;
+ table->LuminanceSize = CHAN_BITS;
break;
case GL_LUMINANCE_ALPHA:
table->RedSize = 0;
table->GreenSize = 0;
table->BlueSize = 0;
- table->AlphaSize = 8;
+ table->AlphaSize = CHAN_BITS;
table->IntensitySize = 0;
- table->LuminanceSize = 8;
+ table->LuminanceSize = CHAN_BITS;
break;
case GL_INTENSITY:
table->RedSize = 0;
table->GreenSize = 0;
table->BlueSize = 0;
table->AlphaSize = 0;
- table->IntensitySize = 8;
+ table->IntensitySize = CHAN_BITS;
table->LuminanceSize = 0;
break;
case GL_RGB:
- table->RedSize = 8;
- table->GreenSize = 8;
- table->BlueSize = 8;
+ table->RedSize = CHAN_BITS;
+ table->GreenSize = CHAN_BITS;
+ table->BlueSize = CHAN_BITS;
table->AlphaSize = 0;
table->IntensitySize = 0;
table->LuminanceSize = 0;
break;
case GL_RGBA:
- table->RedSize = 8;
- table->GreenSize = 8;
- table->BlueSize = 8;
- table->AlphaSize = 8;
+ table->RedSize = CHAN_BITS;
+ table->GreenSize = CHAN_BITS;
+ table->BlueSize = CHAN_BITS;
+ table->AlphaSize = CHAN_BITS;
table->IntensitySize = 0;
table->LuminanceSize = 0;
break;
GLint baseFormat;
GLfloat rScale = 1.0, gScale = 1.0, bScale = 1.0, aScale = 1.0;
GLfloat rBias = 0.0, gBias = 0.0, bBias = 0.0, aBias = 0.0;
+ GLboolean floatTable = GL_FALSE;
+ GLint comps;
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glColorTable");
break;
case GL_COLOR_TABLE:
table = &ctx->ColorTable;
+ floatTable = GL_TRUE;
rScale = ctx->Pixel.ColorTableScale[0];
gScale = ctx->Pixel.ColorTableScale[1];
bScale = ctx->Pixel.ColorTableScale[2];
break;
case GL_POST_CONVOLUTION_COLOR_TABLE:
table = &ctx->PostConvolutionColorTable;
+ floatTable = GL_TRUE;
rScale = ctx->Pixel.PCCTscale[0];
gScale = ctx->Pixel.PCCTscale[1];
bScale = ctx->Pixel.PCCTscale[2];
break;
case GL_POST_COLOR_MATRIX_COLOR_TABLE:
table = &ctx->PostColorMatrixColorTable;
+ floatTable = GL_TRUE;
rScale = ctx->Pixel.PCMCTscale[0];
gScale = ctx->Pixel.PCMCTscale[1];
bScale = ctx->Pixel.PCMCTscale[2];
assert(table);
- if (!_mesa_is_legal_format_and_type(format, type)) {
+ if (!_mesa_is_legal_format_and_type(format, type) ||
+ format == GL_INTENSITY) {
gl_error(ctx, GL_INVALID_ENUM, "glColorTable(format or type)");
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;
}
- if (width < 1 || width > MAX_COLOR_TABLE_SIZE
- || _mesa_bitcount(width) != 1) {
- if (width > MAX_COLOR_TABLE_SIZE)
- gl_error(ctx, GL_TABLE_TOO_LARGE, "glColorTable(width)");
- else
- gl_error(ctx, GL_INVALID_VALUE, "glColorTable(width)");
+ if (width < 0 || _mesa_bitcount(width) != 1) {
if (proxy) {
table->Size = 0;
table->IntFormat = (GLenum) 0;
table->Format = (GLenum) 0;
}
+ else {
+ gl_error(ctx, GL_INVALID_VALUE, "glColorTable(width)");
+ }
return;
}
+ if (width > ctx->Const.MaxColorTableSize) {
+ if (proxy) {
+ table->Size = 0;
+ table->IntFormat = (GLenum) 0;
+ table->Format = (GLenum) 0;
+ }
+ else {
+ if (width > ctx->Const.MaxColorTableSize)
+ gl_error(ctx, GL_TABLE_TOO_LARGE, "glColorTable(width)");
+ else
+ gl_error(ctx, GL_INVALID_VALUE, "glColorTable(width)");
+ }
+ return;
+ }
table->Size = width;
table->IntFormat = internalFormat;
table->Format = (GLenum) baseFormat;
set_component_sizes(table);
+ comps = _mesa_components_in_format(table->Format);
+ assert(comps > 0); /* error should have been caught sooner */
+
if (!proxy) {
- _mesa_unpack_ubyte_color_span(ctx, width, table->Format,
- table->Table, /* dest */
- format, type, data,
- &ctx->Unpack, GL_TRUE);
- if (rScale != 1.0 || gScale != 1.0 || bScale != 1.0 || aScale != 1.0 ||
- rBias != 0.0 || gBias != 0.0 || bBias != 0.0 || aBias != 0.0) {
- /* XXX apply scale and bias */
+ /* free old table, if any */
+ if (table->Table) {
+ FREE(table->Table);
+ }
+ if (floatTable) {
+ GLfloat tempTab[MAX_COLOR_TABLE_SIZE * 4];
+ GLfloat *tableF;
+ GLuint i;
+
+ _mesa_unpack_float_color_span(ctx, width, table->Format,
+ tempTab, /* dest */
+ format, type, data, &ctx->Unpack,
+ 0, GL_FALSE);
+
+ table->FloatTable = GL_TRUE;
+ table->Table = MALLOC(comps * width * sizeof(GLfloat));
+ if (!table->Table) {
+ gl_error(ctx, GL_OUT_OF_MEMORY, "glColorTable");
+ return;
+ }
+ tableF = (GLfloat *) table->Table;
+
+ switch (table->Format) {
+ case GL_INTENSITY:
+ for (i = 0; i < width; i++) {
+ tableF[i] = CLAMP(tempTab[i] * rScale + rBias, 0.0F, 1.0F);
+ }
+ break;
+ case GL_LUMINANCE:
+ for (i = 0; i < width; i++) {
+ tableF[i] = CLAMP(tempTab[i] * rScale + rBias, 0.0F, 1.0F);
+ }
+ break;
+ case GL_ALPHA:
+ for (i = 0; i < width; i++) {
+ tableF[i] = CLAMP(tempTab[i] * aScale + aBias, 0.0F, 1.0F);
+ }
+ break;
+ case GL_LUMINANCE_ALPHA:
+ for (i = 0; i < width; i++) {
+ tableF[i*2+0] = CLAMP(tempTab[i*2+0] * rScale + rBias, 0.0F, 1.0F);
+ tableF[i*2+1] = CLAMP(tempTab[i*2+1] * aScale + aBias, 0.0F, 1.0F);
+ }
+ break;
+ case GL_RGB:
+ for (i = 0; i < width; i++) {
+ tableF[i*3+0] = CLAMP(tempTab[i*3+0] * rScale + rBias, 0.0F, 1.0F);
+ tableF[i*3+1] = CLAMP(tempTab[i*3+1] * gScale + gBias, 0.0F, 1.0F);
+ tableF[i*3+2] = CLAMP(tempTab[i*3+2] * bScale + bBias, 0.0F, 1.0F);
+ }
+ break;
+ case GL_RGBA:
+ for (i = 0; i < width; i++) {
+ tableF[i*4+0] = CLAMP(tempTab[i*4+0] * rScale + rBias, 0.0F, 1.0F);
+ tableF[i*4+1] = CLAMP(tempTab[i*4+1] * gScale + gBias, 0.0F, 1.0F);
+ tableF[i*4+2] = CLAMP(tempTab[i*4+2] * bScale + bBias, 0.0F, 1.0F);
+ tableF[i*4+3] = CLAMP(tempTab[i*4+3] * aScale + aBias, 0.0F, 1.0F);
+ }
+ break;
+ default:
+ gl_problem(ctx, "Bad format in _mesa_ColorTable");
+ return;
+ }
}
- }
+ else {
+ /* store GLchan table */
+ table->FloatTable = GL_FALSE;
+ table->Table = MALLOC(comps * width * sizeof(GLchan));
+ if (!table->Table) {
+ gl_error(ctx, GL_OUT_OF_MEMORY, "glColorTable");
+ return;
+ }
+ _mesa_unpack_ubyte_color_span(ctx, width, table->Format,
+ table->Table, /* dest */
+ format, type, data,
+ &ctx->Unpack, 0);
+ } /* floatTable */
+ } /* proxy */
if (texObj || target == GL_SHARED_TEXTURE_PALETTE_EXT) {
/* texture object palette, texObj==NULL means the shared palette */
(*ctx->Driver.UpdateTexturePalette)( ctx, texObj );
}
}
-
}
struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
struct gl_texture_object *texObj = NULL;
struct gl_color_table *table = NULL;
+ GLfloat rScale = 1.0, gScale = 1.0, bScale = 1.0, aScale = 1.0;
+ GLfloat rBias = 0.0, gBias = 0.0, bBias = 0.0, aBias = 0.0;
GLint comps;
- GLubyte *dest;
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glColorSubTable");
break;
case GL_COLOR_TABLE:
table = &ctx->ColorTable;
+ rScale = ctx->Pixel.ColorTableScale[0];
+ gScale = ctx->Pixel.ColorTableScale[1];
+ bScale = ctx->Pixel.ColorTableScale[2];
+ aScale = ctx->Pixel.ColorTableScale[3];
+ rBias = ctx->Pixel.ColorTableBias[0];
+ gBias = ctx->Pixel.ColorTableBias[1];
+ bBias = ctx->Pixel.ColorTableBias[2];
+ aBias = ctx->Pixel.ColorTableBias[3];
break;
case GL_POST_CONVOLUTION_COLOR_TABLE:
table = &ctx->PostConvolutionColorTable;
+ rScale = ctx->Pixel.PCCTscale[0];
+ gScale = ctx->Pixel.PCCTscale[1];
+ bScale = ctx->Pixel.PCCTscale[2];
+ aScale = ctx->Pixel.PCCTscale[3];
+ rBias = ctx->Pixel.PCCTbias[0];
+ gBias = ctx->Pixel.PCCTbias[1];
+ bBias = ctx->Pixel.PCCTbias[2];
+ aBias = ctx->Pixel.PCCTbias[3];
break;
case GL_POST_COLOR_MATRIX_COLOR_TABLE:
table = &ctx->PostColorMatrixColorTable;
+ rScale = ctx->Pixel.PCMCTscale[0];
+ gScale = ctx->Pixel.PCMCTscale[1];
+ bScale = ctx->Pixel.PCMCTscale[2];
+ aScale = ctx->Pixel.PCMCTscale[3];
+ rBias = ctx->Pixel.PCMCTbias[0];
+ gBias = ctx->Pixel.PCMCTbias[1];
+ bBias = ctx->Pixel.PCMCTbias[2];
+ aBias = ctx->Pixel.PCMCTbias[3];
break;
default:
gl_error(ctx, GL_INVALID_ENUM, "glColorSubTable(target)");
assert(table);
- if (!_mesa_is_legal_format_and_type(format, type)) {
+ if (!_mesa_is_legal_format_and_type(format, type) ||
+ format == GL_INTENSITY) {
gl_error(ctx, GL_INVALID_ENUM, "glColorSubTable(format or type)");
return;
}
return;
}
- dest = table->Table + start * comps * sizeof(GLubyte);
- _mesa_unpack_ubyte_color_span(ctx, count, table->Format, dest,
- format, type, data,
- &ctx->Unpack, GL_TRUE);
+ if (!table->Table) {
+ gl_error(ctx, GL_OUT_OF_MEMORY, "glColorSubTable");
+ return;
+ }
+
+ if (!table->FloatTable) {
+ GLchan *dest = (GLchan *) table->Table + start * comps * sizeof(GLchan);
+ _mesa_unpack_ubyte_color_span(ctx, count, table->Format, dest,
+ format, type, data, &ctx->Unpack, 0);
+ }
+ else {
+ GLfloat tempTab[MAX_COLOR_TABLE_SIZE * 4];
+ GLfloat *tableF;
+ GLuint i;
+
+ ASSERT(table->FloatTable);
+
+ _mesa_unpack_float_color_span(ctx, count, table->Format,
+ tempTab, /* dest */
+ format, type, data, &ctx->Unpack,
+ 0, GL_FALSE);
+
+ tableF = (GLfloat *) table->Table;
+
+ switch (table->Format) {
+ case GL_INTENSITY:
+ for (i = 0; i < count; i++) {
+ GLuint j = start + i;
+ tableF[j] = CLAMP(tempTab[i] * rScale + rBias, 0.0F, 1.0F);
+ }
+ break;
+ case GL_LUMINANCE:
+ for (i = 0; i < count; i++) {
+ GLuint j = start + i;
+ tableF[j] = CLAMP(tempTab[i] * rScale + rBias, 0.0F, 1.0F);
+ }
+ break;
+ case GL_ALPHA:
+ for (i = 0; i < count; i++) {
+ GLuint j = start + i;
+ tableF[j] = CLAMP(tempTab[i] * aScale + aBias, 0.0F, 1.0F);
+ }
+ break;
+ case GL_LUMINANCE_ALPHA:
+ for (i = 0; i < count; i++) {
+ GLuint j = start + i;
+ tableF[j*2+0] = CLAMP(tempTab[i*2+0] * rScale + rBias, 0.0F, 1.0F);
+ tableF[j*2+1] = CLAMP(tempTab[i*2+1] * aScale + aBias, 0.0F, 1.0F);
+ }
+ break;
+ case GL_RGB:
+ for (i = 0; i < count; i++) {
+ GLuint j = start + i;
+ tableF[j*3+0] = CLAMP(tempTab[i*3+0] * rScale + rBias, 0.0F, 1.0F);
+ tableF[j*3+1] = CLAMP(tempTab[i*3+1] * gScale + gBias, 0.0F, 1.0F);
+ tableF[j*3+2] = CLAMP(tempTab[i*3+2] * bScale + bBias, 0.0F, 1.0F);
+ }
+ break;
+ case GL_RGBA:
+ for (i = 0; i < count; i++) {
+ GLuint j = start + i;
+ tableF[j*4+0] = CLAMP(tempTab[i*4+0] * rScale + rBias, 0.0F, 1.0F);
+ tableF[j*4+1] = CLAMP(tempTab[i*4+1] * gScale + gBias, 0.0F, 1.0F);
+ tableF[j*4+2] = CLAMP(tempTab[i*4+2] * bScale + bBias, 0.0F, 1.0F);
+ tableF[j*4+3] = CLAMP(tempTab[i*4+3] * aScale + aBias, 0.0F, 1.0F);
+ }
+ break;
+ default:
+ gl_problem(ctx, "Bad format in _mesa_ColorSubTable");
+ return;
+ }
+ }
if (texObj || target == GL_SHARED_TEXTURE_PALETTE_EXT) {
/* per-texture object palette */
_mesa_CopyColorTable(GLenum target, GLenum internalformat,
GLint x, GLint y, GLsizei width)
{
- GLubyte data[MAX_WIDTH][4];
+ GLchan data[MAX_WIDTH][4];
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glCopyColorTable");
_mesa_CopyColorSubTable(GLenum target, GLsizei start,
GLint x, GLint y, GLsizei width)
{
- GLubyte data[MAX_WIDTH][4];
+ GLchan data[MAX_WIDTH][4];
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glCopyColorSubTable");
GET_CURRENT_CONTEXT(ctx);
struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
struct gl_color_table *table = NULL;
- GLubyte rgba[MAX_COLOR_TABLE_SIZE][4];
+ GLchan rgba[MAX_COLOR_TABLE_SIZE][4];
GLint i;
ASSERT_OUTSIDE_BEGIN_END(ctx, "glGetColorTable");
switch (table->Format) {
case GL_ALPHA:
- for (i = 0; i < table->Size; i++) {
- rgba[i][RCOMP] = 0;
- rgba[i][GCOMP] = 0;
- rgba[i][BCOMP] = 0;
- rgba[i][ACOMP] = table->Table[i];
+ if (table->FloatTable) {
+ const GLfloat *tableF = (const GLfloat *) table->Table;
+ for (i = 0; i < table->Size; i++) {
+ rgba[i][RCOMP] = 0;
+ rgba[i][GCOMP] = 0;
+ rgba[i][BCOMP] = 0;
+ rgba[i][ACOMP] = (GLint) (tableF[i] * CHAN_MAXF);
+ }
+ }
+ else {
+ const GLchan *tableUB = (const GLchan *) table->Table;
+ for (i = 0; i < table->Size; i++) {
+ rgba[i][RCOMP] = 0;
+ rgba[i][GCOMP] = 0;
+ rgba[i][BCOMP] = 0;
+ rgba[i][ACOMP] = tableUB[i];
+ }
}
break;
case GL_LUMINANCE:
- for (i = 0; i < table->Size; i++) {
- rgba[i][RCOMP] = table->Table[i];
- rgba[i][GCOMP] = table->Table[i];
- rgba[i][BCOMP] = table->Table[i];
- rgba[i][ACOMP] = 255;
+ if (table->FloatTable) {
+ const GLfloat *tableF = (const GLfloat *) table->Table;
+ for (i = 0; i < table->Size; i++) {
+ rgba[i][RCOMP] = (GLint) (tableF[i] * CHAN_MAXF);
+ rgba[i][GCOMP] = (GLint) (tableF[i] * CHAN_MAXF);
+ rgba[i][BCOMP] = (GLint) (tableF[i] * CHAN_MAXF);
+ rgba[i][ACOMP] = CHAN_MAX;
+ }
+ }
+ else {
+ const GLchan *tableUB = (const GLchan *) table->Table;
+ for (i = 0; i < table->Size; i++) {
+ rgba[i][RCOMP] = tableUB[i];
+ rgba[i][GCOMP] = tableUB[i];
+ rgba[i][BCOMP] = tableUB[i];
+ rgba[i][ACOMP] = CHAN_MAX;
+ }
}
break;
case GL_LUMINANCE_ALPHA:
- for (i = 0; i < table->Size; i++) {
- rgba[i][RCOMP] = table->Table[i*2+0];
- rgba[i][GCOMP] = table->Table[i*2+0];
- rgba[i][BCOMP] = table->Table[i*2+0];
- rgba[i][ACOMP] = table->Table[i*2+1];
+ if (table->FloatTable) {
+ const GLfloat *tableF = (const GLfloat *) table->Table;
+ for (i = 0; i < table->Size; i++) {
+ rgba[i][RCOMP] = (GLint) (tableF[i*2+0] * CHAN_MAXF);
+ rgba[i][GCOMP] = (GLint) (tableF[i*2+0] * CHAN_MAXF);
+ rgba[i][BCOMP] = (GLint) (tableF[i*2+0] * CHAN_MAXF);
+ rgba[i][ACOMP] = (GLint) (tableF[i*2+1] * CHAN_MAXF);
+ }
+ }
+ else {
+ const GLchan *tableUB = (const GLchan *) table->Table;
+ for (i = 0; i < table->Size; i++) {
+ rgba[i][RCOMP] = tableUB[i*2+0];
+ rgba[i][GCOMP] = tableUB[i*2+0];
+ rgba[i][BCOMP] = tableUB[i*2+0];
+ rgba[i][ACOMP] = tableUB[i*2+1];
+ }
}
break;
case GL_INTENSITY:
- for (i = 0; i < table->Size; i++) {
- rgba[i][RCOMP] = table->Table[i];
- rgba[i][GCOMP] = table->Table[i];
- rgba[i][BCOMP] = table->Table[i];
- rgba[i][ACOMP] = 255;
+ if (table->FloatTable) {
+ const GLfloat *tableF = (const GLfloat *) table->Table;
+ for (i = 0; i < table->Size; i++) {
+ rgba[i][RCOMP] = (GLint) (tableF[i] * CHAN_MAXF);
+ rgba[i][GCOMP] = (GLint) (tableF[i] * CHAN_MAXF);
+ rgba[i][BCOMP] = (GLint) (tableF[i] * CHAN_MAXF);
+ rgba[i][ACOMP] = (GLint) (tableF[i] * CHAN_MAXF);
+ }
+ }
+ else {
+ const GLchan *tableUB = (const GLchan *) table->Table;
+ for (i = 0; i < table->Size; i++) {
+ rgba[i][RCOMP] = tableUB[i];
+ rgba[i][GCOMP] = tableUB[i];
+ rgba[i][BCOMP] = tableUB[i];
+ rgba[i][ACOMP] = tableUB[i];
+ }
}
break;
case GL_RGB:
- for (i = 0; i < table->Size; i++) {
- rgba[i][RCOMP] = table->Table[i*3+0];
- rgba[i][GCOMP] = table->Table[i*3+1];
- rgba[i][BCOMP] = table->Table[i*3+2];
- rgba[i][ACOMP] = 255;
+ if (table->FloatTable) {
+ const GLfloat *tableF = (const GLfloat *) table->Table;
+ for (i = 0; i < table->Size; i++) {
+ rgba[i][RCOMP] = (GLint) (tableF[i*3+0] * CHAN_MAXF);
+ rgba[i][GCOMP] = (GLint) (tableF[i*3+1] * CHAN_MAXF);
+ rgba[i][BCOMP] = (GLint) (tableF[i*3+2] * CHAN_MAXF);
+ rgba[i][ACOMP] = CHAN_MAX;
+ }
+ }
+ else {
+ const GLchan *tableUB = (const GLchan *) table->Table;
+ for (i = 0; i < table->Size; i++) {
+ rgba[i][RCOMP] = tableUB[i*3+0];
+ rgba[i][GCOMP] = tableUB[i*3+1];
+ rgba[i][BCOMP] = tableUB[i*3+2];
+ rgba[i][ACOMP] = CHAN_MAX;
+ }
}
break;
case GL_RGBA:
- for (i = 0; i < table->Size; i++) {
- rgba[i][RCOMP] = table->Table[i*4+0];
- rgba[i][GCOMP] = table->Table[i*4+1];
- rgba[i][BCOMP] = table->Table[i*4+2];
- rgba[i][ACOMP] = table->Table[i*4+3];
+ if (table->FloatTable) {
+ const GLfloat *tableF = (const GLfloat *) table->Table;
+ for (i = 0; i < table->Size; i++) {
+ rgba[i][RCOMP] = (GLint) (tableF[i*4+0] * CHAN_MAXF + 0.5F);
+ rgba[i][GCOMP] = (GLint) (tableF[i*4+1] * CHAN_MAXF + 0.5F);
+ rgba[i][BCOMP] = (GLint) (tableF[i*4+2] * CHAN_MAXF + 0.5F);
+ rgba[i][ACOMP] = (GLint) (tableF[i*4+3] * CHAN_MAXF + 0.5F);
+ }
+ }
+ else {
+ const GLchan *tableUB = (const GLchan *) table->Table;
+ for (i = 0; i < table->Size; i++) {
+ rgba[i][RCOMP] = tableUB[i*4+0];
+ rgba[i][GCOMP] = tableUB[i*4+1];
+ rgba[i][BCOMP] = tableUB[i*4+2];
+ rgba[i][ACOMP] = tableUB[i*4+3];
+ }
}
break;
default:
return;
}
- _mesa_pack_rgba_span(ctx, table->Size, (const GLubyte (*)[]) rgba,
+ _mesa_pack_rgba_span(ctx, table->Size, (const GLchan (*)[]) rgba,
format, type, data, &ctx->Pack, GL_FALSE);
}
projects / mesa.git / blobdiff