Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/docs/relnotes.html
	mesalib/scons/gallium.py
	mesalib/src/mesa/drivers/common/driverfuncs.c
	mesalib/src/mesa/main/colortab.c
	mesalib/src/mesa/main/dd.h
	mesalib/src/mesa/main/enable.c
	mesalib/src/mesa/main/formats.c
	mesalib/src/mesa/main/framebuffer.c
	mesalib/src/mesa/main/get.c
	mesalib/src/mesa/main/mtypes.h
	mesalib/src/mesa/main/pack.c
	mesalib/src/mesa/main/texgetimage.c
	mesalib/src/mesa/main/teximage.c
	mesalib/src/mesa/main/texobj.c
	mesalib/src/mesa/main/texparam.c
	mesalib/src/mesa/main/texstate.c
	mesalib/src/mesa/swrast/s_drawpix.c
	mesalib/src/mesa/vbo/vbo_attrib_tmp.h

22 files changed, 735 insertions, 1851 deletions

diff --git a/mesalib/src/mesa/main/colortab.c b/mesalib/src/mesa/main/colortab.c
index 6f01b6c51..5b12f9ff3 100644
--- a/mesalib/src/mesa/main/colortab.c
+++ b/mesalib/src/mesa/main/colortab.c
@@ -41,361 +41,14 @@
 

 #if FEATURE_colortable

 

-

-/**

- * 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 */

-   }

-}

-

-

-

-/**

- * Examine table's format and set the component sizes accordingly.

- */

-static void

-set_component_sizes( struct gl_color_table *table )

-{

-   /* assuming the ubyte table */

-   const GLubyte sz = 8;

-

-   switch (table->_BaseFormat) {

-      case GL_ALPHA:

-         table->RedSize = 0;

-         table->GreenSize = 0;

-         table->BlueSize = 0;

-         table->AlphaSize = sz;

-         table->IntensitySize = 0;

-         table->LuminanceSize = 0;

-         break;

-      case GL_LUMINANCE:

-         table->RedSize = 0;

-         table->GreenSize = 0;

-         table->BlueSize = 0;

-         table->AlphaSize = 0;

-         table->IntensitySize = 0;

-         table->LuminanceSize = sz;

-         break;

-      case GL_LUMINANCE_ALPHA:

-         table->RedSize = 0;

-         table->GreenSize = 0;

-         table->BlueSize = 0;

-         table->AlphaSize = sz;

-         table->IntensitySize = 0;

-         table->LuminanceSize = sz;

-         break;

-      case GL_INTENSITY:

-         table->RedSize = 0;

-         table->GreenSize = 0;

-         table->BlueSize = 0;

-         table->AlphaSize = 0;

-         table->IntensitySize = sz;

-         table->LuminanceSize = 0;

-         break;

-      case GL_RGB:

-         table->RedSize = sz;

-         table->GreenSize = sz;

-         table->BlueSize = sz;

-         table->AlphaSize = 0;

-         table->IntensitySize = 0;

-         table->LuminanceSize = 0;

-         break;

-      case GL_RGBA:

-         table->RedSize = sz;

-         table->GreenSize = sz;

-         table->BlueSize = sz;

-         table->AlphaSize = sz;

-         table->IntensitySize = 0;

-         table->LuminanceSize = 0;

-         break;

-      default:

-         _mesa_problem(NULL, "unexpected format in set_component_sizes");

-   }

-}

-

-

-

-/**

- * Update/replace all or part of a color table.  Helper function

- * used by _mesa_ColorTable() and _mesa_ColorSubTable().

- * The table->Table buffer should already be allocated.

- * \param start first entry to update

- * \param count number of entries to update

- * \param format format of user-provided table data

- * \param type datatype of user-provided table data

- * \param data user-provided table data

- * \param [rgba]Scale - RGBA scale factors

- * \param [rgba]Bias - RGBA bias factors

- */

-static void

-store_colortable_entries(struct gl_context *ctx, struct gl_color_table *table,

-			 GLsizei start, GLsizei count,

-			 GLenum format, GLenum type, const GLvoid *data,

-			 GLfloat rScale, GLfloat rBias,

-			 GLfloat gScale, GLfloat gBias,

-			 GLfloat bScale, GLfloat bBias,

-			 GLfloat aScale, GLfloat aBias)

-{

-   data = _mesa_map_validate_pbo_source(ctx, 

-                                        1, &ctx->Unpack, count, 1, 1,

-                                        format, type, INT_MAX, data,

-                                        "glColor[Sub]Table");

-   if (!data)

-      return;

-

-   {

-      /* convert user-provided data to GLfloat values */

-      GLfloat tempTab[MAX_COLOR_TABLE_SIZE * 4];

-      GLfloat *tableF;

-      GLint i;

-

-      _mesa_unpack_color_span_float(ctx,

-                                    count,         /* number of pixels */

-                                    table->_BaseFormat, /* dest format */

-                                    tempTab,       /* dest address */

-                                    format, type,  /* src format/type */

-                                    data,          /* src data */

-                                    &ctx->Unpack,

-                                    IMAGE_CLAMP_BIT); /* transfer ops */

-

-      /* the destination */

-      tableF = table->TableF;

-

-      /* Apply scale & bias & clamp now */

-      switch (table->_BaseFormat) {

-         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:

-            _mesa_problem(ctx, "Bad format in store_colortable_entries");

-            return;

-         }

-   }

-

-   /* update the ubyte table */

-   {

-      const GLint comps = _mesa_components_in_format(table->_BaseFormat);

-      const GLfloat *tableF = table->TableF + start * comps;

-      GLubyte *tableUB = table->TableUB + start * comps;

-      GLint i;

-      for (i = 0; i < count * comps; i++) {

-         CLAMPED_FLOAT_TO_UBYTE(tableUB[i], tableF[i]);

-      }

-   }

-

-   _mesa_unmap_pbo_source(ctx, &ctx->Unpack);

-}

-

-

-

 void GLAPIENTRY

 _mesa_ColorTable( GLenum target, GLenum internalFormat,

                   GLsizei width, GLenum format, GLenum type,

                   const GLvoid *data )

 {

-   static const GLfloat one[4] = { 1.0, 1.0, 1.0, 1.0 };

-   static const GLfloat zero[4] = { 0.0, 0.0, 0.0, 0.0 };

    GET_CURRENT_CONTEXT(ctx);

-   struct gl_texture_unit *texUnit = _mesa_get_current_tex_unit(ctx);

-   struct gl_texture_object *texObj = NULL;

-   struct gl_color_table *table = NULL;

-   GLboolean proxy = GL_FALSE;

-   GLint baseFormat;

-   const GLfloat *scale = one, *bias = zero;

-   GLint comps;

-

-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); /* too complex */

-

-   switch (target) {

-      case GL_SHARED_TEXTURE_PALETTE_EXT:

-         table = &ctx->Texture.Palette;

-         break;

-      default:

-         /* try texture targets */

-         {

-            struct gl_texture_object *texobj

-               = _mesa_select_tex_object(ctx, texUnit, target);

-            if (texobj) {

-               table = &texobj->Palette;

-               proxy = _mesa_is_proxy_texture(target);

-            }

-            else {

-               _mesa_error(ctx, GL_INVALID_ENUM, "glColorTable(target)");

-               return;

-            }

-         }

-   }

-

-   assert(table);

-

-   if (!_mesa_is_legal_format_and_type(ctx, format, type) ||

-       format == GL_INTENSITY) {

-      _mesa_error(ctx, GL_INVALID_OPERATION, "glColorTable(format or type)");

-      return;

-   }

-

-   baseFormat = base_colortab_format(internalFormat);

-   if (baseFormat < 0) {

-      _mesa_error(ctx, GL_INVALID_ENUM, "glColorTable(internalFormat)");

-      return;

-   }

-

-   if (width < 0 || (width != 0 && !_mesa_is_pow_two(width))) {

-      /* error */

-      if (proxy) {

-         table->Size = 0;

-         table->InternalFormat = (GLenum) 0;

-         table->_BaseFormat = (GLenum) 0;

-      }

-      else {

-         _mesa_error(ctx, GL_INVALID_VALUE, "glColorTable(width=%d)", width);

-      }

-      return;

-   }

-

-   if (width > (GLsizei) ctx->Const.MaxColorTableSize) {

-      if (proxy) {

-         table->Size = 0;

-         table->InternalFormat = (GLenum) 0;

-         table->_BaseFormat = (GLenum) 0;

-      }

-      else {

-         _mesa_error(ctx, GL_TABLE_TOO_LARGE, "glColorTable(width)");

-      }

-      return;

-   }

-

-   table->Size = width;

-   table->InternalFormat = internalFormat;

-   table->_BaseFormat = (GLenum) baseFormat;

-

-   comps = _mesa_components_in_format(table->_BaseFormat);

-   assert(comps > 0);  /* error should have been caught sooner */

-

-   if (!proxy) {

-      _mesa_free_colortable_data(table);

-

-      if (width > 0) {

-         table->TableF = (GLfloat *) malloc(comps * width * sizeof(GLfloat));

-         table->TableUB = (GLubyte *) malloc(comps * width * sizeof(GLubyte));

-

-	 if (!table->TableF || !table->TableUB) {

-	    _mesa_error(ctx, GL_OUT_OF_MEMORY, "glColorTable");

-	    return;

-	 }

-

-	 store_colortable_entries(ctx, table,

-				  0, width,  /* start, count */

-				  format, type, data,

-				  scale[0], bias[0],

-				  scale[1], bias[1],

-				  scale[2], bias[2],

-				  scale[3], bias[3]);

-      }

-   } /* proxy */

-

-   /* do this after the table's Type and Format are set */

-   set_component_sizes(table);

-

-   if (texObj || target == GL_SHARED_TEXTURE_PALETTE_EXT) {

-      /* texture object palette, texObj==NULL means the shared palette */

-      if (ctx->Driver.UpdateTexturePalette) {

-         (*ctx->Driver.UpdateTexturePalette)( ctx, texObj );

-      }

-   }

-

-   ctx->NewState |= _NEW_PIXEL;

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+   _mesa_error(ctx, GL_INVALID_ENUM, "glColorTable(target)");

 }

 

 

@@ -405,73 +58,9 @@ _mesa_ColorSubTable( GLenum target, GLsizei start,
                      GLsizei count, GLenum format, GLenum type,

                      const GLvoid *data )

 {

-   static const GLfloat one[4] = { 1.0, 1.0, 1.0, 1.0 };

-   static const GLfloat zero[4] = { 0.0, 0.0, 0.0, 0.0 };

    GET_CURRENT_CONTEXT(ctx);

-   struct gl_texture_unit *texUnit = _mesa_get_current_tex_unit(ctx);

-   struct gl_texture_object *texObj = NULL;

-   struct gl_color_table *table = NULL;

-   const GLfloat *scale = one, *bias = zero;

-

    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

-

-   switch (target) {

-      case GL_SHARED_TEXTURE_PALETTE_EXT:

-         table = &ctx->Texture.Palette;

-         break;

-      default:

-         /* try texture targets */

-         texObj = _mesa_select_tex_object(ctx, texUnit, target);

-         if (texObj && !_mesa_is_proxy_texture(target)) {

-            table = &texObj->Palette;

-         }

-         else {

-            _mesa_error(ctx, GL_INVALID_ENUM, "glColorSubTable(target)");

-            return;

-         }

-   }

-

-   assert(table);

-

-   if (!_mesa_is_legal_format_and_type(ctx, format, type) ||

-       format == GL_INTENSITY) {

-      _mesa_error(ctx, GL_INVALID_OPERATION, "glColorSubTable(format or type)");

-      return;

-   }

-

-   if (count < 1) {

-      _mesa_error(ctx, GL_INVALID_VALUE, "glColorSubTable(count)");

-      return;

-   }

-

-   /* error should have been caught sooner */

-   assert(_mesa_components_in_format(table->_BaseFormat) > 0);

-

-   if (start + count > (GLint) table->Size) {

-      _mesa_error(ctx, GL_INVALID_VALUE, "glColorSubTable(count)");

-      return;

-   }

-

-   if (!table->TableF || !table->TableUB) {

-      /* a GL_OUT_OF_MEMORY error would have been recorded previously */

-      return;

-   }

-

-   store_colortable_entries(ctx, table, start, count,

-			    format, type, data,

-                            scale[0], bias[0],

-                            scale[1], bias[1],

-                            scale[2], bias[2],

-                            scale[3], bias[3]);

-

-   if (texObj || target == GL_SHARED_TEXTURE_PALETTE_EXT) {

-      /* per-texture object palette */

-      if (ctx->Driver.UpdateTexturePalette) {

-         (*ctx->Driver.UpdateTexturePalette)( ctx, texObj );

-      }

-   }

-

-   ctx->NewState |= _NEW_PIXEL;

+   _mesa_error(ctx, GL_INVALID_ENUM, "glColorSubTable(target)");

 }

 

 

@@ -482,12 +71,7 @@ _mesa_CopyColorTable(GLenum target, GLenum internalformat,
 {

    GET_CURRENT_CONTEXT(ctx);

    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

-

-   if (!ctx->ReadBuffer->_ColorReadBuffer) {

-      return;      /* no readbuffer - OK */

-   }

-

-   ctx->Driver.CopyColorTable( ctx, target, internalformat, x, y, width );

+   _mesa_error(ctx, GL_INVALID_ENUM, "glCopyColorTable(target)");

 }

 

 

@@ -498,12 +82,7 @@ _mesa_CopyColorSubTable(GLenum target, GLsizei start,
 {

    GET_CURRENT_CONTEXT(ctx);

    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

-

-   if (!ctx->ReadBuffer->_ColorReadBuffer) {

-      return;      /* no readbuffer - OK */

-   }

-

-   ctx->Driver.CopyColorSubTable( ctx, target, start, x, y, width );

+   _mesa_error(ctx, GL_INVALID_ENUM, "glCopyColorSubTable(target)");

 }

 

 

@@ -513,120 +92,8 @@ _mesa_GetnColorTableARB( GLenum target, GLenum format, GLenum type,
                          GLsizei bufSize, GLvoid *data )

 {

    GET_CURRENT_CONTEXT(ctx);

-   struct gl_texture_unit *texUnit = _mesa_get_current_tex_unit(ctx);

-   struct gl_color_table *table = NULL;

-   GLfloat rgba[MAX_COLOR_TABLE_SIZE][4];

-   GLbitfield transferOps = 0;

    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

-

-   if (ctx->NewState) {

-      _mesa_update_state(ctx);

-   }

-

-   switch (target) {

-      case GL_SHARED_TEXTURE_PALETTE_EXT:

-         table = &ctx->Texture.Palette;

-         break;

-      default:

-         /* try texture targets */

-         {

-            struct gl_texture_object *texobj

-               = _mesa_select_tex_object(ctx, texUnit, target);

-            if (texobj && !_mesa_is_proxy_texture(target)) {

-               table = &texobj->Palette;

-            }

-            else {

-               _mesa_error(ctx, GL_INVALID_ENUM, "glGetColorTable(target)");

-               return;

-            }

-         }

-   }

-

-   ASSERT(table);

-

-   if (table->Size <= 0) {

-      return;

-   }

-

-   switch (table->_BaseFormat) {

-   case GL_ALPHA:

-      {

-         GLuint i;

-         for (i = 0; i < table->Size; i++) {

-            rgba[i][RCOMP] = 0;

-            rgba[i][GCOMP] = 0;

-            rgba[i][BCOMP] = 0;

-            rgba[i][ACOMP] = table->TableF[i];

-         }

-      }

-      break;

-   case GL_LUMINANCE:

-      {

-         GLuint i;

-         for (i = 0; i < table->Size; i++) {

-            rgba[i][RCOMP] =

-            rgba[i][GCOMP] =

-            rgba[i][BCOMP] = table->TableF[i];

-            rgba[i][ACOMP] = 1.0F;

-         }

-      }

-      break;

-   case GL_LUMINANCE_ALPHA:

-      {

-         GLuint i;

-         for (i = 0; i < table->Size; i++) {

-            rgba[i][RCOMP] =

-            rgba[i][GCOMP] =

-            rgba[i][BCOMP] = table->TableF[i*2+0];

-            rgba[i][ACOMP] = table->TableF[i*2+1];

-         }

-      }

-      break;

-   case GL_INTENSITY:

-      {

-         GLuint i;

-         for (i = 0; i < table->Size; i++) {

-            rgba[i][RCOMP] =

-            rgba[i][GCOMP] =

-            rgba[i][BCOMP] =

-            rgba[i][ACOMP] = table->TableF[i];

-         }

-      }

-      break;

-   case GL_RGB:

-      {

-         GLuint i;

-         for (i = 0; i < table->Size; i++) {

-            rgba[i][RCOMP] = table->TableF[i*3+0];

-            rgba[i][GCOMP] = table->TableF[i*3+1];

-            rgba[i][BCOMP] = table->TableF[i*3+2];

-            rgba[i][ACOMP] = 1.0F;

-         }

-      }

-      break;

-   case GL_RGBA:

-      memcpy(rgba, table->TableF, 4 * table->Size * sizeof(GLfloat));

-      break;

-   default:

-      _mesa_problem(ctx, "bad table format in glGetColorTable");

-      return;

-   }

-

-   data = _mesa_map_validate_pbo_dest(ctx, 

-                                      1, &ctx->Pack, table->Size, 1, 1,

-                                      format, type, bufSize, data,

-                                      "glGetColorTable");

-   if (!data)

-      return;

-

-   /* TODO: is this correct? */

-   if(ctx->Color._ClampReadColor)

-      transferOps |= IMAGE_CLAMP_BIT;

-

-   _mesa_pack_rgba_span_float(ctx, table->Size, rgba,

-                              format, type, data, &ctx->Pack, transferOps);

-

-   _mesa_unmap_pbo_dest(ctx, &ctx->Pack);

+   _mesa_error(ctx, GL_INVALID_ENUM, "glGetnColorTableARB(target)");

 }

 

 

@@ -634,7 +101,9 @@ static void GLAPIENTRY
 _mesa_GetColorTable( GLenum target, GLenum format,

                      GLenum type, GLvoid *data )

 {

-   _mesa_GetnColorTableARB(target, format, type, INT_MAX, data);

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+   _mesa_error(ctx, GL_INVALID_ENUM, "glGetColorTable(target)");

 }

 

 

@@ -664,61 +133,8 @@ static void GLAPIENTRY
 _mesa_GetColorTableParameterfv( GLenum target, GLenum pname, GLfloat *params )

 {

    GET_CURRENT_CONTEXT(ctx);

-   struct gl_texture_unit *texUnit = _mesa_get_current_tex_unit(ctx);

-   struct gl_color_table *table = NULL;

    ASSERT_OUTSIDE_BEGIN_END(ctx);

-

-   switch (target) {

-      case GL_SHARED_TEXTURE_PALETTE_EXT:

-         table = &ctx->Texture.Palette;

-         break;

-      default:

-         /* try texture targets */

-         {

-            struct gl_texture_object *texobj

-               = _mesa_select_tex_object(ctx, texUnit, target);

-            if (texobj) {

-               table = &texobj->Palette;

-            }

-            else {

-               _mesa_error(ctx, GL_INVALID_ENUM,

-                           "glGetColorTableParameterfv(target)");

-               return;

-            }

-         }

-   }

-

-   assert(table);

-

-   switch (pname) {

-      case GL_COLOR_TABLE_FORMAT:

-         *params = (GLfloat) table->InternalFormat;

-         break;

-      case GL_COLOR_TABLE_WIDTH:

-         *params = (GLfloat) table->Size;

-         break;

-      case GL_COLOR_TABLE_RED_SIZE:

-         *params = (GLfloat) table->RedSize;

-         break;

-      case GL_COLOR_TABLE_GREEN_SIZE:

-         *params = (GLfloat) table->GreenSize;

-         break;

-      case GL_COLOR_TABLE_BLUE_SIZE:

-         *params = (GLfloat) table->BlueSize;

-         break;

-      case GL_COLOR_TABLE_ALPHA_SIZE:

-         *params = (GLfloat) table->AlphaSize;

-         break;

-      case GL_COLOR_TABLE_LUMINANCE_SIZE:

-         *params = (GLfloat) table->LuminanceSize;

-         break;

-      case GL_COLOR_TABLE_INTENSITY_SIZE:

-         *params = (GLfloat) table->IntensitySize;

-         break;

-      default:

-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetColorTableParameterfv(pname)" );

-         return;

-   }

+   _mesa_error(ctx, GL_INVALID_ENUM, "glGetColorTableParameterfv(target)");

 }

 

 

@@ -727,61 +143,8 @@ static void GLAPIENTRY
 _mesa_GetColorTableParameteriv( GLenum target, GLenum pname, GLint *params )

 {

    GET_CURRENT_CONTEXT(ctx);

-   struct gl_texture_unit *texUnit = _mesa_get_current_tex_unit(ctx);

-   struct gl_color_table *table = NULL;

    ASSERT_OUTSIDE_BEGIN_END(ctx);

-

-   switch (target) {

-      case GL_SHARED_TEXTURE_PALETTE_EXT:

-         table = &ctx->Texture.Palette;

-         break;

-      default:

-         /* Try texture targets */

-         {

-            struct gl_texture_object *texobj

-               = _mesa_select_tex_object(ctx, texUnit, target);

-            if (texobj) {

-               table = &texobj->Palette;

-            }

-            else {

-               _mesa_error(ctx, GL_INVALID_ENUM,

-                           "glGetColorTableParameteriv(target)");

-               return;

-            }

-         }

-   }

-

-   assert(table);

-

-   switch (pname) {

-      case GL_COLOR_TABLE_FORMAT:

-         *params = table->InternalFormat;

-         break;

-      case GL_COLOR_TABLE_WIDTH:

-         *params = table->Size;

-         break;

-      case GL_COLOR_TABLE_RED_SIZE:

-         *params = table->RedSize;

-         break;

-      case GL_COLOR_TABLE_GREEN_SIZE:

-         *params = table->GreenSize;

-         break;

-      case GL_COLOR_TABLE_BLUE_SIZE:

-         *params = table->BlueSize;

-         break;

-      case GL_COLOR_TABLE_ALPHA_SIZE:

-         *params = table->AlphaSize;

-         break;

-      case GL_COLOR_TABLE_LUMINANCE_SIZE:

-         *params = table->LuminanceSize;

-         break;

-      case GL_COLOR_TABLE_INTENSITY_SIZE:

-         *params = table->IntensitySize;

-         break;

-      default:

-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetColorTableParameteriv(pname)" );

-         return;

-   }

+   _mesa_error(ctx, GL_INVALID_ENUM, "glGetColorTableParameteriv(target)");

 }

 

 

@@ -804,33 +167,3 @@ _mesa_init_colortable_dispatch(struct _glapi_table *disp)
 

 

 #endif /* FEATURE_colortable */

-

-

-/**********************************************************************/

-/*****                      Initialization                        *****/

-/**********************************************************************/

-

-

-void

-_mesa_init_colortable( struct gl_color_table *p )

-{

-   p->TableF = NULL;

-   p->TableUB = NULL;

-   p->Size = 0;

-   p->InternalFormat = GL_RGBA;

-}

-

-

-

-void

-_mesa_free_colortable_data( struct gl_color_table *p )

-{

-   if (p->TableF) {

-      free(p->TableF);

-      p->TableF = NULL;

-   }

-   if (p->TableUB) {

-      free(p->TableUB);

-      p->TableUB = NULL;

-   }

-}

diff --git a/mesalib/src/mesa/main/colortab.h b/mesalib/src/mesa/main/colortab.h
index 81b4e008b..b0d2b5db8 100644
--- a/mesalib/src/mesa/main/colortab.h
+++ b/mesalib/src/mesa/main/colortab.h
@@ -1,84 +1,76 @@
-/*

- * Mesa 3-D graphics library

- * Version:  6.5.2

- *

- * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * The above copyright notice and this permission notice shall be included

- * in all copies or substantial portions of the Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- */

-

-

-#ifndef COLORTAB_H

-#define COLORTAB_H

-

-

-#include "compiler.h"

-#include "glheader.h"

-#include "mfeatures.h"

-

-struct _glapi_table;

-struct gl_color_table;

-

-#if FEATURE_colortable

-

-extern void GLAPIENTRY

-_mesa_ColorTable( GLenum target, GLenum internalformat,

-                  GLsizei width, GLenum format, GLenum type,

-                  const GLvoid *table );

-

-extern void GLAPIENTRY

-_mesa_ColorSubTable( GLenum target, GLsizei start,

-                     GLsizei count, GLenum format, GLenum type,

-                     const GLvoid *table );

-

-extern void

-_mesa_init_colortable_dispatch(struct _glapi_table *disp);

-

-#else /* FEATURE_colortable */

-

-static INLINE void GLAPIENTRY

-_mesa_ColorTable( GLenum target, GLenum internalformat,

-                  GLsizei width, GLenum format, GLenum type,

-                  const GLvoid *table )

-{

-   ASSERT_NO_FEATURE();

-}

-

-static INLINE void GLAPIENTRY

-_mesa_ColorSubTable( GLenum target, GLsizei start,

-                     GLsizei count, GLenum format, GLenum type,

-                     const GLvoid *table )

-{

-   ASSERT_NO_FEATURE();

-}

-

-static INLINE void

-_mesa_init_colortable_dispatch(struct _glapi_table *disp)

-{

-}

-

-#endif /* FEATURE_colortable */

-

-

-extern void

-_mesa_init_colortable( struct gl_color_table *table );

-

-extern void

-_mesa_free_colortable_data( struct gl_color_table *table );

-

-#endif /* COLORTAB_H */

+/*
+ * Mesa 3-D graphics library
+ * Version:  6.5.2
+ *
+ * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef COLORTAB_H
+#define COLORTAB_H
+
+
+#include "compiler.h"
+#include "glheader.h"
+#include "mfeatures.h"
+
+struct _glapi_table;
+
+#if FEATURE_colortable
+
+extern void GLAPIENTRY
+_mesa_ColorTable( GLenum target, GLenum internalformat,
+                  GLsizei width, GLenum format, GLenum type,
+                  const GLvoid *table );
+
+extern void GLAPIENTRY
+_mesa_ColorSubTable( GLenum target, GLsizei start,
+                     GLsizei count, GLenum format, GLenum type,
+                     const GLvoid *table );
+
+extern void
+_mesa_init_colortable_dispatch(struct _glapi_table *disp);
+
+#else /* FEATURE_colortable */
+
+static INLINE void GLAPIENTRY
+_mesa_ColorTable( GLenum target, GLenum internalformat,
+                  GLsizei width, GLenum format, GLenum type,
+                  const GLvoid *table )
+{
+   ASSERT_NO_FEATURE();
+}
+
+static INLINE void GLAPIENTRY
+_mesa_ColorSubTable( GLenum target, GLsizei start,
+                     GLsizei count, GLenum format, GLenum type,
+                     const GLvoid *table )
+{
+   ASSERT_NO_FEATURE();
+}
+
+static INLINE void
+_mesa_init_colortable_dispatch(struct _glapi_table *disp)
+{
+}
+
+#endif /* FEATURE_colortable */
+
+#endif /* COLORTAB_H */
diff --git a/mesalib/src/mesa/main/dd.h b/mesalib/src/mesa/main/dd.h
index ec42cea09..60c1d70a5 100644
--- a/mesalib/src/mesa/main/dd.h
+++ b/mesalib/src/mesa/main/dd.h
@@ -523,29 +523,6 @@ struct dd_function_table {
     */

    GLboolean (*IsTextureResident)( struct gl_context *ctx,

                                    struct gl_texture_object *t );

-

-   /**

-    * Called when the texture's color lookup table is changed.

-    * 

-    * If \p tObj is NULL then the shared texture palette

-    * gl_texture_object::Palette is to be updated.

-    */

-   void (*UpdateTexturePalette)( struct gl_context *ctx,

-                                 struct gl_texture_object *tObj );

-   /*@}*/

-

-   

-   /**

-    * \name Imaging functionality

-    */

-   /*@{*/

-   void (*CopyColorTable)( struct gl_context *ctx,

-			   GLenum target, GLenum internalformat,

-			   GLint x, GLint y, GLsizei width );

-

-   void (*CopyColorSubTable)( struct gl_context *ctx,

-			      GLenum target, GLsizei start,

-			      GLint x, GLint y, GLsizei width );

    /*@}*/

 

 

diff --git a/mesalib/src/mesa/main/enable.c b/mesalib/src/mesa/main/enable.c
index 572d31403..93c675deb 100644
--- a/mesalib/src/mesa/main/enable.c
+++ b/mesalib/src/mesa/main/enable.c
@@ -576,12 +576,6 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state)
          FLUSH_VERTICES(ctx, _NEW_SCISSOR);

          ctx->Scissor.Enabled = state;

          break;

-      case GL_SHARED_TEXTURE_PALETTE_EXT:

-         if (ctx->Texture.SharedPalette == state)

-            return;

-         FLUSH_VERTICES(ctx, _NEW_TEXTURE);

-         ctx->Texture.SharedPalette = state;

-         break;

       case GL_STENCIL_TEST:

          if (ctx->Stencil.Enabled == state)

             return;

@@ -1175,8 +1169,6 @@ _mesa_IsEnabled( GLenum cap )
          return ctx->Transform.RescaleNormals;

       case GL_SCISSOR_TEST:

 	 return ctx->Scissor.Enabled;

-      case GL_SHARED_TEXTURE_PALETTE_EXT:

-         return ctx->Texture.SharedPalette;

       case GL_STENCIL_TEST:

 	 return ctx->Stencil.Enabled;

       case GL_TEXTURE_1D:

diff --git a/mesalib/src/mesa/main/extensions.c b/mesalib/src/mesa/main/extensions.c
index 14b0cf9ac..1903a503c 100644
--- a/mesalib/src/mesa/main/extensions.c
+++ b/mesalib/src/mesa/main/extensions.c
@@ -172,7 +172,6 @@ static const struct extension extension_table[] = {
    { "GL_EXT_packed_depth_stencil",                o(EXT_packed_depth_stencil),                GL,             2005 },
    { "GL_EXT_packed_float",                        o(EXT_packed_float),                        GL,             2004 },
    { "GL_EXT_packed_pixels",                       o(EXT_packed_pixels),                       GL,             1997 },
-   { "GL_EXT_paletted_texture",                    o(EXT_paletted_texture),                    GL,             1995 },
    { "GL_EXT_pixel_buffer_object",                 o(EXT_pixel_buffer_object),                 GL,             2004 },
    { "GL_EXT_point_parameters",                    o(EXT_point_parameters),                    GL,             1997 },
    { "GL_EXT_polygon_offset",                      o(EXT_polygon_offset),                      GL,             1995 },
@@ -182,7 +181,6 @@ static const struct extension extension_table[] = {
    { "GL_EXT_separate_shader_objects",             o(EXT_separate_shader_objects),             GL,             2008 },
    { "GL_EXT_separate_specular_color",             o(EXT_separate_specular_color),             GL,             1997 },
    { "GL_EXT_shadow_funcs",                        o(EXT_shadow_funcs),                        GL,             2002 },
-   { "GL_EXT_shared_texture_palette",              o(EXT_shared_texture_palette),              GL,             2000 },
    { "GL_EXT_stencil_two_side",                    o(EXT_stencil_two_side),                    GL,             2001 },
    { "GL_EXT_stencil_wrap",                        o(EXT_stencil_wrap),                        GL,             2002 },
    { "GL_EXT_subtexture",                          o(EXT_subtexture),                          GL,             1995 },
@@ -488,7 +486,6 @@ _mesa_enable_sw_extensions(struct gl_context *ctx)
 #endif
    /*ctx->Extensions.EXT_multi_draw_arrays = GL_TRUE;*/
    ctx->Extensions.EXT_packed_depth_stencil = GL_TRUE;
-   ctx->Extensions.EXT_paletted_texture = GL_TRUE;
 #if FEATURE_EXT_pixel_buffer_object
    ctx->Extensions.EXT_pixel_buffer_object = GL_TRUE;
 #endif
@@ -496,7 +493,6 @@ _mesa_enable_sw_extensions(struct gl_context *ctx)
    ctx->Extensions.EXT_provoking_vertex = GL_TRUE;
    ctx->Extensions.EXT_shadow_funcs = GL_TRUE;
    ctx->Extensions.EXT_secondary_color = GL_TRUE;
-   ctx->Extensions.EXT_shared_texture_palette = GL_TRUE;
    ctx->Extensions.EXT_stencil_wrap = GL_TRUE;
    ctx->Extensions.EXT_stencil_two_side = GL_TRUE;
    ctx->Extensions.EXT_texture_array = GL_TRUE;
diff --git a/mesalib/src/mesa/main/formats.c b/mesalib/src/mesa/main/formats.c
index 2826addf9..fd16d98c5 100644
--- a/mesalib/src/mesa/main/formats.c
+++ b/mesalib/src/mesa/main/formats.c
@@ -1175,7 +1175,6 @@ _mesa_get_format_bits(gl_format format, GLenum pname)
    case GL_TEXTURE_LUMINANCE_SIZE:

       return info->LuminanceBits;

    case GL_INDEX_BITS:

-   case GL_TEXTURE_INDEX_SIZE_EXT:

       return info->IndexBits;

    case GL_DEPTH_BITS:

    case GL_TEXTURE_DEPTH_SIZE_ARB:

diff --git a/mesalib/src/mesa/main/framebuffer.c b/mesalib/src/mesa/main/framebuffer.c
index fd499ab2b..6c8608a09 100644
--- a/mesalib/src/mesa/main/framebuffer.c
+++ b/mesalib/src/mesa/main/framebuffer.c
@@ -888,7 +888,6 @@ _mesa_source_buffer_exists(struct gl_context *ctx, GLenum format)
    case GL_RGBA:

    case GL_BGRA:

    case GL_ABGR_EXT:

-   case GL_COLOR_INDEX:

    case GL_RED_INTEGER_EXT:

    case GL_GREEN_INTEGER_EXT:

    case GL_BLUE_INTEGER_EXT:

@@ -976,7 +975,6 @@ _mesa_dest_buffer_exists(struct gl_context *ctx, GLenum format)
    case GL_RGBA:

    case GL_BGRA:

    case GL_ABGR_EXT:

-   case GL_COLOR_INDEX:

    case GL_RED_INTEGER_EXT:

    case GL_GREEN_INTEGER_EXT:

    case GL_BLUE_INTEGER_EXT:

diff --git a/mesalib/src/mesa/main/get.c b/mesalib/src/mesa/main/get.c
index d6b203a68..ee241615d 100644
--- a/mesalib/src/mesa/main/get.c
+++ b/mesalib/src/mesa/main/get.c
@@ -857,7 +857,6 @@ static const struct value_desc values[] = {
    { GL_RENDER_MODE, CONTEXT_ENUM(RenderMode), NO_EXTRA },

    { GL_RGBA_MODE, CONST(1), NO_EXTRA },

    { GL_SELECTION_BUFFER_SIZE, CONTEXT_INT(Select.BufferSize), NO_EXTRA },

-   { GL_SHARED_TEXTURE_PALETTE_EXT, CONTEXT_BOOL(Texture.SharedPalette), NO_EXTRA },

 

    { GL_STEREO, BUFFER_INT(Visual.stereoMode), NO_EXTRA },

 

diff --git a/mesalib/src/mesa/main/image.c b/mesalib/src/mesa/main/image.c
index 37127dcb7..3e75e7c6b 100644
--- a/mesalib/src/mesa/main/image.c
+++ b/mesalib/src/mesa/main/image.c
@@ -249,12 +249,6 @@ _mesa_components_in_format( GLenum format )
 {
    switch (format) {
       case GL_COLOR_INDEX:
-      case GL_COLOR_INDEX1_EXT:
-      case GL_COLOR_INDEX2_EXT:
-      case GL_COLOR_INDEX4_EXT:
-      case GL_COLOR_INDEX8_EXT:
-      case GL_COLOR_INDEX12_EXT:
-      case GL_COLOR_INDEX16_EXT:
       case GL_STENCIL_INDEX:
       case GL_DEPTH_COMPONENT:
       case GL_RED:
@@ -863,27 +857,6 @@ _mesa_is_color_format(GLenum format)
 
 
 /**
- * Test if the given image format is a color index format.
- */
-GLboolean
-_mesa_is_index_format(GLenum format)
-{
-   switch (format) {
-      case GL_COLOR_INDEX:
-      case GL_COLOR_INDEX1_EXT:
-      case GL_COLOR_INDEX2_EXT:
-      case GL_COLOR_INDEX4_EXT:
-      case GL_COLOR_INDEX8_EXT:
-      case GL_COLOR_INDEX12_EXT:
-      case GL_COLOR_INDEX16_EXT:
-         return GL_TRUE;
-      default:
-         return GL_FALSE;
-   }
-}
-
-
-/**
  * Test if the given image format is a depth component format.
  */
 GLboolean
diff --git a/mesalib/src/mesa/main/image.h b/mesalib/src/mesa/main/image.h
index 6fa93924c..46adaec41 100644
--- a/mesalib/src/mesa/main/image.h
+++ b/mesalib/src/mesa/main/image.h
@@ -1,176 +1,173 @@
-/*

- * Mesa 3-D graphics library

- * Version:  7.1

- *

- * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * The above copyright notice and this permission notice shall be included

- * in all copies or substantial portions of the Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- */

-

-

-#ifndef IMAGE_H

-#define IMAGE_H

-

-

-#include "glheader.h"

-

-struct gl_context;

-struct gl_pixelstore_attrib;

-

-extern void

-_mesa_swap2( GLushort *p, GLuint n );

-

-extern void

-_mesa_swap4( GLuint *p, GLuint n );

-

-extern GLboolean

-_mesa_type_is_packed(GLenum type);

-

-extern GLint

-_mesa_sizeof_type( GLenum type );

-

-extern GLint

-_mesa_sizeof_packed_type( GLenum type );

-

-extern GLint

-_mesa_components_in_format( GLenum format );

-

-extern GLint

-_mesa_bytes_per_pixel( GLenum format, GLenum type );

-

-extern GLboolean

-_mesa_is_legal_format_and_type(const struct gl_context *ctx,

-                               GLenum format, GLenum type);

-

-extern GLboolean

-_mesa_is_color_format(GLenum format);

-

-extern GLboolean

-_mesa_is_index_format(GLenum format);

-

-extern GLboolean

-_mesa_is_depth_format(GLenum format);

-

-extern GLboolean

-_mesa_is_stencil_format(GLenum format);

-

-extern GLboolean

-_mesa_is_ycbcr_format(GLenum format);

-

-extern GLboolean

-_mesa_is_depthstencil_format(GLenum format);

-

-extern GLboolean

-_mesa_is_depth_or_stencil_format(GLenum format);

-

-extern GLboolean

-_mesa_is_dudv_format(GLenum format);

-

-extern GLboolean

-_mesa_is_integer_format(GLenum format);

-

-extern GLboolean

-_mesa_is_compressed_format(struct gl_context *ctx, GLenum format);

-

-extern GLvoid *

-_mesa_image_address( GLuint dimensions,

-                     const struct gl_pixelstore_attrib *packing,

-                     const GLvoid *image,

-                     GLsizei width, GLsizei height,

-                     GLenum format, GLenum type,

-                     GLint img, GLint row, GLint column );

-

-extern GLvoid *

-_mesa_image_address1d( const struct gl_pixelstore_attrib *packing,

-                       const GLvoid *image,

-                       GLsizei width,

-                       GLenum format, GLenum type,

-                       GLint column );

-

-extern GLvoid *

-_mesa_image_address2d( const struct gl_pixelstore_attrib *packing,

-                       const GLvoid *image,

-                       GLsizei width, GLsizei height,

-                       GLenum format, GLenum type,

-                       GLint row, GLint column );

-

-extern GLvoid *

-_mesa_image_address3d( const struct gl_pixelstore_attrib *packing,

-                       const GLvoid *image,

-                       GLsizei width, GLsizei height,

-                       GLenum format, GLenum type,

-                       GLint img, GLint row, GLint column );

-

-

-extern GLint

-_mesa_image_row_stride( const struct gl_pixelstore_attrib *packing,

-                        GLint width, GLenum format, GLenum type );

-

-

-extern GLint

-_mesa_image_image_stride( const struct gl_pixelstore_attrib *packing,

-                          GLint width, GLint height,

-                          GLenum format, GLenum type );

-

-

-extern void

-_mesa_expand_bitmap(GLsizei width, GLsizei height,

-                    const struct gl_pixelstore_attrib *unpack,

-                    const GLubyte *bitmap,

-                    GLubyte *destBuffer, GLint destStride,

-                    GLubyte onValue);

-

-

-extern void

-_mesa_convert_colors(GLenum srcType, const GLvoid *src,

-                     GLenum dstType, GLvoid *dst,

-                     GLuint count, const GLubyte mask[]);

-

-

-extern GLboolean

-_mesa_clip_drawpixels(const struct gl_context *ctx,

-                      GLint *destX, GLint *destY,

-                      GLsizei *width, GLsizei *height,

-                      struct gl_pixelstore_attrib *unpack);

-

-

-extern GLboolean

-_mesa_clip_readpixels(const struct gl_context *ctx,

-                      GLint *srcX, GLint *srcY,

-                      GLsizei *width, GLsizei *height,

-                      struct gl_pixelstore_attrib *pack);

-

-extern GLboolean

-_mesa_clip_copytexsubimage(const struct gl_context *ctx,

-                           GLint *destX, GLint *destY,

-                           GLint *srcX, GLint *srcY,

-                           GLsizei *width, GLsizei *height);

-                           

-extern GLboolean

-_mesa_clip_to_region(GLint xmin, GLint ymin,

-                     GLint xmax, GLint ymax,

-                     GLint *x, GLint *y,

-                     GLsizei *width, GLsizei *height );

-

-extern GLboolean

-_mesa_clip_blit(struct gl_context *ctx,

-                GLint *srcX0, GLint *srcY0, GLint *srcX1, GLint *srcY1,

-                GLint *dstX0, GLint *dstY0, GLint *dstX1, GLint *dstY1);

-

-

-#endif

+/*
+ * Mesa 3-D graphics library
+ * Version:  7.1
+ *
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef IMAGE_H
+#define IMAGE_H
+
+
+#include "glheader.h"
+
+struct gl_context;
+struct gl_pixelstore_attrib;
+
+extern void
+_mesa_swap2( GLushort *p, GLuint n );
+
+extern void
+_mesa_swap4( GLuint *p, GLuint n );
+
+extern GLboolean
+_mesa_type_is_packed(GLenum type);
+
+extern GLint
+_mesa_sizeof_type( GLenum type );
+
+extern GLint
+_mesa_sizeof_packed_type( GLenum type );
+
+extern GLint
+_mesa_components_in_format( GLenum format );
+
+extern GLint
+_mesa_bytes_per_pixel( GLenum format, GLenum type );
+
+extern GLboolean
+_mesa_is_legal_format_and_type(const struct gl_context *ctx,
+                               GLenum format, GLenum type);
+
+extern GLboolean
+_mesa_is_color_format(GLenum format);
+
+extern GLboolean
+_mesa_is_depth_format(GLenum format);
+
+extern GLboolean
+_mesa_is_stencil_format(GLenum format);
+
+extern GLboolean
+_mesa_is_ycbcr_format(GLenum format);
+
+extern GLboolean
+_mesa_is_depthstencil_format(GLenum format);
+
+extern GLboolean
+_mesa_is_depth_or_stencil_format(GLenum format);
+
+extern GLboolean
+_mesa_is_dudv_format(GLenum format);
+
+extern GLboolean
+_mesa_is_integer_format(GLenum format);
+
+extern GLboolean
+_mesa_is_compressed_format(struct gl_context *ctx, GLenum format);
+
+extern GLvoid *
+_mesa_image_address( GLuint dimensions,
+                     const struct gl_pixelstore_attrib *packing,
+                     const GLvoid *image,
+                     GLsizei width, GLsizei height,
+                     GLenum format, GLenum type,
+                     GLint img, GLint row, GLint column );
+
+extern GLvoid *
+_mesa_image_address1d( const struct gl_pixelstore_attrib *packing,
+                       const GLvoid *image,
+                       GLsizei width,
+                       GLenum format, GLenum type,
+                       GLint column );
+
+extern GLvoid *
+_mesa_image_address2d( const struct gl_pixelstore_attrib *packing,
+                       const GLvoid *image,
+                       GLsizei width, GLsizei height,
+                       GLenum format, GLenum type,
+                       GLint row, GLint column );
+
+extern GLvoid *
+_mesa_image_address3d( const struct gl_pixelstore_attrib *packing,
+                       const GLvoid *image,
+                       GLsizei width, GLsizei height,
+                       GLenum format, GLenum type,
+                       GLint img, GLint row, GLint column );
+
+
+extern GLint
+_mesa_image_row_stride( const struct gl_pixelstore_attrib *packing,
+                        GLint width, GLenum format, GLenum type );
+
+
+extern GLint
+_mesa_image_image_stride( const struct gl_pixelstore_attrib *packing,
+                          GLint width, GLint height,
+                          GLenum format, GLenum type );
+
+
+extern void
+_mesa_expand_bitmap(GLsizei width, GLsizei height,
+                    const struct gl_pixelstore_attrib *unpack,
+                    const GLubyte *bitmap,
+                    GLubyte *destBuffer, GLint destStride,
+                    GLubyte onValue);
+
+
+extern void
+_mesa_convert_colors(GLenum srcType, const GLvoid *src,
+                     GLenum dstType, GLvoid *dst,
+                     GLuint count, const GLubyte mask[]);
+
+
+extern GLboolean
+_mesa_clip_drawpixels(const struct gl_context *ctx,
+                      GLint *destX, GLint *destY,
+                      GLsizei *width, GLsizei *height,
+                      struct gl_pixelstore_attrib *unpack);
+
+
+extern GLboolean
+_mesa_clip_readpixels(const struct gl_context *ctx,
+                      GLint *srcX, GLint *srcY,
+                      GLsizei *width, GLsizei *height,
+                      struct gl_pixelstore_attrib *pack);
+
+extern GLboolean
+_mesa_clip_copytexsubimage(const struct gl_context *ctx,
+                           GLint *destX, GLint *destY,
+                           GLint *srcX, GLint *srcY,
+                           GLsizei *width, GLsizei *height);
+                           
+extern GLboolean
+_mesa_clip_to_region(GLint xmin, GLint ymin,
+                     GLint xmax, GLint ymax,
+                     GLint *x, GLint *y,
+                     GLsizei *width, GLsizei *height );
+
+extern GLboolean
+_mesa_clip_blit(struct gl_context *ctx,
+                GLint *srcX0, GLint *srcY0, GLint *srcX1, GLint *srcY1,
+                GLint *dstX0, GLint *dstY0, GLint *dstX1, GLint *dstY1);
+
+
+#endif
diff --git a/mesalib/src/mesa/main/mtypes.h b/mesalib/src/mesa/main/mtypes.h
index 1db140532..e77bce8f2 100644
--- a/mesalib/src/mesa/main/mtypes.h
+++ b/mesalib/src/mesa/main/mtypes.h
@@ -215,7 +215,9 @@ typedef enum
 

 

 /**

- * Indexes for vertex program result attributes

+ * Indexes for vertex program result attributes.  Note that

+ * _mesa_vert_result_to_frag_attrib() and _mesa_frag_attrib_to_vert_result() make

+ * assumptions about the layout of this enum.

  */

 typedef enum

 {

@@ -313,7 +315,9 @@ typedef enum
 

 

 /**

- * Indexes for fragment program input attributes.

+ * Indexes for fragment program input attributes.  Note that

+ * _mesa_vert_result_to_frag_attrib() and frag_attrib_to_vert_result() make

+ * assumptions about the layout of this enum.

  */

 typedef enum

 {

@@ -335,6 +339,48 @@ typedef enum
    FRAG_ATTRIB_MAX = (FRAG_ATTRIB_VAR0 + MAX_VARYING)

 } gl_frag_attrib;

 

+

+/**

+ * Convert from a gl_vert_result value to the corresponding gl_frag_attrib.

+ *

+ * VERT_RESULT_HPOS is converted to FRAG_ATTRIB_WPOS.

+ *

+ * gl_vert_result values which have no corresponding gl_frag_attrib

+ * (VERT_RESULT_PSIZ, VERT_RESULT_BFC0, VERT_RESULT_BFC1, and

+ * VERT_RESULT_EDGE) are converted to a value of -1.

+ */

+static INLINE int

+_mesa_vert_result_to_frag_attrib(gl_vert_result vert_result)

+{

+   if (vert_result >= VERT_RESULT_VAR0)

+      return vert_result - VERT_RESULT_VAR0 + FRAG_ATTRIB_VAR0;

+   else if (vert_result <= VERT_RESULT_TEX7)

+      return vert_result;

+   else

+      return -1;

+}

+

+

+/**

+ * Convert from a gl_frag_attrib value to the corresponding gl_vert_result.

+ *

+ * FRAG_ATTRIB_WPOS is converted to VERT_RESULT_HPOS.

+ *

+ * gl_frag_attrib values which have no corresponding gl_vert_result

+ * (FRAG_ATTRIB_FACE and FRAG_ATTRIB_PNTC) are converted to a value of -1.

+ */

+static INLINE int

+_mesa_frag_attrib_to_vert_result(gl_frag_attrib frag_attrib)

+{

+   if (frag_attrib <= FRAG_ATTRIB_TEX7)

+      return frag_attrib;

+   else if (frag_attrib >= FRAG_ATTRIB_VAR0)

+      return frag_attrib - FRAG_ATTRIB_VAR0 + VERT_RESULT_VAR0;

+   else

+      return -1;

+}

+

+

 /**

  * Bitflags for fragment program input attributes.

  */

@@ -524,25 +570,6 @@ struct gl_config
 

 

 /**

- * Data structure for color tables

- */

-struct gl_color_table

-{

-   GLenum InternalFormat;      /**< The user-specified format */

-   GLenum _BaseFormat;         /**< GL_ALPHA, GL_RGBA, GL_RGB, etc */

-   GLuint Size;                /**< number of entries in table */

-   GLfloat *TableF;            /**< Color table, floating point values */

-   GLubyte *TableUB;           /**< Color table, ubyte values */

-   GLubyte RedSize;

-   GLubyte GreenSize;

-   GLubyte BlueSize;

-   GLubyte AlphaSize;

-   GLubyte LuminanceSize;

-   GLubyte IntensitySize;

-};

-

-

-/**

  * \name Bit flags used for updating material values.

  */

 /*@{*/

@@ -1255,9 +1282,9 @@ struct gl_texture_image
    GLint InternalFormat;	/**< Internal format as given by the user */

    GLenum _BaseFormat;		/**< Either GL_RGB, GL_RGBA, GL_ALPHA,

 				 *   GL_LUMINANCE, GL_LUMINANCE_ALPHA,

-				 *   GL_INTENSITY, GL_COLOR_INDEX,

-				 *   GL_DEPTH_COMPONENT or GL_DEPTH_STENCIL_EXT

-                                 *   only. Used for choosing TexEnv arithmetic.

+				 *   GL_INTENSITY, GL_DEPTH_COMPONENT or

+				 *   GL_DEPTH_STENCIL_EXT only. Used for

+				 *   choosing TexEnv arithmetic.

 				 */

    gl_format TexFormat;         /**< The actual texture memory format */

 

@@ -1354,8 +1381,7 @@ struct gl_sampler_object
 

 /**

  * Texture object state.  Contains the array of mipmap images, border color,

- * wrap modes, filter modes, shadow/texcompare state, and the per-texture

- * color palette.

+ * wrap modes, filter modes, and shadow/texcompare state.

  */

 struct gl_texture_object

 {

@@ -1386,9 +1412,6 @@ struct gl_texture_object
    struct gl_buffer_object *BufferObject;

    GLenum BufferObjectFormat;

 

-   /** GL_EXT_paletted_texture */

-   struct gl_color_table Palette;

-

    /**

     * \name For device driver.

     * Note: instead of attaching driver data to this pointer, it's preferable

@@ -1504,10 +1527,6 @@ struct gl_texture_attrib
    /** GL_ARB_seamless_cubemap */

    GLboolean CubeMapSeamless;

 

-   /** GL_EXT_shared_texture_palette */

-   GLboolean SharedPalette;

-   struct gl_color_table Palette;

-

    /** Texture units/samplers used by vertex or fragment texturing */

    GLbitfield _EnabledUnits;

 

@@ -2852,7 +2871,6 @@ struct gl_extensions
    GLboolean EXT_gpu_program_parameters;

    GLboolean EXT_gpu_shader4;

    GLboolean EXT_multi_draw_arrays;

-   GLboolean EXT_paletted_texture;

    GLboolean EXT_packed_depth_stencil;

    GLboolean EXT_packed_float;

    GLboolean EXT_packed_pixels;

@@ -2865,7 +2883,6 @@ struct gl_extensions
    GLboolean EXT_secondary_color;

    GLboolean EXT_separate_shader_objects;

    GLboolean EXT_separate_specular_color;

-   GLboolean EXT_shared_texture_palette;

    GLboolean EXT_stencil_wrap;

    GLboolean EXT_stencil_two_side;

    GLboolean EXT_subtexture;

diff --git a/mesalib/src/mesa/main/pack.c b/mesalib/src/mesa/main/pack.c
index 817d92912..1f9df52c4 100644
--- a/mesalib/src/mesa/main/pack.c
+++ b/mesalib/src/mesa/main/pack.c
@@ -3459,8 +3459,7 @@ _mesa_unpack_color_span_chan( struct gl_context *ctx,
           dstFormat == GL_RED ||

           dstFormat == GL_RG ||

           dstFormat == GL_RGB ||

-          dstFormat == GL_RGBA ||

-          dstFormat == GL_COLOR_INDEX);

+          dstFormat == GL_RGBA);

 

    ASSERT(srcFormat == GL_RED ||

           srcFormat == GL_GREEN ||

@@ -3646,24 +3645,11 @@ _mesa_unpack_color_span_chan( struct gl_context *ctx,
          extract_uint_indexes(n, indexes, srcFormat, srcType, source,

                               srcPacking);

 

-         if (dstFormat == GL_COLOR_INDEX) {

-            GLuint i;

-            _mesa_apply_ci_transfer_ops(ctx, transferOps, n, indexes);

-            /* convert to GLchan and return */

-            for (i = 0; i < n; i++) {

-               dest[i] = (GLchan) (indexes[i] & 0xff);

-            }

-            free(indexes);

-            free(rgba);

-            return;

-         }

-         else {

-            /* Convert indexes to RGBA */

-            if (transferOps & IMAGE_SHIFT_OFFSET_BIT) {

-               _mesa_shift_and_offset_ci(ctx, n, indexes);

-            }

-            _mesa_map_ci_to_rgba(ctx, n, indexes, rgba);

-         }

+	 /* Convert indexes to RGBA */

+	 if (transferOps & IMAGE_SHIFT_OFFSET_BIT) {

+	    _mesa_shift_and_offset_ci(ctx, n, indexes);

+	 }

+	 _mesa_map_ci_to_rgba(ctx, n, indexes, rgba);

 

          /* Don't do RGBA scale/bias or RGBA->RGBA mapping if starting

           * with color indexes.

@@ -3773,8 +3759,7 @@ _mesa_unpack_color_span_float( struct gl_context *ctx,
           dstFormat == GL_RED ||

           dstFormat == GL_RG ||

           dstFormat == GL_RGB ||

-          dstFormat == GL_RGBA ||

-          dstFormat == GL_COLOR_INDEX);

+          dstFormat == GL_RGBA);

 

    ASSERT(srcFormat == GL_RED ||

           srcFormat == GL_GREEN ||

@@ -3855,24 +3840,11 @@ _mesa_unpack_color_span_float( struct gl_context *ctx,
          extract_uint_indexes(n, indexes, srcFormat, srcType, source,

                               srcPacking);

 

-         if (dstFormat == GL_COLOR_INDEX) {

-            GLuint i;

-            _mesa_apply_ci_transfer_ops(ctx, transferOps, n, indexes);

-            /* convert to GLchan and return */

-            for (i = 0; i < n; i++) {

-               dest[i] = (GLchan) (indexes[i] & 0xff);

-            }

-            free(indexes);

-            free(rgba);

-            return;

-         }

-         else {

-            /* Convert indexes to RGBA */

-            if (transferOps & IMAGE_SHIFT_OFFSET_BIT) {

-               _mesa_shift_and_offset_ci(ctx, n, indexes);

-            }

-            _mesa_map_ci_to_rgba(ctx, n, indexes, rgba);

-         }

+	 /* Convert indexes to RGBA */

+	 if (transferOps & IMAGE_SHIFT_OFFSET_BIT) {

+	    _mesa_shift_and_offset_ci(ctx, n, indexes);

+	 }

+	 _mesa_map_ci_to_rgba(ctx, n, indexes, rgba);

 

          /* Don't do RGBA scale/bias or RGBA->RGBA mapping if starting

           * with color indexes.

diff --git a/mesalib/src/mesa/main/pixeltransfer.c b/mesalib/src/mesa/main/pixeltransfer.c
index 092ee3a14..5e881436a 100644
--- a/mesalib/src/mesa/main/pixeltransfer.c
+++ b/mesalib/src/mesa/main/pixeltransfer.c
@@ -1,567 +1,306 @@
-/*

- * Mesa 3-D graphics library

- *

- * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.

- * Copyright (C) 2009-2010  VMware, Inc.  All Rights Reserved.

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * The above copyright notice and this permission notice shall be included

- * in all copies or substantial portions of the Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

- * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- */

-

-

-/**

- * \file pixeltransfer.c

- * Pixel transfer operations (scale, bias, table lookups, etc)

- */

-

-

-#include "glheader.h"

-#include "colormac.h"

-#include "pixeltransfer.h"

-#include "imports.h"

-#include "mtypes.h"

-

-

-/*

- * Apply scale and bias factors to an array of RGBA pixels.

- */

-void

-_mesa_scale_and_bias_rgba(GLuint n, GLfloat rgba[][4],

-                          GLfloat rScale, GLfloat gScale,

-                          GLfloat bScale, GLfloat aScale,

-                          GLfloat rBias, GLfloat gBias,

-                          GLfloat bBias, GLfloat aBias)

-{

-   if (rScale != 1.0 || rBias != 0.0) {

-      GLuint i;

-      for (i = 0; i < n; i++) {

-         rgba[i][RCOMP] = rgba[i][RCOMP] * rScale + rBias;

-      }

-   }

-   if (gScale != 1.0 || gBias != 0.0) {

-      GLuint i;

-      for (i = 0; i < n; i++) {

-         rgba[i][GCOMP] = rgba[i][GCOMP] * gScale + gBias;

-      }

-   }

-   if (bScale != 1.0 || bBias != 0.0) {

-      GLuint i;

-      for (i = 0; i < n; i++) {

-         rgba[i][BCOMP] = rgba[i][BCOMP] * bScale + bBias;

-      }

-   }

-   if (aScale != 1.0 || aBias != 0.0) {

-      GLuint i;

-      for (i = 0; i < n; i++) {

-         rgba[i][ACOMP] = rgba[i][ACOMP] * aScale + aBias;

-      }

-   }

-}

-

-

-/*

- * Apply pixel mapping to an array of floating point RGBA pixels.

- */

-void

-_mesa_map_rgba( const struct gl_context *ctx, GLuint n, GLfloat rgba[][4] )

-{

-   const GLfloat rscale = (GLfloat) (ctx->PixelMaps.RtoR.Size - 1);

-   const GLfloat gscale = (GLfloat) (ctx->PixelMaps.GtoG.Size - 1);

-   const GLfloat bscale = (GLfloat) (ctx->PixelMaps.BtoB.Size - 1);

-   const GLfloat ascale = (GLfloat) (ctx->PixelMaps.AtoA.Size - 1);

-   const GLfloat *rMap = ctx->PixelMaps.RtoR.Map;

-   const GLfloat *gMap = ctx->PixelMaps.GtoG.Map;

-   const GLfloat *bMap = ctx->PixelMaps.BtoB.Map;

-   const GLfloat *aMap = ctx->PixelMaps.AtoA.Map;

-   GLuint i;

-   for (i=0;i<n;i++) {

-      GLfloat r = CLAMP(rgba[i][RCOMP], 0.0F, 1.0F);

-      GLfloat g = CLAMP(rgba[i][GCOMP], 0.0F, 1.0F);

-      GLfloat b = CLAMP(rgba[i][BCOMP], 0.0F, 1.0F);

-      GLfloat a = CLAMP(rgba[i][ACOMP], 0.0F, 1.0F);

-      rgba[i][RCOMP] = rMap[IROUND(r * rscale)];

-      rgba[i][GCOMP] = gMap[IROUND(g * gscale)];

-      rgba[i][BCOMP] = bMap[IROUND(b * bscale)];

-      rgba[i][ACOMP] = aMap[IROUND(a * ascale)];

-   }

-}

-

-/**

- * Apply a color table lookup to an array of floating point RGBA colors.

- */

-void

-_mesa_lookup_rgba_float(const struct gl_color_table *table,

-                        GLuint n, GLfloat rgba[][4])

-{

-   const GLint max = table->Size - 1;

-   const GLfloat scale = (GLfloat) max;

-   const GLfloat *lut = table->TableF;

-   GLuint i;

-

-   if (!table->TableF || table->Size == 0)

-      return;

-

-   switch (table->_BaseFormat) {

-      case GL_INTENSITY:

-         /* replace RGBA with I */

-         for (i = 0; i < n; i++) {

-            GLint j = IROUND(rgba[i][RCOMP] * scale);

-            GLfloat c = lut[CLAMP(j, 0, max)];

-            rgba[i][RCOMP] =

-            rgba[i][GCOMP] =

-            rgba[i][BCOMP] =

-            rgba[i][ACOMP] = c;

-         }

-         break;

-      case GL_LUMINANCE:

-         /* replace RGB with L */

-         for (i = 0; i < n; i++) {

-            GLint j = IROUND(rgba[i][RCOMP] * scale);

-            GLfloat c = lut[CLAMP(j, 0, max)];

-            rgba[i][RCOMP] =

-            rgba[i][GCOMP] =

-            rgba[i][BCOMP] = c;

-         }

-         break;

-      case GL_ALPHA:

-         /* replace A with A */

-         for (i = 0; i < n; i++) {

-            GLint j = IROUND(rgba[i][ACOMP] * scale);

-            rgba[i][ACOMP] = lut[CLAMP(j, 0, max)];

-         }

-         break;

-      case GL_LUMINANCE_ALPHA:

-         /* replace RGBA with LLLA */

-         for (i = 0; i < n; i++) {

-            GLint jL = IROUND(rgba[i][RCOMP] * scale);

-            GLint jA = IROUND(rgba[i][ACOMP] * scale);

-            GLfloat luminance, alpha;

-            jL = CLAMP(jL, 0, max);

-            jA = CLAMP(jA, 0, max);

-            luminance = lut[jL * 2 + 0];

-            alpha     = lut[jA * 2 + 1];

-            rgba[i][RCOMP] =

-            rgba[i][GCOMP] =

-            rgba[i][BCOMP] = luminance;

-            rgba[i][ACOMP] = alpha;;

-         }

-         break;

-      case GL_RED:

-         /* replace RGB with RGB */

-         for (i = 0; i < n; i++) {

-            GLint jR = IROUND(rgba[i][RCOMP] * scale);

-            jR = CLAMP(jR, 0, max);

-            rgba[i][RCOMP] = lut[jR * 3 + 0];

-         }

-         break;

-      case GL_RG:

-         /* replace RG with RG */

-         for (i = 0; i < n; i++) {

-            GLint jR = IROUND(rgba[i][RCOMP] * scale);

-            GLint jG = IROUND(rgba[i][GCOMP] * scale);

-            jR = CLAMP(jR, 0, max);

-            jG = CLAMP(jG, 0, max);

-            rgba[i][RCOMP] = lut[jR * 3 + 0];

-            rgba[i][GCOMP] = lut[jG * 3 + 1];

-         }

-         break;

-      case GL_RGB:

-         /* replace RGB with RGB */

-         for (i = 0; i < n; i++) {

-            GLint jR = IROUND(rgba[i][RCOMP] * scale);

-            GLint jG = IROUND(rgba[i][GCOMP] * scale);

-            GLint jB = IROUND(rgba[i][BCOMP] * scale);

-            jR = CLAMP(jR, 0, max);

-            jG = CLAMP(jG, 0, max);

-            jB = CLAMP(jB, 0, max);

-            rgba[i][RCOMP] = lut[jR * 3 + 0];

-            rgba[i][GCOMP] = lut[jG * 3 + 1];

-            rgba[i][BCOMP] = lut[jB * 3 + 2];

-         }

-         break;

-      case GL_RGBA:

-         /* replace RGBA with RGBA */

-         for (i = 0; i < n; i++) {

-            GLint jR = IROUND(rgba[i][RCOMP] * scale);

-            GLint jG = IROUND(rgba[i][GCOMP] * scale);

-            GLint jB = IROUND(rgba[i][BCOMP] * scale);

-            GLint jA = IROUND(rgba[i][ACOMP] * scale);

-            jR = CLAMP(jR, 0, max);

-            jG = CLAMP(jG, 0, max);

-            jB = CLAMP(jB, 0, max);

-            jA = CLAMP(jA, 0, max);

-            rgba[i][RCOMP] = lut[jR * 4 + 0];

-            rgba[i][GCOMP] = lut[jG * 4 + 1];

-            rgba[i][BCOMP] = lut[jB * 4 + 2];

-            rgba[i][ACOMP] = lut[jA * 4 + 3];

-         }

-         break;

-      default:

-         _mesa_problem(NULL, "Bad format in _mesa_lookup_rgba_float");

-         return;

-   }

-}

-

-

-

-/**

- * Apply a color table lookup to an array of ubyte/RGBA colors.

- */

-void

-_mesa_lookup_rgba_ubyte(const struct gl_color_table *table,

-                        GLuint n, GLubyte rgba[][4])

-{

-   const GLubyte *lut = table->TableUB;

-   const GLfloat scale = (GLfloat) (table->Size - 1) / (GLfloat)255.0;

-   GLuint i;

-

-   if (!table->TableUB || table->Size == 0)

-      return;

-

-   switch (table->_BaseFormat) {

-   case GL_INTENSITY:

-      /* replace RGBA with I */

-      if (table->Size == 256) {

-         for (i = 0; i < n; i++) {

-            const GLubyte c = lut[rgba[i][RCOMP]];

-            rgba[i][RCOMP] =

-            rgba[i][GCOMP] =

-            rgba[i][BCOMP] =

-            rgba[i][ACOMP] = c;

-         }

-      }

-      else {

-         for (i = 0; i < n; i++) {

-            GLint j = IROUND((GLfloat) rgba[i][RCOMP] * scale);

-            rgba[i][RCOMP] =

-            rgba[i][GCOMP] =

-            rgba[i][BCOMP] =

-            rgba[i][ACOMP] = lut[j];

-         }

-      }

-      break;

-   case GL_LUMINANCE:

-      /* replace RGB with L */

-      if (table->Size == 256) {

-         for (i = 0; i < n; i++) {

-            const GLubyte c = lut[rgba[i][RCOMP]];

-            rgba[i][RCOMP] =

-            rgba[i][GCOMP] =

-            rgba[i][BCOMP] = c;

-         }

-      }

-      else {

-         for (i = 0; i < n; i++) {

-            GLint j = IROUND((GLfloat) rgba[i][RCOMP] * scale);

-            rgba[i][RCOMP] =

-            rgba[i][GCOMP] =

-            rgba[i][BCOMP] = lut[j];

-         }

-      }

-      break;

-   case GL_ALPHA:

-      /* replace A with A */

-      if (table->Size == 256) {

-         for (i = 0; i < n; i++) {

-            rgba[i][ACOMP] = lut[rgba[i][ACOMP]];

-         }

-      }

-      else {

-         for (i = 0; i < n; i++) {

-            GLint j = IROUND((GLfloat) rgba[i][ACOMP] * scale);

-            rgba[i][ACOMP] = lut[j];

-         }

-      }

-      break;

-   case GL_LUMINANCE_ALPHA:

-      /* replace RGBA with LLLA */

-      if (table->Size == 256) {

-         for (i = 0; i < n; i++) {

-            GLubyte l = lut[rgba[i][RCOMP] * 2 + 0];

-            GLubyte a = lut[rgba[i][ACOMP] * 2 + 1];;

-            rgba[i][RCOMP] =

-            rgba[i][GCOMP] =

-            rgba[i][BCOMP] = l;

-            rgba[i][ACOMP] = a;

-         }

-      }

-      else {

-         for (i = 0; i < n; i++) {

-            GLint jL = IROUND((GLfloat) rgba[i][RCOMP] * scale);

-            GLint jA = IROUND((GLfloat) rgba[i][ACOMP] * scale);

-            GLubyte luminance = lut[jL * 2 + 0];

-            GLubyte alpha     = lut[jA * 2 + 1];

-            rgba[i][RCOMP] =

-            rgba[i][GCOMP] =

-            rgba[i][BCOMP] = luminance;

-            rgba[i][ACOMP] = alpha;

-         }

-      }

-      break;

-   case GL_RGB:

-      if (table->Size == 256) {

-         for (i = 0; i < n; i++) {

-            rgba[i][RCOMP] = lut[rgba[i][RCOMP] * 3 + 0];

-            rgba[i][GCOMP] = lut[rgba[i][GCOMP] * 3 + 1];

-            rgba[i][BCOMP] = lut[rgba[i][BCOMP] * 3 + 2];

-         }

-      }

-      else {

-         for (i = 0; i < n; i++) {

-            GLint jR = IROUND((GLfloat) rgba[i][RCOMP] * scale);

-            GLint jG = IROUND((GLfloat) rgba[i][GCOMP] * scale);

-            GLint jB = IROUND((GLfloat) rgba[i][BCOMP] * scale);

-            rgba[i][RCOMP] = lut[jR * 3 + 0];

-            rgba[i][GCOMP] = lut[jG * 3 + 1];

-            rgba[i][BCOMP] = lut[jB * 3 + 2];

-         }

-      }

-      break;

-   case GL_RGBA:

-      if (table->Size == 256) {

-         for (i = 0; i < n; i++) {

-            rgba[i][RCOMP] = lut[rgba[i][RCOMP] * 4 + 0];

-            rgba[i][GCOMP] = lut[rgba[i][GCOMP] * 4 + 1];

-            rgba[i][BCOMP] = lut[rgba[i][BCOMP] * 4 + 2];

-            rgba[i][ACOMP] = lut[rgba[i][ACOMP] * 4 + 3];

-         }

-      }

-      else {

-         for (i = 0; i < n; i++) {

-            GLint jR = IROUND((GLfloat) rgba[i][RCOMP] * scale);

-            GLint jG = IROUND((GLfloat) rgba[i][GCOMP] * scale);

-            GLint jB = IROUND((GLfloat) rgba[i][BCOMP] * scale);

-            GLint jA = IROUND((GLfloat) rgba[i][ACOMP] * scale);

-            CLAMPED_FLOAT_TO_CHAN(rgba[i][RCOMP], lut[jR * 4 + 0]);

-            CLAMPED_FLOAT_TO_CHAN(rgba[i][GCOMP], lut[jG * 4 + 1]);

-            CLAMPED_FLOAT_TO_CHAN(rgba[i][BCOMP], lut[jB * 4 + 2]);

-            CLAMPED_FLOAT_TO_CHAN(rgba[i][ACOMP], lut[jA * 4 + 3]);

-         }

-      }

-      break;

-   default:

-      _mesa_problem(NULL, "Bad format in _mesa_lookup_rgba_chan");

-      return;

-   }

-}

-

-

-

-/*

- * Map color indexes to float rgba values.

- */

-void

-_mesa_map_ci_to_rgba( const struct gl_context *ctx, GLuint n,

-                      const GLuint index[], GLfloat rgba[][4] )

-{

-   GLuint rmask = ctx->PixelMaps.ItoR.Size - 1;

-   GLuint gmask = ctx->PixelMaps.ItoG.Size - 1;

-   GLuint bmask = ctx->PixelMaps.ItoB.Size - 1;

-   GLuint amask = ctx->PixelMaps.ItoA.Size - 1;

-   const GLfloat *rMap = ctx->PixelMaps.ItoR.Map;

-   const GLfloat *gMap = ctx->PixelMaps.ItoG.Map;

-   const GLfloat *bMap = ctx->PixelMaps.ItoB.Map;

-   const GLfloat *aMap = ctx->PixelMaps.ItoA.Map;

-   GLuint i;

-   for (i=0;i<n;i++) {

-      rgba[i][RCOMP] = rMap[index[i] & rmask];

-      rgba[i][GCOMP] = gMap[index[i] & gmask];

-      rgba[i][BCOMP] = bMap[index[i] & bmask];

-      rgba[i][ACOMP] = aMap[index[i] & amask];

-   }

-}

-

-

-/**

- * Map ubyte color indexes to ubyte/RGBA values.

- */

-void

-_mesa_map_ci8_to_rgba8(const struct gl_context *ctx,

-                       GLuint n, const GLubyte index[],

-                       GLubyte rgba[][4])

-{

-   GLuint rmask = ctx->PixelMaps.ItoR.Size - 1;

-   GLuint gmask = ctx->PixelMaps.ItoG.Size - 1;

-   GLuint bmask = ctx->PixelMaps.ItoB.Size - 1;

-   GLuint amask = ctx->PixelMaps.ItoA.Size - 1;

-   const GLubyte *rMap = ctx->PixelMaps.ItoR.Map8;

-   const GLubyte *gMap = ctx->PixelMaps.ItoG.Map8;

-   const GLubyte *bMap = ctx->PixelMaps.ItoB.Map8;

-   const GLubyte *aMap = ctx->PixelMaps.ItoA.Map8;

-   GLuint i;

-   for (i=0;i<n;i++) {

-      rgba[i][RCOMP] = rMap[index[i] & rmask];

-      rgba[i][GCOMP] = gMap[index[i] & gmask];

-      rgba[i][BCOMP] = bMap[index[i] & bmask];

-      rgba[i][ACOMP] = aMap[index[i] & amask];

-   }

-}

-

-

-void

-_mesa_scale_and_bias_depth(const struct gl_context *ctx, GLuint n,

-                           GLfloat depthValues[])

-{

-   const GLfloat scale = ctx->Pixel.DepthScale;

-   const GLfloat bias = ctx->Pixel.DepthBias;

-   GLuint i;

-   for (i = 0; i < n; i++) {

-      GLfloat d = depthValues[i] * scale + bias;

-      depthValues[i] = CLAMP(d, 0.0F, 1.0F);

-   }

-}

-

-

-void

-_mesa_scale_and_bias_depth_uint(const struct gl_context *ctx, GLuint n,

-                                GLuint depthValues[])

-{

-   const GLdouble max = (double) 0xffffffff;

-   const GLdouble scale = ctx->Pixel.DepthScale;

-   const GLdouble bias = ctx->Pixel.DepthBias * max;

-   GLuint i;

-   for (i = 0; i < n; i++) {

-      GLdouble d = (GLdouble) depthValues[i] * scale + bias;

-      d = CLAMP(d, 0.0, max);

-      depthValues[i] = (GLuint) d;

-   }

-}

-

-/**

- * Apply various pixel transfer operations to an array of RGBA pixels

- * as indicated by the transferOps bitmask

- */

-void

-_mesa_apply_rgba_transfer_ops(struct gl_context *ctx, GLbitfield transferOps,

-                              GLuint n, GLfloat rgba[][4])

-{

-   /* scale & bias */

-   if (transferOps & IMAGE_SCALE_BIAS_BIT) {

-      _mesa_scale_and_bias_rgba(n, rgba,

-                                ctx->Pixel.RedScale, ctx->Pixel.GreenScale,

-                                ctx->Pixel.BlueScale, ctx->Pixel.AlphaScale,

-                                ctx->Pixel.RedBias, ctx->Pixel.GreenBias,

-                                ctx->Pixel.BlueBias, ctx->Pixel.AlphaBias);

-   }

-   /* color map lookup */

-   if (transferOps & IMAGE_MAP_COLOR_BIT) {

-      _mesa_map_rgba( ctx, n, rgba );

-   }

-

-   /* clamping to [0,1] */

-   if (transferOps & IMAGE_CLAMP_BIT) {

-      GLuint i;

-      for (i = 0; i < n; i++) {

-         rgba[i][RCOMP] = CLAMP(rgba[i][RCOMP], 0.0F, 1.0F);

-         rgba[i][GCOMP] = CLAMP(rgba[i][GCOMP], 0.0F, 1.0F);

-         rgba[i][BCOMP] = CLAMP(rgba[i][BCOMP], 0.0F, 1.0F);

-         rgba[i][ACOMP] = CLAMP(rgba[i][ACOMP], 0.0F, 1.0F);

-      }

-   }

-}

-

-

-/*

- * Apply color index shift and offset to an array of pixels.

- */

-void

-_mesa_shift_and_offset_ci(const struct gl_context *ctx,

-                          GLuint n, GLuint indexes[])

-{

-   GLint shift = ctx->Pixel.IndexShift;

-   GLint offset = ctx->Pixel.IndexOffset;

-   GLuint i;

-   if (shift > 0) {

-      for (i=0;i<n;i++) {

-         indexes[i] = (indexes[i] << shift) + offset;

-      }

-   }

-   else if (shift < 0) {

-      shift = -shift;

-      for (i=0;i<n;i++) {

-         indexes[i] = (indexes[i] >> shift) + offset;

-      }

-   }

-   else {

-      for (i=0;i<n;i++) {

-         indexes[i] = indexes[i] + offset;

-      }

-   }

-}

-

-

-

-/**

- * Apply color index shift, offset and table lookup to an array

- * of color indexes;

- */

-void

-_mesa_apply_ci_transfer_ops(const struct gl_context *ctx,

-                            GLbitfield transferOps,

-                            GLuint n, GLuint indexes[])

-{

-   if (transferOps & IMAGE_SHIFT_OFFSET_BIT) {

-      _mesa_shift_and_offset_ci(ctx, n, indexes);

-   }

-   if (transferOps & IMAGE_MAP_COLOR_BIT) {

-      const GLuint mask = ctx->PixelMaps.ItoI.Size - 1;

-      GLuint i;

-      for (i = 0; i < n; i++) {

-         const GLuint j = indexes[i] & mask;

-         indexes[i] = IROUND(ctx->PixelMaps.ItoI.Map[j]);

-      }

-   }

-}

-

-

-/**

- * Apply stencil index shift, offset and table lookup to an array

- * of stencil values.

- */

-void

-_mesa_apply_stencil_transfer_ops(const struct gl_context *ctx, GLuint n,

-                                 GLstencil stencil[])

-{

-   if (ctx->Pixel.IndexShift != 0 || ctx->Pixel.IndexOffset != 0) {

-      const GLint offset = ctx->Pixel.IndexOffset;

-      GLint shift = ctx->Pixel.IndexShift;

-      GLuint i;

-      if (shift > 0) {

-         for (i = 0; i < n; i++) {

-            stencil[i] = (stencil[i] << shift) + offset;

-         }

-      }

-      else if (shift < 0) {

-         shift = -shift;

-         for (i = 0; i < n; i++) {

-            stencil[i] = (stencil[i] >> shift) + offset;

-         }

-      }

-      else {

-         for (i = 0; i < n; i++) {

-            stencil[i] = stencil[i] + offset;

-         }

-      }

-   }

-   if (ctx->Pixel.MapStencilFlag) {

-      GLuint mask = ctx->PixelMaps.StoS.Size - 1;

-      GLuint i;

-      for (i = 0; i < n; i++) {

-         stencil[i] = (GLstencil)ctx->PixelMaps.StoS.Map[ stencil[i] & mask ];

-      }

-   }

-}

+/*
+ * Mesa 3-D graphics library
+ *
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ * Copyright (C) 2009-2010  VMware, Inc.  All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/**
+ * \file pixeltransfer.c
+ * Pixel transfer operations (scale, bias, table lookups, etc)
+ */
+
+
+#include "glheader.h"
+#include "colormac.h"
+#include "pixeltransfer.h"
+#include "imports.h"
+#include "mtypes.h"
+
+
+/*
+ * Apply scale and bias factors to an array of RGBA pixels.
+ */
+void
+_mesa_scale_and_bias_rgba(GLuint n, GLfloat rgba[][4],
+                          GLfloat rScale, GLfloat gScale,
+                          GLfloat bScale, GLfloat aScale,
+                          GLfloat rBias, GLfloat gBias,
+                          GLfloat bBias, GLfloat aBias)
+{
+   if (rScale != 1.0 || rBias != 0.0) {
+      GLuint i;
+      for (i = 0; i < n; i++) {
+         rgba[i][RCOMP] = rgba[i][RCOMP] * rScale + rBias;
+      }
+   }
+   if (gScale != 1.0 || gBias != 0.0) {
+      GLuint i;
+      for (i = 0; i < n; i++) {
+         rgba[i][GCOMP] = rgba[i][GCOMP] * gScale + gBias;
+      }
+   }
+   if (bScale != 1.0 || bBias != 0.0) {
+      GLuint i;
+      for (i = 0; i < n; i++) {
+         rgba[i][BCOMP] = rgba[i][BCOMP] * bScale + bBias;
+      }
+   }
+   if (aScale != 1.0 || aBias != 0.0) {
+      GLuint i;
+      for (i = 0; i < n; i++) {
+         rgba[i][ACOMP] = rgba[i][ACOMP] * aScale + aBias;
+      }
+   }
+}
+
+
+/*
+ * Apply pixel mapping to an array of floating point RGBA pixels.
+ */
+void
+_mesa_map_rgba( const struct gl_context *ctx, GLuint n, GLfloat rgba[][4] )
+{
+   const GLfloat rscale = (GLfloat) (ctx->PixelMaps.RtoR.Size - 1);
+   const GLfloat gscale = (GLfloat) (ctx->PixelMaps.GtoG.Size - 1);
+   const GLfloat bscale = (GLfloat) (ctx->PixelMaps.BtoB.Size - 1);
+   const GLfloat ascale = (GLfloat) (ctx->PixelMaps.AtoA.Size - 1);
+   const GLfloat *rMap = ctx->PixelMaps.RtoR.Map;
+   const GLfloat *gMap = ctx->PixelMaps.GtoG.Map;
+   const GLfloat *bMap = ctx->PixelMaps.BtoB.Map;
+   const GLfloat *aMap = ctx->PixelMaps.AtoA.Map;
+   GLuint i;
+   for (i=0;i<n;i++) {
+      GLfloat r = CLAMP(rgba[i][RCOMP], 0.0F, 1.0F);
+      GLfloat g = CLAMP(rgba[i][GCOMP], 0.0F, 1.0F);
+      GLfloat b = CLAMP(rgba[i][BCOMP], 0.0F, 1.0F);
+      GLfloat a = CLAMP(rgba[i][ACOMP], 0.0F, 1.0F);
+      rgba[i][RCOMP] = rMap[IROUND(r * rscale)];
+      rgba[i][GCOMP] = gMap[IROUND(g * gscale)];
+      rgba[i][BCOMP] = bMap[IROUND(b * bscale)];
+      rgba[i][ACOMP] = aMap[IROUND(a * ascale)];
+   }
+}
+
+/*
+ * Map color indexes to float rgba values.
+ */
+void
+_mesa_map_ci_to_rgba( const struct gl_context *ctx, GLuint n,
+                      const GLuint index[], GLfloat rgba[][4] )
+{
+   GLuint rmask = ctx->PixelMaps.ItoR.Size - 1;
+   GLuint gmask = ctx->PixelMaps.ItoG.Size - 1;
+   GLuint bmask = ctx->PixelMaps.ItoB.Size - 1;
+   GLuint amask = ctx->PixelMaps.ItoA.Size - 1;
+   const GLfloat *rMap = ctx->PixelMaps.ItoR.Map;
+   const GLfloat *gMap = ctx->PixelMaps.ItoG.Map;
+   const GLfloat *bMap = ctx->PixelMaps.ItoB.Map;
+   const GLfloat *aMap = ctx->PixelMaps.ItoA.Map;
+   GLuint i;
+   for (i=0;i<n;i++) {
+      rgba[i][RCOMP] = rMap[index[i] & rmask];
+      rgba[i][GCOMP] = gMap[index[i] & gmask];
+      rgba[i][BCOMP] = bMap[index[i] & bmask];
+      rgba[i][ACOMP] = aMap[index[i] & amask];
+   }
+}
+
+
+/**
+ * Map ubyte color indexes to ubyte/RGBA values.
+ */
+void
+_mesa_map_ci8_to_rgba8(const struct gl_context *ctx,
+                       GLuint n, const GLubyte index[],
+                       GLubyte rgba[][4])
+{
+   GLuint rmask = ctx->PixelMaps.ItoR.Size - 1;
+   GLuint gmask = ctx->PixelMaps.ItoG.Size - 1;
+   GLuint bmask = ctx->PixelMaps.ItoB.Size - 1;
+   GLuint amask = ctx->PixelMaps.ItoA.Size - 1;
+   const GLubyte *rMap = ctx->PixelMaps.ItoR.Map8;
+   const GLubyte *gMap = ctx->PixelMaps.ItoG.Map8;
+   const GLubyte *bMap = ctx->PixelMaps.ItoB.Map8;
+   const GLubyte *aMap = ctx->PixelMaps.ItoA.Map8;
+   GLuint i;
+   for (i=0;i<n;i++) {
+      rgba[i][RCOMP] = rMap[index[i] & rmask];
+      rgba[i][GCOMP] = gMap[index[i] & gmask];
+      rgba[i][BCOMP] = bMap[index[i] & bmask];
+      rgba[i][ACOMP] = aMap[index[i] & amask];
+   }
+}
+
+
+void
+_mesa_scale_and_bias_depth(const struct gl_context *ctx, GLuint n,
+                           GLfloat depthValues[])
+{
+   const GLfloat scale = ctx->Pixel.DepthScale;
+   const GLfloat bias = ctx->Pixel.DepthBias;
+   GLuint i;
+   for (i = 0; i < n; i++) {
+      GLfloat d = depthValues[i] * scale + bias;
+      depthValues[i] = CLAMP(d, 0.0F, 1.0F);
+   }
+}
+
+
+void
+_mesa_scale_and_bias_depth_uint(const struct gl_context *ctx, GLuint n,
+                                GLuint depthValues[])
+{
+   const GLdouble max = (double) 0xffffffff;
+   const GLdouble scale = ctx->Pixel.DepthScale;
+   const GLdouble bias = ctx->Pixel.DepthBias * max;
+   GLuint i;
+   for (i = 0; i < n; i++) {
+      GLdouble d = (GLdouble) depthValues[i] * scale + bias;
+      d = CLAMP(d, 0.0, max);
+      depthValues[i] = (GLuint) d;
+   }
+}
+
+/**
+ * Apply various pixel transfer operations to an array of RGBA pixels
+ * as indicated by the transferOps bitmask
+ */
+void
+_mesa_apply_rgba_transfer_ops(struct gl_context *ctx, GLbitfield transferOps,
+                              GLuint n, GLfloat rgba[][4])
+{
+   /* scale & bias */
+   if (transferOps & IMAGE_SCALE_BIAS_BIT) {
+      _mesa_scale_and_bias_rgba(n, rgba,
+                                ctx->Pixel.RedScale, ctx->Pixel.GreenScale,
+                                ctx->Pixel.BlueScale, ctx->Pixel.AlphaScale,
+                                ctx->Pixel.RedBias, ctx->Pixel.GreenBias,
+                                ctx->Pixel.BlueBias, ctx->Pixel.AlphaBias);
+   }
+   /* color map lookup */
+   if (transferOps & IMAGE_MAP_COLOR_BIT) {
+      _mesa_map_rgba( ctx, n, rgba );
+   }
+
+   /* clamping to [0,1] */
+   if (transferOps & IMAGE_CLAMP_BIT) {
+      GLuint i;
+      for (i = 0; i < n; i++) {
+         rgba[i][RCOMP] = CLAMP(rgba[i][RCOMP], 0.0F, 1.0F);
+         rgba[i][GCOMP] = CLAMP(rgba[i][GCOMP], 0.0F, 1.0F);
+         rgba[i][BCOMP] = CLAMP(rgba[i][BCOMP], 0.0F, 1.0F);
+         rgba[i][ACOMP] = CLAMP(rgba[i][ACOMP], 0.0F, 1.0F);
+      }
+   }
+}
+
+
+/*
+ * Apply color index shift and offset to an array of pixels.
+ */
+void
+_mesa_shift_and_offset_ci(const struct gl_context *ctx,
+                          GLuint n, GLuint indexes[])
+{
+   GLint shift = ctx->Pixel.IndexShift;
+   GLint offset = ctx->Pixel.IndexOffset;
+   GLuint i;
+   if (shift > 0) {
+      for (i=0;i<n;i++) {
+         indexes[i] = (indexes[i] << shift) + offset;
+      }
+   }
+   else if (shift < 0) {
+      shift = -shift;
+      for (i=0;i<n;i++) {
+         indexes[i] = (indexes[i] >> shift) + offset;
+      }
+   }
+   else {
+      for (i=0;i<n;i++) {
+         indexes[i] = indexes[i] + offset;
+      }
+   }
+}
+
+
+
+/**
+ * Apply color index shift, offset and table lookup to an array
+ * of color indexes;
+ */
+void
+_mesa_apply_ci_transfer_ops(const struct gl_context *ctx,
+                            GLbitfield transferOps,
+                            GLuint n, GLuint indexes[])
+{
+   if (transferOps & IMAGE_SHIFT_OFFSET_BIT) {
+      _mesa_shift_and_offset_ci(ctx, n, indexes);
+   }
+   if (transferOps & IMAGE_MAP_COLOR_BIT) {
+      const GLuint mask = ctx->PixelMaps.ItoI.Size - 1;
+      GLuint i;
+      for (i = 0; i < n; i++) {
+         const GLuint j = indexes[i] & mask;
+         indexes[i] = IROUND(ctx->PixelMaps.ItoI.Map[j]);
+      }
+   }
+}
+
+
+/**
+ * Apply stencil index shift, offset and table lookup to an array
+ * of stencil values.
+ */
+void
+_mesa_apply_stencil_transfer_ops(const struct gl_context *ctx, GLuint n,
+                                 GLstencil stencil[])
+{
+   if (ctx->Pixel.IndexShift != 0 || ctx->Pixel.IndexOffset != 0) {
+      const GLint offset = ctx->Pixel.IndexOffset;
+      GLint shift = ctx->Pixel.IndexShift;
+      GLuint i;
+      if (shift > 0) {
+         for (i = 0; i < n; i++) {
+            stencil[i] = (stencil[i] << shift) + offset;
+         }
+      }
+      else if (shift < 0) {
+         shift = -shift;
+         for (i = 0; i < n; i++) {
+            stencil[i] = (stencil[i] >> shift) + offset;
+         }
+      }
+      else {
+         for (i = 0; i < n; i++) {
+            stencil[i] = stencil[i] + offset;
+         }
+      }
+   }
+   if (ctx->Pixel.MapStencilFlag) {
+      GLuint mask = ctx->PixelMaps.StoS.Size - 1;
+      GLuint i;
+      for (i = 0; i < n; i++) {
+         stencil[i] = (GLstencil)ctx->PixelMaps.StoS.Map[ stencil[i] & mask ];
+      }
+   }
+}
diff --git a/mesalib/src/mesa/main/pixeltransfer.h b/mesalib/src/mesa/main/pixeltransfer.h
index c00da3f2a..8af2e9ee2 100644
--- a/mesalib/src/mesa/main/pixeltransfer.h
+++ b/mesalib/src/mesa/main/pixeltransfer.h
@@ -1,90 +1,81 @@
-/*

- * Mesa 3-D graphics library

- *

- * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.

- * Copyright (C) 2009-2010  VMware, Inc.  All Rights Reserved.

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * The above copyright notice and this permission notice shall be included

- * in all copies or substantial portions of the Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

- * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- */

-

-

-#ifndef PIXELTRANSFER_H

-#define PIXELTRANSFER_H

-

-

-#include "mtypes.h"

-

-

-extern void

-_mesa_scale_and_bias_rgba(GLuint n, GLfloat rgba[][4],

-                          GLfloat rScale, GLfloat gScale,

-                          GLfloat bScale, GLfloat aScale,

-                          GLfloat rBias, GLfloat gBias,

-                          GLfloat bBias, GLfloat aBias);

-

-extern void

-_mesa_map_rgba(const struct gl_context *ctx, GLuint n, GLfloat rgba[][4]);

-

-extern void

-_mesa_lookup_rgba_float(const struct gl_color_table *table,

-                        GLuint n, GLfloat rgba[][4]);

-

-extern void

-_mesa_lookup_rgba_ubyte(const struct gl_color_table *table,

-                        GLuint n, GLubyte rgba[][4]);

-

-

-extern void

-_mesa_map_ci_to_rgba(const struct gl_context *ctx,

-                     GLuint n, const GLuint index[], GLfloat rgba[][4]);

-

-

-extern void

-_mesa_map_ci8_to_rgba8(const struct gl_context *ctx,

-                       GLuint n, const GLubyte index[],

-                       GLubyte rgba[][4]);

-

-

-extern void

-_mesa_scale_and_bias_depth(const struct gl_context *ctx, GLuint n,

-                           GLfloat depthValues[]);

-

-extern void

-_mesa_scale_and_bias_depth_uint(const struct gl_context *ctx, GLuint n,

-                                GLuint depthValues[]);

-

-extern void

-_mesa_apply_rgba_transfer_ops(struct gl_context *ctx, GLbitfield transferOps,

-                              GLuint n, GLfloat rgba[][4]);

-

-extern void

-_mesa_shift_and_offset_ci(const struct gl_context *ctx,

-                          GLuint n, GLuint indexes[]);

-

-extern void

-_mesa_apply_ci_transfer_ops(const struct gl_context *ctx,

-                            GLbitfield transferOps,

-                            GLuint n, GLuint indexes[]);

-

-

-extern void

-_mesa_apply_stencil_transfer_ops(const struct gl_context *ctx, GLuint n,

-                                 GLstencil stencil[]);

-

-

-#endif

+/*
+ * Mesa 3-D graphics library
+ *
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ * Copyright (C) 2009-2010  VMware, Inc.  All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef PIXELTRANSFER_H
+#define PIXELTRANSFER_H
+
+
+#include "mtypes.h"
+
+
+extern void
+_mesa_scale_and_bias_rgba(GLuint n, GLfloat rgba[][4],
+                          GLfloat rScale, GLfloat gScale,
+                          GLfloat bScale, GLfloat aScale,
+                          GLfloat rBias, GLfloat gBias,
+                          GLfloat bBias, GLfloat aBias);
+
+extern void
+_mesa_map_rgba(const struct gl_context *ctx, GLuint n, GLfloat rgba[][4]);
+
+extern void
+_mesa_map_ci_to_rgba(const struct gl_context *ctx,
+                     GLuint n, const GLuint index[], GLfloat rgba[][4]);
+
+
+extern void
+_mesa_map_ci8_to_rgba8(const struct gl_context *ctx,
+                       GLuint n, const GLubyte index[],
+                       GLubyte rgba[][4]);
+
+
+extern void
+_mesa_scale_and_bias_depth(const struct gl_context *ctx, GLuint n,
+                           GLfloat depthValues[]);
+
+extern void
+_mesa_scale_and_bias_depth_uint(const struct gl_context *ctx, GLuint n,
+                                GLuint depthValues[]);
+
+extern void
+_mesa_apply_rgba_transfer_ops(struct gl_context *ctx, GLbitfield transferOps,
+                              GLuint n, GLfloat rgba[][4]);
+
+extern void
+_mesa_shift_and_offset_ci(const struct gl_context *ctx,
+                          GLuint n, GLuint indexes[]);
+
+extern void
+_mesa_apply_ci_transfer_ops(const struct gl_context *ctx,
+                            GLbitfield transferOps,
+                            GLuint n, GLuint indexes[]);
+
+
+extern void
+_mesa_apply_stencil_transfer_ops(const struct gl_context *ctx, GLuint n,
+                                 GLstencil stencil[]);
+
+
+#endif
diff --git a/mesalib/src/mesa/main/texformat.c b/mesalib/src/mesa/main/texformat.c
index 075c40c86..4f02720ce 100644
--- a/mesalib/src/mesa/main/texformat.c
+++ b/mesalib/src/mesa/main/texformat.c
@@ -197,13 +197,6 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat,
 	 RETURN_IF_SUPPORTED(MESA_FORMAT_I8);
 	 break;
 
-      case GL_COLOR_INDEX:
-      case GL_COLOR_INDEX1_EXT:
-      case GL_COLOR_INDEX2_EXT:
-      case GL_COLOR_INDEX4_EXT:
-      case GL_COLOR_INDEX12_EXT:
-      case GL_COLOR_INDEX16_EXT:
-      case GL_COLOR_INDEX8_EXT:
       default:
          ; /* fallthrough */
    }
diff --git a/mesalib/src/mesa/main/texgetimage.c b/mesalib/src/mesa/main/texgetimage.c
index 5374c1a1a..46e38d7bc 100644
--- a/mesalib/src/mesa/main/texgetimage.c
+++ b/mesalib/src/mesa/main/texgetimage.c
@@ -65,55 +65,6 @@ type_with_negative_values(GLenum type)
 

 

 /**

- * glGetTexImage for color index pixels.

- */

-static void

-get_tex_color_index(struct gl_context *ctx, GLuint dimensions,

-                    GLenum format, GLenum type, GLvoid *pixels,

-                    const struct gl_texture_image *texImage)

-{

-   const GLint width = texImage->Width;

-   const GLint height = texImage->Height;

-   const GLint depth = texImage->Depth;

-   const GLint rowstride = texImage->RowStride;

-   const GLuint indexBits =

-      _mesa_get_format_bits(texImage->TexFormat, GL_TEXTURE_INDEX_SIZE_EXT);

-   const GLbitfield transferOps = 0x0;

-   GLint img, row, col;

-

-   for (img = 0; img < depth; img++) {

-      for (row = 0; row < height; row++) {

-         GLuint indexRow[MAX_WIDTH] = { 0 };

-         void *dest = _mesa_image_address(dimensions, &ctx->Pack, pixels,

-                                          width, height, format, type,

-                                          img, row, 0);

-         assert(dest);

-

-         if (indexBits == 8) {

-            const GLubyte *src = (const GLubyte *) texImage->Data;

-            src += rowstride * (img * height + row);

-            for (col = 0; col < width; col++) {

-               indexRow[col] = src[col];

-            }

-         }

-         else if (indexBits == 16) {

-            const GLushort *src = (const GLushort *) texImage->Data;

-            src += rowstride * (img * height + row);

-            for (col = 0; col < width; col++) {

-               indexRow[col] = src[col];

-            }

-         }

-         else {

-            _mesa_problem(ctx, "Color index problem in _mesa_GetTexImage");

-         }

-         _mesa_pack_index_span(ctx, width, type, dest,

-                               indexRow, &ctx->Pack, transferOps);

-      }

-   }

-}

-

-

-/**

  * glGetTexImage for depth/Z pixels.

  */

 static void

@@ -457,9 +408,6 @@ _mesa_get_teximage(struct gl_context *ctx, GLenum target, GLint level,
    if (get_tex_memcpy(ctx, format, type, pixels, texObj, texImage)) {

       /* all done */

    }

-   else if (format == GL_COLOR_INDEX) {

-      get_tex_color_index(ctx, dimensions, format, type, pixels, texImage);

-   }

    else if (format == GL_DEPTH_COMPONENT) {

       get_tex_depth(ctx, dimensions, format, type, pixels, texImage);

    }

@@ -567,16 +515,12 @@ getteximage_error_check(struct gl_context *ctx, GLenum target, GLint level,
    }

 

    if (_mesa_components_in_format(format) <= 0 ||

-       format == GL_STENCIL_INDEX) {

+       format == GL_STENCIL_INDEX ||

+       format == GL_COLOR_INDEX) {

       _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexImage(format)" );

       return GL_TRUE;

    }

 

-   if (!ctx->Extensions.EXT_paletted_texture && _mesa_is_index_format(format)) {

-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(format)");

-      return GL_TRUE;

-   }

-

    if (!ctx->Extensions.ARB_depth_texture && _mesa_is_depth_format(format)) {

       _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(format)");

       return GL_TRUE;

@@ -615,17 +559,10 @@ getteximage_error_check(struct gl_context *ctx, GLenum target, GLint level,
    baseFormat = _mesa_get_format_base_format(texImage->TexFormat);

       

    /* Make sure the requested image format is compatible with the

-    * texture's format.  Note that a color index texture can be converted

-    * to RGBA so that combo is allowed.

+    * texture's format.

     */

    if (_mesa_is_color_format(format)

-       && !_mesa_is_color_format(baseFormat)

-       && !_mesa_is_index_format(baseFormat)) {

-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexImage(format mismatch)");

-      return GL_TRUE;

-   }

-   else if (_mesa_is_index_format(format)

-            && !_mesa_is_index_format(baseFormat)) {

+       && !_mesa_is_color_format(baseFormat)) {

       _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexImage(format mismatch)");

       return GL_TRUE;

    }

diff --git a/mesalib/src/mesa/main/teximage.c b/mesalib/src/mesa/main/teximage.c
index 1aae03b5f..21bea6587 100644
--- a/mesalib/src/mesa/main/teximage.c
+++ b/mesalib/src/mesa/main/teximage.c
@@ -159,21 +159,6 @@ _mesa_base_tex_format( struct gl_context *ctx, GLint internalFormat )
       }

    }

 

-   if (ctx->Extensions.EXT_paletted_texture) {

-      switch (internalFormat) {

-         case GL_COLOR_INDEX:

-         case GL_COLOR_INDEX1_EXT:

-         case GL_COLOR_INDEX2_EXT:

-         case GL_COLOR_INDEX4_EXT:

-         case GL_COLOR_INDEX8_EXT:

-         case GL_COLOR_INDEX12_EXT:

-         case GL_COLOR_INDEX16_EXT:

-            return GL_COLOR_INDEX;

-         default:

-            ; /* fallthrough */

-      }

-   }

-

    if (ctx->Extensions.ARB_depth_texture) {

       switch (internalFormat) {

          case GL_DEPTH_COMPONENT:

@@ -1554,7 +1539,13 @@ texture_error_check( struct gl_context *ctx,
    const GLenum proxyTarget = get_proxy_target(target);

    const GLboolean isProxy = target == proxyTarget;

    GLboolean sizeOK = GL_TRUE;

-   GLboolean colorFormat, indexFormat;

+   GLboolean colorFormat;

+

+   /* Even though there are no color-index textures, we still have to support

+    * uploading color-index data and remapping it to RGB via the

+    * GL_PIXEL_MAP_I_TO_[RGBA] tables.

+    */

+   const GLboolean indexFormat = (format == GL_COLOR_INDEX);

 

    /* Basic level check (more checking in ctx->Driver.TestProxyTexImage) */

    if (level < 0 || level >= MAX_TEXTURE_LEVELS) {

@@ -1635,9 +1626,7 @@ texture_error_check( struct gl_context *ctx,
 

    /* make sure internal format and format basically agree */

    colorFormat = _mesa_is_color_format(format);

-   indexFormat = _mesa_is_index_format(format);

    if ((_mesa_is_color_format(internalFormat) && !colorFormat && !indexFormat) ||

-       (_mesa_is_index_format(internalFormat) && !indexFormat) ||

        (_mesa_is_depth_format(internalFormat) != _mesa_is_depth_format(format)) ||

        (_mesa_is_ycbcr_format(internalFormat) != _mesa_is_ycbcr_format(format)) ||

        (_mesa_is_depthstencil_format(internalFormat) != _mesa_is_depthstencil_format(format)) ||

diff --git a/mesalib/src/mesa/main/texobj.c b/mesalib/src/mesa/main/texobj.c
index 72ea03044..0a940d72d 100644
--- a/mesalib/src/mesa/main/texobj.c
+++ b/mesalib/src/mesa/main/texobj.c
@@ -198,8 +198,6 @@ _mesa_delete_texture_object(struct gl_context *ctx,
     */

    texObj->Target = 0x99;

 

-   _mesa_free_colortable_data(&texObj->Palette);

-

    /* free the texture images */

    for (face = 0; face < 6; face++) {

       for (i = 0; i < MAX_TEXTURE_LEVELS; i++) {

@@ -258,7 +256,6 @@ _mesa_copy_texture_object( struct gl_texture_object *dest,
    dest->_MaxLevel = src->_MaxLevel;

    dest->_MaxLambda = src->_MaxLambda;

    dest->GenerateMipmap = src->GenerateMipmap;

-   dest->Palette = src->Palette;

    dest->_Complete = src->_Complete;

    COPY_4V(dest->Swizzle, src->Swizzle);

    dest->_Swizzle = src->_Swizzle;

diff --git a/mesalib/src/mesa/main/texparam.c b/mesalib/src/mesa/main/texparam.c
index 432427bbb..bdd1f3fd8 100644
--- a/mesalib/src/mesa/main/texparam.c
+++ b/mesalib/src/mesa/main/texparam.c
@@ -987,12 +987,6 @@ _mesa_GetTexLevelParameteriv( GLenum target, GLint level,
             }

          }

          break;

-      case GL_TEXTURE_INDEX_SIZE_EXT:

-         if (img->_BaseFormat == GL_COLOR_INDEX)

-            *params = _mesa_get_format_bits(texFormat, pname);

-         else

-            *params = 0;

-         break;

       case GL_TEXTURE_DEPTH_SIZE_ARB:

          if (!ctx->Extensions.ARB_depth_texture)

             goto invalid_pname;

diff --git a/mesalib/src/mesa/main/texstate.c b/mesalib/src/mesa/main/texstate.c
index 29b50637a..b4a119215 100644
--- a/mesalib/src/mesa/main/texstate.c
+++ b/mesalib/src/mesa/main/texstate.c
@@ -75,7 +75,6 @@ _mesa_copy_texture_state( const struct gl_context *src, struct gl_context *dst )
    dst->Texture._GenFlags = src->Texture._GenFlags;

    dst->Texture._TexGenEnabled = src->Texture._TexGenEnabled;

    dst->Texture._TexMatEnabled = src->Texture._TexMatEnabled;

-   dst->Texture.SharedPalette = src->Texture.SharedPalette;

 

    /* per-unit state */

    for (u = 0; u < src->Const.MaxCombinedTextureImageUnits; u++) {

@@ -402,11 +401,8 @@ update_tex_combine(struct gl_context *ctx, struct gl_texture_unit *texUnit)
    else {

       const struct gl_texture_object *texObj = texUnit->_Current;

       GLenum format = texObj->Image[0][texObj->BaseLevel]->_BaseFormat;

-      if (format == GL_COLOR_INDEX) {

-         format = GL_RGBA;  /* a bit of a hack */

-      }

-      else if (format == GL_DEPTH_COMPONENT ||

-               format == GL_DEPTH_STENCIL_EXT) {

+

+      if (format == GL_DEPTH_COMPONENT || format == GL_DEPTH_STENCIL_EXT) {

          format = texObj->Sampler.DepthMode;

       }

       calculate_derived_texenv(&texUnit->_EnvMode, texUnit->EnvMode, format);

@@ -778,8 +774,6 @@ _mesa_init_texture(struct gl_context *ctx)
    /* Texture group */

    ctx->Texture.CurrentUnit = 0;      /* multitexture */

    ctx->Texture._EnabledUnits = 0x0;

-   ctx->Texture.SharedPalette = GL_FALSE;

-   _mesa_init_colortable(&ctx->Texture.Palette);

 

    for (u = 0; u < Elements(ctx->Texture.Unit); u++)

       init_texture_unit(ctx, u);

diff --git a/mesalib/src/mesa/main/texstore.c b/mesalib/src/mesa/main/texstore.c
index e9915a7f0..2cdc8ed67 100644
--- a/mesalib/src/mesa/main/texstore.c
+++ b/mesalib/src/mesa/main/texstore.c
@@ -340,7 +340,6 @@ _mesa_make_temp_float_image(struct gl_context *ctx, GLuint dims,
           logicalBaseFormat == GL_LUMINANCE ||
           logicalBaseFormat == GL_ALPHA ||
           logicalBaseFormat == GL_INTENSITY ||
-          logicalBaseFormat == GL_COLOR_INDEX ||
           logicalBaseFormat == GL_DEPTH_COMPONENT);
 
    ASSERT(textureBaseFormat == GL_RGBA ||
@@ -351,7 +350,6 @@ _mesa_make_temp_float_image(struct gl_context *ctx, GLuint dims,
           textureBaseFormat == GL_LUMINANCE ||
           textureBaseFormat == GL_ALPHA ||
           textureBaseFormat == GL_INTENSITY ||
-          textureBaseFormat == GL_COLOR_INDEX ||
           textureBaseFormat == GL_DEPTH_COMPONENT);
 
    tempImage = (GLfloat *) malloc(srcWidth * srcHeight * srcDepth
diff --git a/mesalib/src/mesa/main/varray.c b/mesalib/src/mesa/main/varray.c
index 9c9d0d66e..13b3405e5 100644
--- a/mesalib/src/mesa/main/varray.c
+++ b/mesalib/src/mesa/main/varray.c
@@ -160,10 +160,17 @@ update_array(struct gl_context *ctx,
    if (ctx->Extensions.EXT_vertex_array_bgra &&
        sizeMax == BGRA_OR_4 &&
        size == GL_BGRA) {
-      if (type != GL_UNSIGNED_BYTE &&
-         (ctx->Extensions.ARB_vertex_type_2_10_10_10_rev &&
-          (type != GL_UNSIGNED_INT_2_10_10_10_REV &&
-           type != GL_INT_2_10_10_10_REV))) {
+      GLboolean bgra_error = GL_FALSE;
+
+      if (ctx->Extensions.ARB_vertex_type_2_10_10_10_rev) {
+         if (type != GL_UNSIGNED_INT_2_10_10_10_REV &&
+             type != GL_INT_2_10_10_10_REV &&
+             type != GL_UNSIGNED_BYTE)
+            bgra_error = GL_TRUE;
+      } else if (type != GL_UNSIGNED_BYTE)
+         bgra_error = GL_TRUE;
+
+      if (bgra_error) {
          _mesa_error(ctx, GL_INVALID_VALUE, "%s(GL_BGRA/GLubyte)", func);
          return;
       }