Merge remote-tracking branch 'origin/released'

Conflicts:
	libX11/specs/libX11/CH11.xml
	mesalib/src/glsl/main.cpp
	mesalib/src/mesa/main/compiler.h
	mesalib/src/mesa/main/get.c
	mesalib/src/mesa/main/texcompress.c
	mesalib/src/mesa/main/texparam.c
	mesalib/src/mesa/program/ir_to_mesa.cpp
	mesalib/src/mesa/program/prog_optimize.c
	pixman/pixman/pixman-fast-path.c
	pixman/pixman/pixman-fast-path.h
	xorg-server/hw/xquartz/GL/indirect.c
	xorg-server/hw/xquartz/X11Application.h
	xorg-server/hw/xquartz/X11Application.m
	xorg-server/hw/xquartz/bundle/Resources/French.lproj/locversion.plist
	xorg-server/hw/xquartz/bundle/Resources/French.lproj/main.nib/designable.nib
	xorg-server/hw/xquartz/bundle/Resources/German.lproj/locversion.plist
	xorg-server/hw/xquartz/bundle/Resources/German.lproj/main.nib/designable.nib
	xorg-server/hw/xquartz/bundle/Resources/Japanese.lproj/locversion.plist
	xorg-server/hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/designable.nib
	xorg-server/hw/xquartz/darwinEvents.c
	xorg-server/hw/xquartz/darwinEvents.h
	xorg-server/hw/xquartz/man/Xquartz.man
	xorg-server/hw/xquartz/xpr/dri.c
	xorg-server/xkeyboard-config/symbols/ee

1 files changed, 17 insertions, 3 deletions

diff --git a/mesalib/src/mesa/main/texparam.c b/mesalib/src/mesa/main/texparam.c
index 545c44ab9..f62745770 100644
--- a/mesalib/src/mesa/main/texparam.c
+++ b/mesalib/src/mesa/main/texparam.c
@@ -915,9 +915,23 @@ _mesa_GetTexLevelParameteriv( GLenum target, GLint level,
             *params = _mesa_compressed_format_to_glenum(ctx, texFormat);

          }

          else {

-            /* return the user's requested internal format */

-            *params = img->InternalFormat;

-         }

+	    /* If the true internal format is not compressed but the user

+	     * requested a generic compressed format, we have to return the

+	     * generic base format that matches.

+	     *

+	     * From page 119 (page 129 of the PDF) of the OpenGL 1.3 spec:

+	     *

+	     *     "If no specific compressed format is available,

+	     *     internalformat is instead replaced by the corresponding base

+	     *     internal format."

+	     *

+	     * Otherwise just return the user's requested internal format

+	     */

+	    const GLenum f =

+	       _mesa_gl_compressed_format_base_format(img->InternalFormat);

+

+	    *params = (f != 0) ? f : img->InternalFormat;

+	 }

          break;

       case GL_TEXTURE_BORDER:

          *params = img->Border;