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

1 files changed, 2 insertions, 8 deletions

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);