diff options
| author | Eric Anholt <eric@anholt.net> | 2010-09-09 16:25:17 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-09-23 13:25:45 -0700 |
| commit | 6c227e57e69158e4da40c69322db0eac4c31086c (patch) | |
| tree | fef7284f55ac2fe8f865674be3eade9c05edb00e /src/mesa/main/pixel.c | |
| parent | 7126e38d9037da66fd531c4cb02b3843b68b84ff (diff) | |
mesa: Remove SGI_color_table.
Another optional ARB_imaging subset extension.
Diffstat (limited to 'src/mesa/main/pixel.c')
| -rw-r--r-- | src/mesa/main/pixel.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/mesa/main/pixel.c b/src/mesa/main/pixel.c index 980c40550c..834a41108c 100644 --- a/src/mesa/main/pixel.c +++ b/src/mesa/main/pixel.c @@ -702,9 +702,6 @@ update_image_transfer_state(GLcontext *ctx) if (ctx->Pixel.MapColorFlag) mask |= IMAGE_MAP_COLOR_BIT; - if (ctx->Pixel.ColorTableEnabled[COLORTABLE_PRECONVOLUTION]) - mask |= IMAGE_COLOR_TABLE_BIT; - if (ctx->Pixel.Convolution1DEnabled || ctx->Pixel.Convolution2DEnabled || ctx->Pixel.Separable2DEnabled) { @@ -721,9 +718,6 @@ update_image_transfer_state(GLcontext *ctx) } } - if (ctx->Pixel.ColorTableEnabled[COLORTABLE_POSTCONVOLUTION]) - mask |= IMAGE_POST_CONVOLUTION_COLOR_TABLE_BIT; - if (ctx->ColorMatrixStack.Top->type != MATRIX_IDENTITY || ctx->Pixel.PostColorMatrixScale[0] != 1.0F || ctx->Pixel.PostColorMatrixBias[0] != 0.0F || @@ -735,9 +729,6 @@ update_image_transfer_state(GLcontext *ctx) ctx->Pixel.PostColorMatrixBias[3] != 0.0F) mask |= IMAGE_COLOR_MATRIX_BIT; - if (ctx->Pixel.ColorTableEnabled[COLORTABLE_POSTCOLORMATRIX]) - mask |= IMAGE_POST_COLOR_MATRIX_COLOR_TABLE_BIT; - ctx->_ImageTransferState = mask; } @@ -825,11 +816,6 @@ _mesa_init_pixel( GLcontext *ctx ) init_pixelmap(&ctx->PixelMaps.AtoA); ASSIGN_4V(ctx->Pixel.PostColorMatrixScale, 1.0, 1.0, 1.0, 1.0); ASSIGN_4V(ctx->Pixel.PostColorMatrixBias, 0.0, 0.0, 0.0, 0.0); - for (i = 0; i < COLORTABLE_MAX; i++) { - ASSIGN_4V(ctx->Pixel.ColorTableScale[i], 1.0, 1.0, 1.0, 1.0); - ASSIGN_4V(ctx->Pixel.ColorTableBias[i], 0.0, 0.0, 0.0, 0.0); - ctx->Pixel.ColorTableEnabled[i] = GL_FALSE; - } ctx->Pixel.Convolution1DEnabled = GL_FALSE; ctx->Pixel.Convolution2DEnabled = GL_FALSE; ctx->Pixel.Separable2DEnabled = GL_FALSE; |