diff options
author | Timothy Arceri <[email protected]> | 2015-02-22 23:35:43 +1100 |
---|---|---|
committer | Timothy Arceri <[email protected]> | 2015-07-04 17:12:38 +1000 |
commit | 7ecb11c81c1e2fc816b36c82657ab139eb1d84b6 (patch) | |
tree | 9f25d54d5ecc7f60673dec32068c08b5025d4869 /src/glsl | |
parent | 9565e345285c71af064e2bb5e0ee762655310802 (diff) |
glsl: update assert to support arrays of arrays
Reviewed-by: Ilia Mirkin <[email protected]>
Diffstat (limited to 'src/glsl')
-rw-r--r-- | src/glsl/glsl_types.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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); } } |