Mesa (master): glsl: update assert to support arrays of arrays

[Timothy Arceri]

Module: Mesa
Branch: master
Commit: 7ecb11c81c1e2fc816b36c82657ab139eb1d84b6
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7ecb11c81c1e2fc816b36c82657ab139eb1d84b6

Author: Timothy Arceri <t_arceri at yahoo.com.au>
Date:   Sun Feb 22 23:35:43 2015 +1100

glsl: update assert to support arrays of arrays

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

---

 src/glsl/glsl_types.cpp |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/glsl/glsl_types.cpp b/src/glsl/glsl_types.cpp
index c622380..281ff51 100644
--- 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);
       }
    }