diff options
| author | Brian Paul <[email protected]> | 2006-10-13 00:44:31 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2006-10-13 00:44:31 +0000 |
| commit | e5a6fcc345867b550a159a7d94912a81e618279c (patch) | |
| tree | dac93f846c871972ebc71269baa85f97e335f573 /src/mesa/drivers | |
| parent | e392c92250bf91c7aaaeb78e7ec598f86f2a1d6d (diff) | |
Revamp color table code.
Always store all color tables as both float and ubyte.
Diffstat (limited to 'src/mesa/drivers')
| -rw-r--r-- | src/mesa/drivers/dri/tdfx/tdfx_tex.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/unichrome/via_state.c | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/mesa/drivers/dri/tdfx/tdfx_tex.c b/src/mesa/drivers/dri/tdfx/tdfx_tex.c index f6793458720..aefd1dd5513 100644 --- a/src/mesa/drivers/dri/tdfx/tdfx_tex.c +++ b/src/mesa/drivers/dri/tdfx/tdfx_tex.c @@ -594,13 +594,11 @@ tdfxIsTextureResident(GLcontext *ctx, struct gl_texture_object *tObj) static GrTexTable_t convertPalette(FxU32 data[256], const struct gl_color_table *table) { - const GLubyte *tableUB = (const GLubyte *) table->Table; + const GLubyte *tableUB = table->TableUB; GLint width = table->Size; FxU32 r, g, b, a; GLint i; - ASSERT(table->Type == GL_UNSIGNED_BYTE); - switch (table->_BaseFormat) { case GL_INTENSITY: for (i = 0; i < width; i++) { diff --git a/src/mesa/drivers/dri/unichrome/via_state.c b/src/mesa/drivers/dri/unichrome/via_state.c index 6a2a99df3bc..e17442e9e61 100644 --- a/src/mesa/drivers/dri/unichrome/via_state.c +++ b/src/mesa/drivers/dri/unichrome/via_state.c @@ -328,8 +328,8 @@ void viaEmitState(struct via_context *vmesa) /* KW: This test never succeeds: */ if (t->regTexFM == HC_HTXnFM_Index8) { - struct gl_color_table *table = &texObj->Palette; - GLfloat *tableF = (GLfloat *)table->Table; + const struct gl_color_table *table = &texObj->Palette; + const GLfloat *tableF = table->TableF; BEGIN_RING(2 + table->Size); OUT_RING( HC_HEADER2 ); @@ -453,8 +453,8 @@ void viaEmitState(struct via_context *vmesa) /* KW: This test never succeeds: */ if (t->regTexFM == HC_HTXnFM_Index8) { - struct gl_color_table *table = &texObj->Palette; - GLfloat *tableF = (GLfloat *)table->Table; + const struct gl_color_table *table = &texObj->Palette; + const GLfloat *tableF = table->TableF; BEGIN_RING(2 + table->Size); OUT_RING( HC_HEADER2 ); |