Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/src/glsl/ir_print_visitor.cpp
	mesalib/src/glsl/linker.cpp
	mesalib/src/glsl/opt_constant_propagation.cpp
	mesalib/src/mesa/program/ir_to_mesa.cpp

1 files changed, 10 insertions, 0 deletions

diff --git a/mesalib/src/glsl/ir_print_visitor.cpp b/mesalib/src/glsl/ir_print_visitor.cpp
index cabb2f6cc..7e3649477 100644
--- a/mesalib/src/glsl/ir_print_visitor.cpp
+++ b/mesalib/src/glsl/ir_print_visitor.cpp
@@ -96,6 +96,16 @@ void ir_print_visitor::indent(void)
 const char *

 ir_print_visitor::unique_name(ir_variable *var)

 {

+   /* var->name can be NULL in function prototypes when a type is given for a

+    * parameter but no name is given.  In that case, just return an empty

+    * string.  Don't worry about tracking the generated name in the printable

+    * names hash because this is the only scope where it can ever appear.

+    */

+   if (var->name == NULL) {

+      static unsigned arg = 1;

+      return ralloc_asprintf(this->mem_ctx, "parameter@%u", arg++);

+   }

+

    /* Do we already have a name for this variable? */

    const char *name = (const char *) hash_table_find(this->printable_names, var);

    if (name != NULL)