commit 5805f5ab0161d597432adfa646557f2c8c25d278
author Tapani Pälli <tapani.palli@intel.com> Tue Sep 15 17:05:00 2020 +0300
committer Marge Bot <eric+marge@anholt.net> Fri Sep 18 05:49:51 2020 +0000
tree 8086e6287e91f5fbd36b96ff95ceab5eb89ac1d7
parent cde5b86a88c42c0139c0d685bd9844a7cee5dc4d

glsl: take EXT_gpu_shader4 in to account when adding round

GL_EXT_gpu_shader4 adds truncate() and round() builtins.

Fixes: 12567de2be7 ("glsl: mark some builtins with correct glsl(es) version check")
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6731>

src/compiler/glsl/builtin_functions.cpp

diff --git a/src/compiler/glsl/builtin_functions.cpp b/src/compiler/glsl/builtin_functions.cpp
index 2731cee..ae7c3da 100644
--- a/src/compiler/glsl/builtin_functions.cpp
+++ b/src/compiler/glsl/builtin_functions.cpp
@@ -1586,6 +1586,18 @@
                 _##NAME(fp64, glsl_type::dvec4_type),      \
                 NULL);
 
+#define FD130GS4(NAME)                          \
+   add_function(#NAME,                          \
+                _##NAME(v130_or_gpu_shader4, glsl_type::float_type), \
+                _##NAME(v130_or_gpu_shader4, glsl_type::vec2_type),  \
+                _##NAME(v130_or_gpu_shader4, glsl_type::vec3_type),  \
+                _##NAME(v130_or_gpu_shader4, glsl_type::vec4_type),  \
+                _##NAME(fp64, glsl_type::double_type),  \
+                _##NAME(fp64, glsl_type::dvec2_type),    \
+                _##NAME(fp64, glsl_type::dvec3_type),     \
+                _##NAME(fp64, glsl_type::dvec4_type),      \
+                NULL);
+
 #define FDGS5(NAME)                                 \
    add_function(#NAME,                          \
                 _##NAME(gpu_shader5_es, glsl_type::float_type), \
@@ -1797,7 +1809,7 @@
    FI64(sign)
    FD(floor)
    FD130(trunc)
-   FD130(round)
+   FD130GS4(round)
    FD130(roundEven)
    FD(ceil)
    FD(fract)