summaryrefslogtreecommitdiff
path: root/src/compiler/glsl_types.cpp
diff options
context:
space:
mode:
authorJason Ekstrand <jason@jlekstrand.net>2019-06-06 11:37:32 -0500
committerJason Ekstrand <jason@jlekstrand.net>2019-06-19 20:28:52 +0000
commitf0920e266c152044cb05892f3aea5a17a163cc02 (patch)
treec713093793366ea4cc4681c8a1aac539822facdf /src/compiler/glsl_types.cpp
parent21a7e6d569700812cdd127551a6f8ce24cf6201a (diff)
glsl/types: Rename is_integer to is_integer_32
It only accepts 32-bit integers so it should have a more descriptive name. This patch should not be a functional change. Reviewed-by: Karol Herbst <kherbst@redhat.com>
Diffstat (limited to 'src/compiler/glsl_types.cpp')
-rw-r--r--src/compiler/glsl_types.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/glsl_types.cpp b/src/compiler/glsl_types.cpp
index b47e126e950..2e84d6ea72c 100644
--- a/src/compiler/glsl_types.cpp
+++ b/src/compiler/glsl_types.cpp
@@ -1633,7 +1633,7 @@ glsl_type::can_implicitly_convert_to(const glsl_type *desired,
return false;
/* int and uint can be converted to float. */
- if (desired->is_float() && this->is_integer())
+ if (desired->is_float() && this->is_integer_32())
return true;
/* With GLSL 4.0, ARB_gpu_shader5, or MESA_shader_integer_functions, int
@@ -1654,7 +1654,7 @@ glsl_type::can_implicitly_convert_to(const glsl_type *desired,
if ((!state || state->has_double()) && desired->is_double()) {
if (this->is_float())
return true;
- if (this->is_integer())
+ if (this->is_integer_32())
return true;
}