Module: Mesa Branch: master Commit: 30b548fc6258e9a72722f511e377cf4716fd443c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=30b548fc6258e9a72722f511e377cf4716fd443c
Author: Jason Ekstrand <[email protected]> Date: Tue Feb 12 13:03:34 2019 -0600 compiler/types: Add a contains_64bit helper Reviewed-by: Alejandro Piñeiro <[email protected]> --- src/compiler/glsl_types.cpp | 16 ++++++++++++++++ src/compiler/glsl_types.h | 6 ++++++ src/compiler/nir_types.cpp | 6 ++++++ src/compiler/nir_types.h | 1 + 4 files changed, 29 insertions(+) diff --git a/src/compiler/glsl_types.cpp b/src/compiler/glsl_types.cpp index 90f4548030f..042f45a926d 100644 --- a/src/compiler/glsl_types.cpp +++ b/src/compiler/glsl_types.cpp @@ -261,6 +261,22 @@ glsl_type::contains_double() const } bool +glsl_type::contains_64bit() const +{ + if (this->is_array()) { + return this->fields.array->contains_64bit(); + } else if (this->is_record() || this->is_interface()) { + for (unsigned int i = 0; i < this->length; i++) { + if (this->fields.structure[i].type->contains_64bit()) + return true; + } + return false; + } else { + return this->is_64bit(); + } +} + +bool glsl_type::contains_opaque() const { switch (base_type) { case GLSL_TYPE_SAMPLER: diff --git a/src/compiler/glsl_types.h b/src/compiler/glsl_types.h index 934dc479998..f9a160b898b 100644 --- a/src/compiler/glsl_types.h +++ b/src/compiler/glsl_types.h @@ -545,6 +545,12 @@ public: bool contains_double() const; /** + * Query whether or not type is a 64-bit type, or for struct, interface and + * array types, contains a double type. + */ + bool contains_64bit() const; + + /** * Query whether or not a type is a float type */ bool is_float() const diff --git a/src/compiler/nir_types.cpp b/src/compiler/nir_types.cpp index b12aa297da3..c9e46ef044c 100644 --- a/src/compiler/nir_types.cpp +++ b/src/compiler/nir_types.cpp @@ -332,6 +332,12 @@ glsl_type_is_integer(const struct glsl_type *type) return type->is_integer(); } +bool +glsl_type_contains_64bit(const struct glsl_type *type) +{ + return type->contains_64bit(); +} + const glsl_type * glsl_void_type(void) { diff --git a/src/compiler/nir_types.h b/src/compiler/nir_types.h index 34f4252a9e2..68855a65d8e 100644 --- a/src/compiler/nir_types.h +++ b/src/compiler/nir_types.h @@ -150,6 +150,7 @@ bool glsl_type_is_dual_slot(const struct glsl_type *type); bool glsl_type_is_numeric(const struct glsl_type *type); bool glsl_type_is_boolean(const struct glsl_type *type); bool glsl_type_is_integer(const struct glsl_type *type); +bool glsl_type_contains_64bit(const struct glsl_type *type); bool glsl_sampler_type_is_shadow(const struct glsl_type *type); bool glsl_sampler_type_is_array(const struct glsl_type *type); bool glsl_contains_atomic(const struct glsl_type *type); _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
