Merge remote-tracking branch 'origin/released'

Conflicts:
	fontconfig/doc/fcformat.fncs
	fontconfig/fc-cat/fc-cat.c
	fontconfig/fc-list/fc-list.c
	fontconfig/fc-match/fc-match.c
	fontconfig/src/fcdir.c
	fontconfig/src/fcformat.c
	fontconfig/src/fcname.c
	mesalib/src/glsl/linker.cpp
	mesalib/src/mesa/state_tracker/st_format.c

3 files changed, 40 insertions, 9 deletions

diff --git a/mesalib/src/glsl/linker.cpp b/mesalib/src/glsl/linker.cpp
index 307c432ad..1ad9dbcb5 100644
--- a/mesalib/src/glsl/linker.cpp
+++ b/mesalib/src/glsl/linker.cpp
@@ -1405,8 +1405,9 @@ demote_shader_inputs_and_outputs(gl_shader *sh, enum ir_variable_mode mode)
 }

 

 

-void

-assign_varying_locations(struct gl_shader_program *prog,

+bool

+assign_varying_locations(struct gl_context *ctx,

+			 struct gl_shader_program *prog,

 			 gl_shader *producer, gl_shader *consumer)

 {

    /* FINISHME: Set dynamically when geometry shader support is added. */

@@ -1462,6 +1463,8 @@ assign_varying_locations(struct gl_shader_program *prog,
       }

    }

 

+   unsigned varying_vectors = 0;

+

    foreach_list(node, consumer->ir) {

       ir_variable *const var = ((ir_instruction *) node)->as_variable();

 

@@ -1492,8 +1495,32 @@ assign_varying_locations(struct gl_shader_program *prog,
 	  * value is written by the previous stage.

 	  */

 	 var->mode = ir_var_auto;

+      } else {

+	 /* The packing rules are used for vertex shader inputs are also used

+	  * for fragment shader inputs.

+	  */

+	 varying_vectors += count_attribute_slots(var->type);

       }

    }

+

+   if (ctx->API == API_OPENGLES2 || prog->Version == 100) {

+      if (varying_vectors > ctx->Const.MaxVarying) {

+	 linker_error_printf(prog, "shader uses too many varying vectors "

+			     "(%u > %u)\n",

+			     varying_vectors, ctx->Const.MaxVarying);

+	 return false;

+      }

+   } else {

+      const unsigned float_components = varying_vectors * 4;

+      if (float_components > ctx->Const.MaxVarying * 4) {

+	 linker_error_printf(prog, "shader uses too many varying components "

+			     "(%u > %u)\n",

+			     float_components, ctx->Const.MaxVarying * 4);

+	 return false;

+      }

+   }

+

+   return true;

 }

 

 

@@ -1666,9 +1693,13 @@ link_shaders(struct gl_context *ctx, struct gl_shader_program *prog)
       if (prog->_LinkedShaders[i] == NULL)

 	 continue;

 

-      assign_varying_locations(prog,

-			       prog->_LinkedShaders[prev],

-			       prog->_LinkedShaders[i]);

+      if (!assign_varying_locations(ctx, prog,

+				    prog->_LinkedShaders[prev],

+				    prog->_LinkedShaders[i])) {

+	 prog->LinkStatus = false;

+	 goto done;

+      }

+

       prev = i;

    }

 

diff --git a/mesalib/src/mapi/glapi/gen/ARB_geometry_shader4.xml b/mesalib/src/mapi/glapi/gen/ARB_geometry_shader4.xml
index ca9a101a0..d9e540fc9 100644
--- a/mesalib/src/mapi/glapi/gen/ARB_geometry_shader4.xml
+++ b/mesalib/src/mapi/glapi/gen/ARB_geometry_shader4.xml
@@ -38,7 +38,7 @@
         <param name="texture" type="GLuint"/>
         <param name="level" type="GLint"/>
     </function>
-    <function name="FramebufferTextureLayerARB" alias="FramebufferTextureLayer">
+    <function name="FramebufferTextureLayerARB" alias="FramebufferTextureLayerEXT">
         <param name="target" type="GLenum"/>
         <param name="attachment" type="GLenum"/>
         <param name="texture" type="GLuint"/>
diff --git a/mesalib/src/mesa/state_tracker/st_format.c b/mesalib/src/mesa/state_tracker/st_format.c
index dcd6ea5cc..74e46aa02 100644
--- a/mesalib/src/mesa/state_tracker/st_format.c
+++ b/mesalib/src/mesa/state_tracker/st_format.c
@@ -608,7 +608,7 @@ struct format_mapping
  * Multiple GL enums might map to multiple pipe_formats.

  * The first pipe format in the list that's supported is the one that's chosen.

  */

-static struct format_mapping format_map[] = {

+static const struct format_mapping format_map[] = {

    /* Basic RGB, RGBA formats */

    {

       { GL_RGB10, GL_RGB10_A2, 0 },

@@ -616,7 +616,7 @@ static struct format_mapping format_map[] = {
    },

    {

       { 4, GL_RGBA, GL_RGBA8, 0 },

-      { DEFAULT_RGBA_FORMATS, 0 }

+      { DEFAULT_RGBA_FORMATS }

    },

    {

       { GL_BGRA, 0 },

@@ -624,7 +624,7 @@ static struct format_mapping format_map[] = {
    },

    {

       { 3, GL_RGB, GL_RGB8, 0 },

-      { DEFAULT_RGB_FORMATS, 0 }

+      { DEFAULT_RGB_FORMATS }

    },

    {

       { GL_RGB12, GL_RGB16, GL_RGBA12, GL_RGBA16, 0 },