From 9acb011a3e73676ada04df01832c930acf51a9a2 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Thu, 19 Feb 2015 21:32:21 +1100 Subject: [PATCH] glsl: Use the without_array predicate Reviewed-by: Matt Turner --- src/glsl/ir.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/glsl/ir.h b/src/glsl/ir.h index ce35b2bf213..25f2ecada0f 100644 --- a/src/glsl/ir.h +++ b/src/glsl/ir.h @@ -450,11 +450,8 @@ public: */ inline bool is_interface_instance() const { - const glsl_type *const t = this->type; - - return (t == this->interface_type) - || (t->is_array() && t->fields.array == this->interface_type); - } + return this->type->without_array() == this->interface_type; + } /** * Set this->interface_type on a newly created variable. -- 2.30.2