glsl: Use the without_array predicate to simplify some code

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com> [v1]
Reviewed-by: Timothy Arceri <t_arceri@yahoo.com.au>
This commit is contained in:
Ian Romanick
2014-07-19 14:41:04 -07:00
parent 22f7a46d74
commit 6305caea52
4 changed files with 12 additions and 23 deletions

View File

@@ -1068,10 +1068,8 @@ private:
virtual void visit_field(const glsl_type *type, const char *name,
bool row_major)
{
assert(!type->is_record());
assert(!(type->is_array() && type->fields.array->is_record()));
assert(!type->is_interface());
assert(!(type->is_array() && type->fields.array->is_interface()));
assert(!type->without_array()->is_record());
assert(!type->without_array()->is_interface());
(void) row_major;