glsl/types: Add a real is_integer helper

Reviewed-by: Karol Herbst <kherbst@redhat.com>

diff --git a/src/compiler/glsl_types.cpp b/src/compiler/glsl_types.cpp
index 2e84d6ea72c5f57334c10a5aef30811a859da011..ded355ee308106d6f94e26218a383139a5932a43 100644 (file)
--- a/src/compiler/glsl_types.cpp
+++ b/src/compiler/glsl_types.cpp
@@ -246,7 +246,7 @@ glsl_type::contains_integer() const
       }
       return false;
    } else {
-      return glsl_base_type_is_integer(this->base_type);
+      return this->is_integer();
    }
 }
 

diff --git a/src/compiler/glsl_types.h b/src/compiler/glsl_types.h
index 693b037115128ece0546a6ea3f17f27ba48eb5bf..e986b51d5233128a9a5c6c1c28b443493ba3899e 100644 (file)
--- a/src/compiler/glsl_types.h
+++ b/src/compiler/glsl_types.h
@@ -585,6 +585,14 @@ public:
       return (base_type >= GLSL_TYPE_UINT) && (base_type <= GLSL_TYPE_INT64);
    }
 
+   /**
+    * Query whether or not a type is an integer.
+    */
+   bool is_integer() const
+   {
+      return glsl_base_type_is_integer(base_type);
+   }
+
    /**
     * Query whether or not a type is an 32-bit integer.
     */

diff --git a/src/compiler/nir_types.cpp b/src/compiler/nir_types.cpp
index 7fa1741515db6742a5cff61a9e7838bf2c2147f2..e2dfc40ff0b0c37ab6c4ac7c26a5c6e42691f973 100644 (file)
--- a/src/compiler/nir_types.cpp
+++ b/src/compiler/nir_types.cpp
@@ -355,7 +355,7 @@ glsl_type_is_boolean(const struct glsl_type *type)
 bool
 glsl_type_is_integer(const struct glsl_type *type)
 {
-   return glsl_base_type_is_integer(type->base_type);
+   return type->is_integer();
 }
 
 bool