glsl2: Don't assert in a couple of places when encountering sampler arrays.
Fixes glean shaderAPI.
diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index 9d6de24..e93c2f5 100644
--- a/src/glsl/linker.cpp
+++ b/src/glsl/linker.cpp
@@ -793,11 +793,13 @@
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) {