glsl2: Don't assert in a couple of places when encountering sampler arrays.

Fixes glean shaderAPI.

2 files changed, 11 insertions, 4 deletions

diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index 9d6de242f5f..e93c2f55549 100644
--- a/src/glsl/linker.cpp
+++ b/src/glsl/linker.cpp
@@ -793,11 +793,13 @@ assign_uniform_locations(struct gl_shader_program *prog)
 	 if ((var == NULL) || (var->mode != ir_var_uniform))
 	    continue;
 
-	 if (var->type->is_sampler())
-	    continue;
-
 	 const unsigned vec4_slots = (var->component_slots() + 3) / 4;
-	 assert(vec4_slots != 0);
+	 if (vec4_slots == 0) {
+	    /* If we've got a sampler or an aggregate of them, the size can
+	     * end up zero.  Don't allocate any space.
+	     */
+	    continue;
+	 }
 
 	 uniform_node *n = (uniform_node *) hash_table_find(ht, var->name);
 	 if (n == NULL) {
diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp
index 9979e6e3e07..66b1a2f9d9a 100644
--- a/src/mesa/program/ir_to_mesa.cpp
+++ b/src/mesa/program/ir_to_mesa.cpp
@@ -518,6 +518,11 @@ type_size(const struct glsl_type *type)
 	 size += type_size(type->fields.structure[i].type);
       }
       return size;
+   case GLSL_TYPE_SAMPLER:
+      /* Samplers take up no register space, since they're baked in at
+       * link time.
+       */
+      return 0;
    default:
       assert(0);
    }