From: Timothy Arceri <t_arceri@yahoo.com.au>
Date: Sun, 22 Feb 2015 12:35:43 +0000 (+1100)
Subject: glsl: update assert to support arrays of arrays
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7ecb11c81c1e2fc816b36c82657ab139eb1d84b6;p=mesa.git

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 c6223808bb8..281ff51f3e9 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);
       }
    }