diff options
| author | Christian König <[email protected]> | 2011-03-03 00:59:12 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-03-03 00:59:12 +0100 |
| commit | 0eccb1038a620bc76ba45ac00c293b3e88427510 (patch) | |
| tree | 4bd9209ac6e9b824284d47799b13a99a401c6963 /src/mesa/main/pixel.c | |
| parent | ed12c29bc45b100b758c9affe2cebe8c8498e25e (diff) | |
| parent | 2e756f3d6f15d61297a3bb4efe6a88c29081a5eb (diff) | |
Merge remote branch 'origin/master' into pipe-video
Diffstat (limited to 'src/mesa/main/pixel.c')
| -rw-r--r-- | src/mesa/main/pixel.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/mesa/main/pixel.c b/src/mesa/main/pixel.c index 0254980b89d..195fa234be2 100644 --- a/src/mesa/main/pixel.c +++ b/src/mesa/main/pixel.c @@ -35,6 +35,7 @@ #include "macros.h" #include "mfeatures.h" #include "pixel.h" +#include "pbo.h" #include "mtypes.h" #include "main/dispatch.h" @@ -685,9 +686,6 @@ _mesa_init_pixel( struct gl_context *ctx ) init_pixelmap(&ctx->PixelMaps.GtoG); init_pixelmap(&ctx->PixelMaps.BtoB); init_pixelmap(&ctx->PixelMaps.AtoA); - /* GL_SGI_texture_color_table */ - ASSIGN_4V(ctx->Pixel.TextureColorTableScale, 1.0, 1.0, 1.0, 1.0); - ASSIGN_4V(ctx->Pixel.TextureColorTableBias, 0.0, 0.0, 0.0, 0.0); if (ctx->Visual.doubleBufferMode) { ctx->Pixel.ReadBuffer = GL_BACK; |