compiler/types: Add more glsl_contains_*() functions and use them in C++

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25129>

src/compiler/glsl_types.cpp

@@ -177,33 +177,33 @@ make_subroutine_type(linear_ctx *lin_ctx, const char *subroutine_name)
    return t;
 }
 
-bool
-glsl_type::contains_sampler() const
+extern "C" bool
+glsl_contains_sampler(const struct glsl_type *t)
 {
-   if (this->is_array()) {
-      return this->fields.array->contains_sampler();
-   } else if (this->is_struct() || this->is_interface()) {
-      for (unsigned int i = 0; i < this->length; i++) {
-         if (this->fields.structure[i].type->contains_sampler())
+   if (t->is_array()) {
+      return t->fields.array->contains_sampler();
+   } else if (t->is_struct() || t->is_interface()) {
+      for (unsigned int i = 0; i < t->length; i++) {
+         if (t->fields.structure[i].type->contains_sampler())
             return true;
       }
       return false;
    } else {
-      return this->is_sampler();
+      return t->is_sampler();
    }
 }
 
-bool
-glsl_type::contains_array() const
+extern "C" bool
+glsl_contains_array(const struct glsl_type *t)
 {
-   if (this->is_struct() || this->is_interface()) {
-      for (unsigned int i = 0; i < this->length; i++) {
-         if (this->fields.structure[i].type->contains_array())
+   if (t->is_struct() || t->is_interface()) {
+      for (unsigned int i = 0; i < t->length; i++) {
+         if (t->fields.structure[i].type->contains_array())
             return true;
       }
       return false;
    } else {
-      return this->is_array();
+      return t->is_array();
    }
 }
 
@@ -277,19 +277,19 @@ glsl_contains_opaque(const struct glsl_type *t)
    }
 }
 
-bool
-glsl_type::contains_subroutine() const
+extern "C" bool
+glsl_contains_subroutine(const struct glsl_type *t)
 {
-   if (this->is_array()) {
-      return this->fields.array->contains_subroutine();
-   } else if (this->is_struct() || this->is_interface()) {
-      for (unsigned int i = 0; i < this->length; i++) {
-         if (this->fields.structure[i].type->contains_subroutine())
+   if (t->is_array()) {
+      return t->fields.array->contains_subroutine();
+   } else if (t->is_struct() || t->is_interface()) {
+      for (unsigned int i = 0; i < t->length; i++) {
+         if (t->fields.structure[i].type->contains_subroutine())
             return true;
       }
       return false;
    } else {
-      return this->is_subroutine();
+      return t->is_subroutine();
    }
 }
 

src/compiler/glsl_types.h

@@ -1322,6 +1322,9 @@ bool glsl_contains_atomic(const struct glsl_type *t);
 bool glsl_contains_double(const struct glsl_type *t);
 bool glsl_contains_integer(const struct glsl_type *t);
 bool glsl_contains_opaque(const struct glsl_type *t);
+bool glsl_contains_sampler(const struct glsl_type *t);
+bool glsl_contains_array(const struct glsl_type *t);
+bool glsl_contains_subroutine(const struct glsl_type *t);
 
 static inline enum glsl_sampler_dim
 glsl_get_sampler_dim(const struct glsl_type *t)

src/compiler/glsl_types_impl.h

@@ -44,6 +44,9 @@ inline bool glsl_type::contains_atomic() const { return glsl_contains_atomic(thi
 inline bool glsl_type::contains_opaque() const { return glsl_contains_opaque(this); }
 inline bool glsl_type::contains_double() const { return glsl_contains_double(this); }
 inline bool glsl_type::contains_integer() const { return glsl_contains_integer(this); }
+inline bool glsl_type::contains_sampler() const { return glsl_contains_sampler(this); }
+inline bool glsl_type::contains_array() const { return glsl_contains_array(this); }
+inline bool glsl_type::contains_subroutine() const { return glsl_contains_subroutine(this); }
 
 inline int glsl_type::array_size() const { return glsl_array_size(this); }
 inline const glsl_type *glsl_type::without_array() const { return glsl_without_array(this); }