glsl: Use the without_array predicate

Reviewed-by: Matt Turner <mattst88@gmail.com>

diff --git a/src/glsl/ir.h b/src/glsl/ir.h
index ce35b2bf2134fd0e74da3fd616df3f960bd2d1bc..25f2ecada0f677a342712fa16a18938cad690d1e 100644 (file)
--- 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.