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

5 files changed, 281 insertions, 111 deletions

diff --git a/mesalib/src/mesa/main/compiler.h b/mesalib/src/mesa/main/compiler.h
index b5cac72d3..f46f72352 100644
--- a/mesalib/src/mesa/main/compiler.h
+++ b/mesalib/src/mesa/main/compiler.h
@@ -117,26 +117,28 @@ extern "C" {
 /**

  * Function inlining

  */

-#if defined(__GNUC__)

-#  define INLINE __inline__

-#elif defined(__MSC__)

-#  define INLINE __inline

-#elif defined(_MSC_VER)

-#  define INLINE __inline

-#elif defined(__ICL)

-#  define INLINE __inline

-#elif defined(__INTEL_COMPILER)

-#  define INLINE inline

-#elif defined(__WATCOMC__) && (__WATCOMC__ >= 1100)

-#  define INLINE __inline

-#elif defined(__SUNPRO_C) && defined(__C99FEATURES__)

-#  define INLINE inline

-#  define __inline inline

-#  define __inline__ inline

-#elif (__STDC_VERSION__ >= 199901L) /* C99 */

-#  define INLINE inline

-#else

-#  define INLINE

+#ifndef INLINE

+#  if defined(__GNUC__)

+#    define INLINE __inline__

+#  elif defined(__MSC__)

+#    define INLINE __inline

+#  elif defined(_MSC_VER)

+#    define INLINE __inline

+#  elif defined(__ICL)

+#    define INLINE __inline

+#  elif defined(__INTEL_COMPILER)

+#    define INLINE inline

+#  elif defined(__WATCOMC__) && (__WATCOMC__ >= 1100)

+#    define INLINE __inline

+#  elif defined(__SUNPRO_C) && defined(__C99FEATURES__)

+#    define INLINE inline

+#    define __inline inline

+#    define __inline__ inline

+#  elif (__STDC_VERSION__ >= 199901L) /* C99 */

+#    define INLINE inline

+#  else

+#    define INLINE

+#  endif

 #endif

 

 

diff --git a/mesalib/src/mesa/main/get.c b/mesalib/src/mesa/main/get.c
index 15c808194..d6b203a68 100644
--- a/mesalib/src/mesa/main/get.c
+++ b/mesalib/src/mesa/main/get.c
@@ -1569,11 +1569,11 @@ find_custom_value(struct gl_context *ctx, const struct value_desc *d, union valu
       break;

 

    case GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB:

-      v->value_int = _mesa_get_compressed_formats(ctx, NULL, GL_FALSE);

+      v->value_int = _mesa_get_compressed_formats(ctx, NULL);

       break;

    case GL_COMPRESSED_TEXTURE_FORMATS_ARB:

       v->value_int_n.n = 

-	 _mesa_get_compressed_formats(ctx, v->value_int_n.ints, GL_FALSE);

+	 _mesa_get_compressed_formats(ctx, v->value_int_n.ints);

       ASSERT(v->value_int_n.n <= 100);

       break;

 

diff --git a/mesalib/src/mesa/main/texcompress.c b/mesalib/src/mesa/main/texcompress.c
index 59603e81e..532f79fd5 100644
--- a/mesalib/src/mesa/main/texcompress.c
+++ b/mesalib/src/mesa/main/texcompress.c
@@ -40,19 +40,192 @@
 

 

 /**

+ * Get the GL base format of a specified GL compressed texture format

+ *

+ * From page 232 of the OpenGL 3.3 (Compatiblity Profile) spec:

+ *

+ *     "Compressed Internal Format      Base Internal Format    Type

+ *     ---------------------------     --------------------    ---------

+ *     COMPRESSED_ALPHA                ALPHA                   Generic

+ *     COMPRESSED_LUMINANCE            LUMINANCE               Generic

+ *     COMPRESSED_LUMINANCE_ALPHA      LUMINANCE_ALPHA         Generic

+ *     COMPRESSED_INTENSITY            INTENSITY               Generic

+ *     COMPRESSED_RED                  RED                     Generic

+ *     COMPRESSED_RG                   RG                      Generic

+ *     COMPRESSED_RGB                  RGB                     Generic

+ *     COMPRESSED_RGBA                 RGBA                    Generic

+ *     COMPRESSED_SRGB                 RGB                     Generic

+ *     COMPRESSED_SRGB_ALPHA           RGBA                    Generic

+ *     COMPRESSED_SLUMINANCE           LUMINANCE               Generic

+ *     COMPRESSED_SLUMINANCE_ALPHA     LUMINANCE_ALPHA         Generic

+ *     COMPRESSED_RED_RGTC1            RED                     Specific

+ *     COMPRESSED_SIGNED_RED_RGTC1     RED                     Specific

+ *     COMPRESSED_RG_RGTC2             RG                      Specific

+ *     COMPRESSED_SIGNED_RG_RGTC2      RG                      Specific"

+ *

+ * \return

+ * The base format of \c format if \c format is a compressed format (either

+ * generic or specific.  Otherwise 0 is returned.

+ */

+GLenum

+_mesa_gl_compressed_format_base_format(GLenum format)

+{

+   switch (format) {

+   case GL_COMPRESSED_RED:

+   case GL_COMPRESSED_RED_RGTC1:

+   case GL_COMPRESSED_SIGNED_RED_RGTC1:

+      return GL_RED;

+

+   case GL_COMPRESSED_RG:

+   case GL_COMPRESSED_RG_RGTC2:

+   case GL_COMPRESSED_SIGNED_RG_RGTC2:

+      return GL_RG;

+

+   case GL_COMPRESSED_RGB:

+   case GL_COMPRESSED_SRGB:

+   case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:

+   case GL_COMPRESSED_RGB_FXT1_3DFX:

+   case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT:

+      return GL_RGB;

+

+   case GL_COMPRESSED_RGBA:

+   case GL_COMPRESSED_SRGB_ALPHA:

+   case GL_COMPRESSED_RGBA_BPTC_UNORM_ARB:

+   case GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_ARB:

+   case GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_ARB:

+   case GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_ARB:

+   case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:

+   case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:

+   case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:

+   case GL_COMPRESSED_RGBA_FXT1_3DFX:

+   case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT:

+   case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT:

+   case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT:

+      return GL_RGBA;

+

+   case GL_COMPRESSED_ALPHA:

+      return GL_ALPHA;

+

+   case GL_COMPRESSED_LUMINANCE:

+   case GL_COMPRESSED_SLUMINANCE:

+   case GL_COMPRESSED_LUMINANCE_LATC1_EXT:

+   case GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT:

+      return GL_LUMINANCE;

+

+   case GL_COMPRESSED_LUMINANCE_ALPHA:

+   case GL_COMPRESSED_SLUMINANCE_ALPHA:

+   case GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT:

+   case GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT:

+   case GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI:

+      return GL_LUMINANCE_ALPHA;

+

+   case GL_COMPRESSED_INTENSITY:

+      return GL_INTENSITY;

+

+   default:

+      return 0;

+   }

+}

+

+/**

  * Return list of (and count of) all specific texture compression

  * formats that are supported.

  *

+ * Some formats are \b not returned by this function.  The

+ * \c GL_COMPRESSED_TEXTURE_FORMATS query only returns formats that are

+ * "suitable for general-purpose usage."  All texture compression extensions

+ * have taken this to mean either linear RGB or linear RGBA.

+ *

+ * The GL_ARB_texture_compress_rgtc spec says:

+ *

+ *    "19) Should the GL_NUM_COMPRESSED_TEXTURE_FORMATS and

+ *        GL_COMPRESSED_TEXTURE_FORMATS queries return the RGTC formats?

+ *

+ *        RESOLVED:  No.

+ *

+ *        The OpenGL 2.1 specification says "The only values returned

+ *        by this query [GL_COMPRESSED_TEXTURE_FORMATS"] are those

+ *        corresponding to formats suitable for general-purpose usage.

+ *        The renderer will not enumerate formats with restrictions that

+ *        need to be specifically understood prior to use."

+ *

+ *        Compressed textures with just red or red-green components are

+ *        not general-purpose so should not be returned by these queries

+ *        because they have restrictions.

+ *

+ *        Applications that seek to use the RGTC formats should do so

+ *        by looking for this extension's name in the string returned by

+ *        glGetString(GL_EXTENSIONS) rather than

+ *        what GL_NUM_COMPRESSED_TEXTURE_FORMATS and

+ *        GL_COMPRESSED_TEXTURE_FORMATS return."

+ *

+ * There is nearly identical wording in the GL_EXT_texture_compression_rgtc

+ * spec.

+ *

+ * The GL_EXT_texture_rRGB spec says:

+ *

+ *    "22) Should the new COMPRESSED_SRGB_* formats be listed in an

+ *        implementation's GL_COMPRESSED_TEXTURE_FORMATS list?

+ *

+ *        RESOLVED:  No.  Section 3.8.1 says formats listed by

+ *        GL_COMPRESSED_TEXTURE_FORMATS are "suitable for general-purpose

+ *        usage."  The non-linear distribution of red, green, and

+ *        blue for these sRGB compressed formats makes them not really

+ *        general-purpose."

+ *

+ * The GL_EXT_texture_compression_latc spec says:

+ *

+ *    "16) Should the GL_NUM_COMPRESSED_TEXTURE_FORMATS and

+ *        GL_COMPRESSED_TEXTURE_FORMATS queries return the LATC formats?

+ *

+ *        RESOLVED:  No.

+ *

+ *        The OpenGL 2.1 specification says "The only values returned

+ *        by this query [GL_COMPRESSED_TEXTURE_FORMATS"] are those

+ *        corresponding to formats suitable for general-purpose usage.

+ *        The renderer will not enumerate formats with restrictions that

+ *        need to be specifically understood prior to use."

+ *

+ *        Historically, OpenGL implementation have advertised the RGB and

+ *        RGBA versions of the S3TC extensions compressed format tokens

+ *        through this mechanism.

+ *

+ *        The specification is not sufficiently clear about what "suitable

+ *        for general-purpose usage" means.  Historically that seems to mean

+ *        unsigned RGB or unsigned RGBA.  The DXT1 format supporting alpha

+ *        (GL_COMPRESSED_RGBA_S3TC_DXT1_EXT) is not exposed in the list (at

+ *        least for NVIDIA drivers) because the alpha is always 1.0 expect

+ *        when it is 0.0 when RGB is required to be black.  NVIDIA's even

+ *        limits itself to true linear RGB or RGBA formats, specifically

+ *        not including EXT_texture_sRGB's sRGB S3TC compressed formats.

+ *

+ *        Adding luminance and luminance-alpha texture formats (and

+ *        certainly signed versions of luminance and luminance-alpha

+ *        formats!) invites potential comptaibility problems with old

+ *        applications using this mechanism since old applications are

+ *        unlikely to expect non-RGB or non-RGBA formats to be advertised

+ *        through this mechanism.  However no specific misinteractions

+ *        with old applications is known.

+ *

+ *        Applications that seek to use the LATC formats should do so

+ *        by looking for this extension's name in the string returned by

+ *        glGetString(GL_EXTENSIONS) rather than

+ *        what GL_NUM_COMPRESSED_TEXTURE_FORMATS and

+ *        GL_COMPRESSED_TEXTURE_FORMATS return."

+ *

+ * There is no formal spec for GL_ATI_texture_compression_3dc.  Since the

+ * formats added by this extension are luminance-alpha formats, it is

+ * reasonable to expect them to follow the same rules as

+ * GL_EXT_texture_compression_latc.  At the very least, Catalyst 11.6 does not

+ * expose the 3dc formats through this mechanism.

+ *

  * \param ctx  the GL context

  * \param formats  the resulting format list (may be NULL).

- * \param all  if true return all formats, even those with  some kind

- *             of restrictions/limitations (See GL_ARB_texture_compression

- *             spec for more info).

  *

  * \return number of formats.

  */

 GLuint

-_mesa_get_compressed_formats(struct gl_context *ctx, GLint *formats, GLboolean all)

+_mesa_get_compressed_formats(struct gl_context *ctx, GLint *formats)

 {

    GLuint n = 0;

    if (ctx->Extensions.TDFX_texture_compression_FXT1) {

@@ -64,24 +237,15 @@ _mesa_get_compressed_formats(struct gl_context *ctx, GLint *formats, GLboolean a
          n += 2;

       }

    }

-   /* don't return RGTC - ARB_texture_compression_rgtc query 19 */

+

    if (ctx->Extensions.EXT_texture_compression_s3tc) {

       if (formats) {

          formats[n++] = GL_COMPRESSED_RGB_S3TC_DXT1_EXT;

-         /* This format has some restrictions/limitations and so should

-          * not be returned via the GL_COMPRESSED_TEXTURE_FORMATS query.

-          * Specifically, all transparent pixels become black.  NVIDIA

-          * omits this format too.

-          */

-         if (all)

-             formats[n++] = GL_COMPRESSED_RGBA_S3TC_DXT1_EXT;

          formats[n++] = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT;

          formats[n++] = GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;

       }

       else {

          n += 3;

-         if (all)

-             n += 1;

       }

    }

    if (ctx->Extensions.S3_s3tc) {

@@ -95,19 +259,6 @@ _mesa_get_compressed_formats(struct gl_context *ctx, GLint *formats, GLboolean a
          n += 4;

       }

    }

-#if FEATURE_EXT_texture_sRGB

-   if (ctx->Extensions.EXT_texture_sRGB) {

-      if (formats) {

-         formats[n++] = GL_COMPRESSED_SRGB_S3TC_DXT1_EXT;

-         formats[n++] = GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT;

-         formats[n++] = GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT;

-         formats[n++] = GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT;

-      }

-      else {

-         n += 4;

-      }

-   }

-#endif /* FEATURE_EXT_texture_sRGB */

    return n;

 

 #if FEATURE_ES1 || FEATURE_ES2

diff --git a/mesalib/src/mesa/main/texcompress.h b/mesalib/src/mesa/main/texcompress.h
index fd42f6402..375cf90c8 100644
--- a/mesalib/src/mesa/main/texcompress.h
+++ b/mesalib/src/mesa/main/texcompress.h
@@ -1,59 +1,62 @@
-/*

- * Mesa 3-D graphics library

- * Version:  6.5.1

- *

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

-#define TEXCOMPRESS_H

-

-#include "formats.h"

-#include "glheader.h"

-#include "mfeatures.h"

-

-struct gl_context;

-

-#if _HAVE_FULL_GL

-

-extern GLuint

-_mesa_get_compressed_formats(struct gl_context *ctx, GLint *formats, GLboolean all);

-

-extern gl_format

-_mesa_glenum_to_compressed_format(GLenum format);

-

-extern GLenum

-_mesa_compressed_format_to_glenum(struct gl_context *ctx, GLuint mesaFormat);

-

-extern GLubyte *

-_mesa_compressed_image_address(GLint col, GLint row, GLint img,

-                               gl_format mesaFormat,

-                               GLsizei width, const GLubyte *image);

-

-#else /* _HAVE_FULL_GL */

-

-/* no-op macros */

-#define _mesa_get_compressed_formats( c, f ) 0

-#define _mesa_compressed_image_address(c, r, i, f, w, i2 ) 0

-#define _mesa_compress_teximage( c, w, h, sF, s, sRS, dF, d, drs ) ((void)0)

-

-#endif /* _HAVE_FULL_GL */

-

-#endif /* TEXCOMPRESS_H */

+/*
+ * Mesa 3-D graphics library
+ * Version:  6.5.1
+ *
+ * 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 TEXCOMPRESS_H
+#define TEXCOMPRESS_H
+
+#include "formats.h"
+#include "glheader.h"
+#include "mfeatures.h"
+
+struct gl_context;
+
+#if _HAVE_FULL_GL
+
+extern GLenum
+_mesa_gl_compressed_format_base_format(GLenum format);
+
+extern GLuint
+_mesa_get_compressed_formats(struct gl_context *ctx, GLint *formats);
+
+extern gl_format
+_mesa_glenum_to_compressed_format(GLenum format);
+
+extern GLenum
+_mesa_compressed_format_to_glenum(struct gl_context *ctx, GLuint mesaFormat);
+
+extern GLubyte *
+_mesa_compressed_image_address(GLint col, GLint row, GLint img,
+                               gl_format mesaFormat,
+                               GLsizei width, const GLubyte *image);
+
+#else /* _HAVE_FULL_GL */
+
+/* no-op macros */
+#define _mesa_get_compressed_formats( c, f ) 0
+#define _mesa_compressed_image_address(c, r, i, f, w, i2 ) 0
+#define _mesa_compress_teximage( c, w, h, sF, s, sRS, dF, d, drs ) ((void)0)
+
+#endif /* _HAVE_FULL_GL */
+
+#endif /* TEXCOMPRESS_H */
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;