From: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed, 8 Dec 2010 03:00:44 +0000 (-0800)
Subject: linker: Fix regressions caused by previous commit
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=002cd2c8d439729227c79093bdbf8a269e72c19f;p=mesa.git

linker: Fix regressions caused by previous commit

That's what I get for not running piglit before pushing.

Don't try to patch types of unsized arrays when linking fails.

Don't try to patch types of unsized arrays that are shared between
shader stages.
---

diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index d7638facce6..e62fe6d7e9f 100644
--- a/src/glsl/linker.cpp
+++ b/src/glsl/linker.cpp
@@ -871,23 +871,27 @@ link_intrastage_shaders(void *mem_ctx,
     * unspecified sizes have a size specified.  The size is inferred from the
     * max_array_access field.
     */
-   foreach_list(node, linked->ir) {
-      ir_variable *const var = ((ir_instruction *) node)->as_variable();
+   if (linked != NULL) {
+      foreach_list(node, linked->ir) {
+	 ir_variable *const var = ((ir_instruction *) node)->as_variable();
 
-      if (var == NULL)
-	 continue;
+	 if (var == NULL)
+	    continue;
 
-      if (!var->type->is_array() || (var->type->length != 0))
-	 continue;
+	 if ((var->mode != ir_var_auto) && (var->mode != ir_var_temporary))
+	    continue;
 
-      const glsl_type *type =
-	 glsl_type::get_array_instance(var->type->fields.array,
-				       var->max_array_access);
+	 if (!var->type->is_array() || (var->type->length != 0))
+	    continue;
 
-      assert(type != NULL);
-      var->type = type;
-   }
+	 const glsl_type *type =
+	    glsl_type::get_array_instance(var->type->fields.array,
+					  var->max_array_access);
 
+	 assert(type != NULL);
+	 var->type = type;
+      }
+   }
 
    return linked;
 }