Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/src/mesa/SConscript
	mesalib/src/mesa/drivers/common/driverfuncs.c
	mesalib/src/mesa/main/texgetimage.c
	mesalib/src/mesa/sources.mak
	mesalib/src/mesa/swrast/s_texrender.c
	mesalib/src/mesa/vbo/vbo_exec_array.c
	xorg-server/xkeyboard-config/configure.in

1 files changed, 14 insertions, 14 deletions

diff --git a/mesalib/src/mesa/main/texgetimage.c b/mesalib/src/mesa/main/texgetimage.c
index 915bcf913..2efd5e75b 100644
--- a/mesalib/src/mesa/main/texgetimage.c
+++ b/mesalib/src/mesa/main/texgetimage.c
@@ -233,6 +233,7 @@ get_tex_rgba(struct gl_context *ctx, GLuint dimensions,
    const GLint width = texImage->Width;

    const GLint height = texImage->Height;

    const GLint depth = texImage->Depth;

+   const GLenum dataType = _mesa_get_format_datatype(texImage->TexFormat);

    /* Normally, no pixel transfer ops are performed during glGetTexImage.

     * The only possible exception is component clamping to [0,1].

     */

@@ -248,6 +249,19 @@ get_tex_rgba(struct gl_context *ctx, GLuint dimensions,
       return;

    }

 

+   /* Clamping does not apply to GetTexImage (final conversion)?

+    * Looks like we need clamp though when going from format

+    * containing negative values to unsigned format.

+    */

+   if (format == GL_LUMINANCE || format == GL_LUMINANCE_ALPHA) {

+      transferOps |= IMAGE_CLAMP_BIT;

+   }

+   else if (!type_with_negative_values(type) &&

+            (dataType == GL_FLOAT ||

+             dataType == GL_SIGNED_NORMALIZED)) {

+      transferOps |= IMAGE_CLAMP_BIT;

+   }

+

    /* glGetTexImage always returns sRGB data for sRGB textures. Make sure the

     * fetch functions return sRGB data without linearizing it.

     */

@@ -262,20 +276,6 @@ get_tex_rgba(struct gl_context *ctx, GLuint dimensions,
                                           width, height, format, type,

                                           img, row, 0);

          GLint col;

-         GLenum dataType = _mesa_get_format_datatype(texImage->TexFormat);

-

-         /* clamp does not apply to GetTexImage (final conversion)?

-          * Looks like we need clamp though when going from format

-          * containing negative values to unsigned format.

-          */

-         if (format == GL_LUMINANCE || format == GL_LUMINANCE_ALPHA) {

-            transferOps |= IMAGE_CLAMP_BIT;

-         }

-         else if (!type_with_negative_values(type) &&

-                  (dataType == GL_FLOAT ||

-                   dataType == GL_SIGNED_NORMALIZED)) {

-            transferOps |= IMAGE_CLAMP_BIT;

-         }

 

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

             texImage->FetchTexelf(texImage, col, row, img, rgba[col]);