Merge remote-tracking branch 'origin/released'

Conflicts:
	xorg-server/dix/dispatch.c
	xorg-server/dix/privates.c
	xorg-server/hw/kdrive/ephyr/ephyr.c
	xorg-server/hw/kdrive/src/kinput.c

8 files changed, 19 insertions, 31 deletions

diff --git a/mesalib/src/mapi/glapi/gen/es_EXT.xml b/mesalib/src/mapi/glapi/gen/es_EXT.xml
index b26cac54b..ad83d9142 100644
--- a/mesalib/src/mapi/glapi/gen/es_EXT.xml
+++ b/mesalib/src/mapi/glapi/gen/es_EXT.xml
@@ -634,4 +634,12 @@
     </function>
 </category>
 
+<!-- 103. GL_EXT_texture_rg -->
+<category name="GL_EXT_texture_rg" number="103">
+    <enum name="RED_EXT"                                  value="0x1903"/>
+    <enum name="RG_EXT"                                   value="0x8227"/>
+    <enum name="R8_EXT"                                   value="0x8229"/>
+    <enum name="RG8_EXT"                                  value="0x822B"/>
+</category>
+
 </OpenGLAPI>
diff --git a/mesalib/src/mapi/glapi/glapi_priv.h b/mesalib/src/mapi/glapi/glapi_priv.h
index b6600c5fc..3ab553a2b 100644
--- a/mesalib/src/mapi/glapi/glapi_priv.h
+++ b/mesalib/src/mapi/glapi/glapi_priv.h
@@ -38,16 +38,6 @@
 #include "GL/gl.h"
 #include "GL/glext.h"
 
-/* The define of GL_COVERAGE_SAMPLES_NV in gl2ext.h is guarded by a different
- * extension (GL_NV_coverage_sample) than in glext.h
- * (GL_NV_multisample_coverage).  Just undefine it to avoid spurious compiler
- * warnings.
- */
-#undef GL_COVERAGE_SAMPLES_NV
-
-#include "GLES2/gl2platform.h"
-#include "GLES2/gl2ext.h"
-
 #ifndef GL_OES_fixed_point
 typedef int GLfixed;
 typedef int GLclampx;
diff --git a/mesalib/src/mesa/main/APIspec.xml b/mesalib/src/mesa/main/APIspec.xml
index f870cf7db..b6cf52d07 100644
--- a/mesalib/src/mesa/main/APIspec.xml
+++ b/mesalib/src/mesa/main/APIspec.xml
@@ -4150,6 +4150,7 @@
 	<category name="OES_packed_depth_stencil"/>
 	<category name="OES_standard_derivatives"/>
 	<category name="EXT_texture_format_BGRA8888"/>
+	<category name="EXT_texture_rg"/>
 	<category name="EXT_read_format_bgra"/>
 
 	<category name="EXT_texture_compression_dxt1"/>
diff --git a/mesalib/src/mesa/main/extensions.c b/mesalib/src/mesa/main/extensions.c
index e4fe73307..793cc4e24 100644
--- a/mesalib/src/mesa/main/extensions.c
+++ b/mesalib/src/mesa/main/extensions.c
@@ -200,6 +200,7 @@ static const struct extension extension_table[] = {
    { "GL_EXT_texture_env_dot3",                    o(EXT_texture_env_dot3),                    GL,             2000 },
    { "GL_EXT_texture_filter_anisotropic",          o(EXT_texture_filter_anisotropic),          GL | ES1 | ES2, 1999 },
    { "GL_EXT_texture_format_BGRA8888",             o(dummy_true),                                   ES1 | ES2, 2005 },
+   { "GL_EXT_texture_rg",                          o(ARB_texture_rg),                                     ES2, 2011 },
    { "GL_EXT_read_format_bgra",                    o(dummy_true),                                   ES1 | ES2, 2009 },
    { "GL_EXT_texture_integer",                     o(EXT_texture_integer),                     GL,             2006 },
    { "GL_EXT_texture_lod_bias",                    o(dummy_true),                              GL | ES1,       1999 },
diff --git a/mesalib/src/mesa/main/imports.h b/mesalib/src/mesa/main/imports.h
index 9fb6ae8f1..c0b6cecea 100644
--- a/mesalib/src/mesa/main/imports.h
+++ b/mesalib/src/mesa/main/imports.h
@@ -646,16 +646,6 @@ _mesa_vsnprintf(char *str, size_t size, const char *fmt, va_list arg);
 #endif
 
 
-/**
- * On Mingw32 we need to use __mingw_fprintf() to parse formats such
- * as "0x%llx", and possibly others
- */
-#ifdef __MINGW32__
-#define fprintf __mingw_fprintf
-#endif
-
-
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/mesalib/src/mesa/program/prog_print.c b/mesalib/src/mesa/program/prog_print.c
index 46f1df0fc..bc5dc5803 100644
--- a/mesalib/src/mesa/program/prog_print.c
+++ b/mesalib/src/mesa/program/prog_print.c
@@ -29,6 +29,8 @@
  * \author Brian Paul
  */
 
+#include <inttypes.h>  /* for PRIx64 macro */
+
 #include "main/glheader.h"
 #include "main/context.h"
 #include "main/imports.h"
@@ -970,11 +972,10 @@ _mesa_fprint_program_parameters(FILE *f,
 {
    GLuint i;
 
-   fprintf(f, "InputsRead: 0x%llx (0b%s)\n",
-           (unsigned long long) prog->InputsRead, binary(prog->InputsRead));
-   fprintf(f, "OutputsWritten: 0x%llx (0b%s)\n",
-                 (unsigned long long)prog->OutputsWritten, 
-		 binary(prog->OutputsWritten));
+   fprintf(f, "InputsRead: %" PRIx64 " (0b%s)\n",
+           (uint64_t) prog->InputsRead, binary(prog->InputsRead));
+   fprintf(f, "OutputsWritten: %" PRIx64 " (0b%s)\n",
+           (uint64_t) prog->OutputsWritten, binary(prog->OutputsWritten));
    fprintf(f, "NumInstructions=%d\n", prog->NumInstructions);
    fprintf(f, "NumTemporaries=%d\n", prog->NumTemporaries);
    fprintf(f, "NumParameters=%d\n", prog->NumParameters);
diff --git a/mesalib/src/mesa/state_tracker/st_extensions.c b/mesalib/src/mesa/state_tracker/st_extensions.c
index 6fea1fa08..fd9507536 100644
--- a/mesalib/src/mesa/state_tracker/st_extensions.c
+++ b/mesalib/src/mesa/state_tracker/st_extensions.c
@@ -578,6 +578,7 @@ void st_init_extensions(struct st_context *st)
 
       /* Extensions that only depend on GLSL 1.3. */
       ctx->Extensions.ARB_conservative_depth = GL_TRUE;
+      ctx->Extensions.ARB_shader_bit_encoding = GL_TRUE;
    } else {
       /* Optional integer support for GLSL 1.2. */
       if (screen->get_shader_param(screen, PIPE_SHADER_VERTEX,
@@ -595,10 +596,6 @@ void st_init_extensions(struct st_context *st)
       ctx->Extensions.S3_s3tc = GL_FALSE;
    }
 
-   if (ctx->Const.NativeIntegers) {
-      ctx->Extensions.ARB_shader_bit_encoding = GL_TRUE;
-   }
-
    if (screen->get_shader_param(screen, PIPE_SHADER_GEOMETRY,
                                 PIPE_SHADER_CAP_MAX_INSTRUCTIONS) > 0) {
 #if 0 /* XXX re-enable when GLSL compiler again supports geometry shaders */
diff --git a/mesalib/src/mesa/state_tracker/st_program.c b/mesalib/src/mesa/state_tracker/st_program.c
index e6664fb7c..9f98298b4 100644
--- a/mesalib/src/mesa/state_tracker/st_program.c
+++ b/mesalib/src/mesa/state_tracker/st_program.c
@@ -569,12 +569,12 @@ st_translate_fragment_program(struct st_context *st,
          case FRAG_ATTRIB_CLIP_DIST0:
             input_semantic_name[slot] = TGSI_SEMANTIC_CLIPDIST;
             input_semantic_index[slot] = 0;
-            interpMode[slot] = TGSI_INTERPOLATE_LINEAR;
+            interpMode[slot] = TGSI_INTERPOLATE_PERSPECTIVE;
             break;
          case FRAG_ATTRIB_CLIP_DIST1:
             input_semantic_name[slot] = TGSI_SEMANTIC_CLIPDIST;
             input_semantic_index[slot] = 1;
-            interpMode[slot] = TGSI_INTERPOLATE_LINEAR;
+            interpMode[slot] = TGSI_INTERPOLATE_PERSPECTIVE;
             break;
             /* In most cases, there is nothing special about these
              * inputs, so adopt a convention to use the generic