glsl: update assert to support arrays of arrays

Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>

diff --git a/src/glsl/glsl_types.cpp b/src/glsl/glsl_types.cpp
index c6223808bb80ef6507dcbbf2e36c584909fef3b9..281ff51f3e9e05e868659515d25385374359fc9d 100644 (file)
--- a/src/glsl/glsl_types.cpp
+++ b/src/glsl/glsl_types.cpp
@@ -1086,7 +1086,8 @@ glsl_type::std140_base_alignment(bool row_major) const
          this->fields.array->is_matrix()) {
         return MAX2(this->fields.array->std140_base_alignment(row_major), 16);
       } else {
-        assert(this->fields.array->is_record());
+        assert(this->fields.array->is_record() ||
+                this->fields.array->is_array());
         return this->fields.array->std140_base_alignment(row_major);
       }
    }