Mesa (master): glsl/types: Ignore bit sizes in contains_integer()

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 21a7e6d569700812cdd127551a6f8ce24cf6201a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=21a7e6d569700812cdd127551a6f8ce24cf6201a

Author: Jason Ekstrand <jason at jlekstrand.net>
Date:   Thu Jun  6 11:26:51 2019 -0500

glsl/types: Ignore bit sizes in contains_integer()

All of the callers for this function are looking at interpolation
qualifiers and want to make sure they're declared flat.  Any 64-bit
integer inputs need to be flat.  It's also makes the function make more
sense since "integer" is fairly generic.

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

---

 src/compiler/glsl_types.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compiler/glsl_types.cpp b/src/compiler/glsl_types.cpp
index ce6bec7150e..b47e126e950 100644
--- 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 this->is_integer();
+      return glsl_base_type_is_integer(this->base_type);
    }
 }