fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 09:38:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

glsl: Do not allow scalar types in vector relational functions

Browse source 
According to OpenGL Shading Language 4.50 spec, Section 8.7 "Vector
Relational Functions", functions of this type do not operate on scalar
types, so remove scalar types from signature definitions to make the
behavior consistent with glslangValidator and other drivers.

Reviewed-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Boyan Ding <boyan.j.ding@gmail.com>
This commit is contained in:
Boyan Ding 2016-10-31 14:45:48 +08:00 • committed by Matt Turner
parent 5b4fa21d53
commit 41b1d9a558
1 changed files with 10 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/compiler/glsl/builtin_functions.cpp
View file

@ -1200,23 +1200,19 @@ builtin_builder::create_builtins()
_##NAME(fp64, glsl_type::dvec4_type), \
NULL);
#define FIUD(NAME) \
#define FIUD_VEC(NAME) \
add_function(#NAME, \
_##NAME(always_available, glsl_type::float_type), \
_##NAME(always_available, glsl_type::vec2_type), \
_##NAME(always_available, glsl_type::vec3_type), \
_##NAME(always_available, glsl_type::vec4_type), \
\
_##NAME(always_available, glsl_type::int_type), \
_##NAME(always_available, glsl_type::ivec2_type), \
_##NAME(always_available, glsl_type::ivec3_type), \
_##NAME(always_available, glsl_type::ivec4_type), \
\
_##NAME(v130, glsl_type::uint_type), \
_##NAME(v130, glsl_type::uvec2_type), \
_##NAME(v130, glsl_type::uvec3_type), \
_##NAME(v130, glsl_type::uvec4_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), \
@ -1235,29 +1231,24 @@ builtin_builder::create_builtins()
_##NAME(glsl_type::uvec4_type), \
NULL);
#define FIUBD(NAME) \
#define FIUBD_VEC(NAME) \
add_function(#NAME, \
_##NAME(always_available, glsl_type::float_type), \
_##NAME(always_available, glsl_type::vec2_type), \
_##NAME(always_available, glsl_type::vec3_type), \
_##NAME(always_available, glsl_type::vec4_type), \
\
_##NAME(always_available, glsl_type::int_type), \
_##NAME(always_available, glsl_type::ivec2_type), \
_##NAME(always_available, glsl_type::ivec3_type), \
_##NAME(always_available, glsl_type::ivec4_type), \
\
_##NAME(v130, glsl_type::uint_type), \
_##NAME(v130, glsl_type::uvec2_type), \
_##NAME(v130, glsl_type::uvec3_type), \
_##NAME(v130, glsl_type::uvec4_type), \
\
_##NAME(always_available, glsl_type::bool_type), \
_##NAME(always_available, glsl_type::bvec2_type), \
_##NAME(always_available, glsl_type::bvec3_type), \
_##NAME(always_available, glsl_type::bvec4_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), \
@ -1573,12 +1564,12 @@ builtin_builder::create_builtins()
_transpose(fp64, glsl_type::dmat4x2_type),
_transpose(fp64, glsl_type::dmat4x3_type),
NULL);
FIUD(lessThan)
FIUD(lessThanEqual)
FIUD(greaterThan)
FIUD(greaterThanEqual)
FIUBD(notEqual)
FIUBD(equal)
FIUD_VEC(lessThan)
FIUD_VEC(lessThanEqual)
FIUD_VEC(greaterThan)
FIUD_VEC(greaterThanEqual)
FIUBD_VEC(notEqual)
FIUBD_VEC(equal)
add_function("any",
_any(glsl_type::bvec2_type),
@ -2993,8 +2984,8 @@ builtin_builder::create_builtins()
#undef F
#undef FI
#undef FIUD
#undef FIUBD
#undef FIUD_VEC
#undef FIUBD_VEC
#undef FIU2_MIXED
}