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, 0 insertions, 6 deletions

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;