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

glsl/builtins: Fix equal and notEqual builtins.

Browse source 
Commit 309cd4115b incorrectly converted
these to all_equal and any_nequal, which is the wrong operation.
This commit is contained in:
Kenneth Graunke 2010-09-18 14:44:18 +02:00
parent 4c1e7d931d
commit 52f9156e88
3 changed files with 48 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/glsl/builtin_function.cpp
View file

@ -787,73 +787,73 @@ static const char *builtin_equal =
" (parameters\n"
" (declare (in) vec2 arg0)\n"
" (declare (in) vec2 arg1))\n"
" ((return (expression bvec2 all_equal (var_ref arg0) (var_ref arg1)))))\n"
" ((return (expression bvec2 == (var_ref arg0) (var_ref arg1)))))\n"
"\n"
" (signature bvec3\n"
" (parameters\n"
" (declare (in) vec3 arg0)\n"
" (declare (in) vec3 arg1))\n"
" ((return (expression bvec3 all_equal (var_ref arg0) (var_ref arg1)))))\n"
" ((return (expression bvec3 == (var_ref arg0) (var_ref arg1)))))\n"
"\n"
" (signature bvec4\n"
" (parameters\n"
" (declare (in) vec4 arg0)\n"
" (declare (in) vec4 arg1))\n"
" ((return (expression bvec4 all_equal (var_ref arg0) (var_ref arg1)))))\n"
" ((return (expression bvec4 == (var_ref arg0) (var_ref arg1)))))\n"
"\n"
" (signature bvec2\n"
" (parameters\n"
" (declare (in) bvec2 arg0)\n"
" (declare (in) bvec2 arg1))\n"
" ((return (expression bvec2 all_equal (var_ref arg0) (var_ref arg1)))))\n"
" ((return (expression bvec2 == (var_ref arg0) (var_ref arg1)))))\n"
"\n"
" (signature bvec3\n"
" (parameters\n"
" (declare (in) bvec3 arg0)\n"
" (declare (in) bvec3 arg1))\n"
" ((return (expression bvec3 all_equal (var_ref arg0) (var_ref arg1)))))\n"
" ((return (expression bvec3 == (var_ref arg0) (var_ref arg1)))))\n"
"\n"
" (signature bvec4\n"
" (parameters\n"
" (declare (in) bvec4 arg0)\n"
" (declare (in) bvec4 arg1))\n"
" ((return (expression bvec4 all_equal (var_ref arg0) (var_ref arg1)))))\n"
" ((return (expression bvec4 == (var_ref arg0) (var_ref arg1)))))\n"
"\n"
" (signature bvec2\n"
" (parameters\n"
" (declare (in) ivec2 arg0)\n"
" (declare (in) ivec2 arg1))\n"
" ((return (expression bvec2 all_equal (var_ref arg0) (var_ref arg1)))))\n"
" ((return (expression bvec2 == (var_ref arg0) (var_ref arg1)))))\n"
"\n"
" (signature bvec3\n"
" (parameters\n"
" (declare (in) ivec3 arg0)\n"
" (declare (in) ivec3 arg1))\n"
" ((return (expression bvec3 all_equal (var_ref arg0) (var_ref arg1)))))\n"
" ((return (expression bvec3 == (var_ref arg0) (var_ref arg1)))))\n"
"\n"
" (signature bvec4\n"
" (parameters\n"
" (declare (in) ivec4 arg0)\n"
" (declare (in) ivec4 arg1))\n"
" ((return (expression bvec4 all_equal (var_ref arg0) (var_ref arg1)))))\n"
" ((return (expression bvec4 == (var_ref arg0) (var_ref arg1)))))\n"
"\n"
" (signature bvec2\n"
" (parameters\n"
" (declare (in) uvec2 arg0)\n"
" (declare (in) uvec2 arg1))\n"
" ((return (expression bvec2 all_equal (var_ref arg0) (var_ref arg1)))))\n"
" ((return (expression bvec2 == (var_ref arg0) (var_ref arg1)))))\n"
"\n"
" (signature bvec3\n"
" (parameters\n"
" (declare (in) uvec3 arg0)\n"
" (declare (in) uvec3 arg1))\n"
" ((return (expression bvec3 all_equal (var_ref arg0) (var_ref arg1)))))\n"
" ((return (expression bvec3 == (var_ref arg0) (var_ref arg1)))))\n"
"\n"
" (signature bvec4\n"
" (parameters\n"
" (declare (in) uvec4 arg0)\n"
" (declare (in) uvec4 arg1))\n"
" ((return (expression bvec4 all_equal (var_ref arg0) (var_ref arg1)))))\n"
" ((return (expression bvec4 == (var_ref arg0) (var_ref arg1)))))\n"
"))\n"
""
;
@ -2311,73 +2311,73 @@ static const char *builtin_notEqual =
" (parameters\n"
" (declare (in) vec2 arg0)\n"
" (declare (in) vec2 arg1))\n"
" ((return (expression bvec2 any_nequal (var_ref arg0) (var_ref arg1)))))\n"
" ((return (expression bvec2 != (var_ref arg0) (var_ref arg1)))))\n"
"\n"
" (signature bvec3\n"
" (parameters\n"
" (declare (in) vec3 arg0)\n"
" (declare (in) vec3 arg1))\n"
" ((return (expression bvec3 any_nequal (var_ref arg0) (var_ref arg1)))))\n"
" ((return (expression bvec3 != (var_ref arg0) (var_ref arg1)))))\n"
"\n"
" (signature bvec4\n"
" (parameters\n"
" (declare (in) vec4 arg0)\n"
" (declare (in) vec4 arg1))\n"
" ((return (expression bvec4 any_nequal (var_ref arg0) (var_ref arg1)))))\n"
" ((return (expression bvec4 != (var_ref arg0) (var_ref arg1)))))\n"
"\n"
" (signature bvec2\n"
" (parameters\n"
" (declare (in) bvec2 arg0)\n"
" (declare (in) bvec2 arg1))\n"
" ((return (expression bvec2 any_nequal (var_ref arg0) (var_ref arg1)))))\n"
" ((return (expression bvec2 != (var_ref arg0) (var_ref arg1)))))\n"
"\n"
" (signature bvec3\n"
" (parameters\n"
" (declare (in) bvec3 arg0)\n"
" (declare (in) bvec3 arg1))\n"
" ((return (expression bvec3 any_nequal (var_ref arg0) (var_ref arg1)))))\n"
" ((return (expression bvec3 != (var_ref arg0) (var_ref arg1)))))\n"
"\n"
" (signature bvec4\n"
" (parameters\n"
" (declare (in) bvec4 arg0)\n"
" (declare (in) bvec4 arg1))\n"
" ((return (expression bvec4 any_nequal (var_ref arg0) (var_ref arg1)))))\n"
" ((return (expression bvec4 != (var_ref arg0) (var_ref arg1)))))\n"
"\n"
" (signature bvec2\n"
" (parameters\n"
" (declare (in) ivec2 arg0)\n"
" (declare (in) ivec2 arg1))\n"
" ((return (expression bvec2 any_nequal (var_ref arg0) (var_ref arg1)))))\n"
" ((return (expression bvec2 != (var_ref arg0) (var_ref arg1)))))\n"
"\n"
" (signature bvec3\n"
" (parameters\n"
" (declare (in) ivec3 arg0)\n"
" (declare (in) ivec3 arg1))\n"
" ((return (expression bvec3 any_nequal (var_ref arg0) (var_ref arg1)))))\n"
" ((return (expression bvec3 != (var_ref arg0) (var_ref arg1)))))\n"
"\n"
" (signature bvec4\n"
" (parameters\n"
" (declare (in) ivec4 arg0)\n"
" (declare (in) ivec4 arg1))\n"
" ((return (expression bvec4 any_nequal (var_ref arg0) (var_ref arg1)))))\n"
" ((return (expression bvec4 != (var_ref arg0) (var_ref arg1)))))\n"
"\n"
" (signature bvec2\n"
" (parameters\n"
" (declare (in) uvec2 arg0)\n"
" (declare (in) uvec2 arg1))\n"
" ((return (expression bvec2 any_nequal (var_ref arg0) (var_ref arg1)))))\n"
" ((return (expression bvec2 != (var_ref arg0) (var_ref arg1)))))\n"
"\n"
" (signature bvec3\n"
" (parameters\n"
" (declare (in) uvec3 arg0)\n"
" (declare (in) uvec3 arg1))\n"
" ((return (expression bvec3 any_nequal (var_ref arg0) (var_ref arg1)))))\n"
" ((return (expression bvec3 != (var_ref arg0) (var_ref arg1)))))\n"
"\n"
" (signature bvec4\n"
" (parameters\n"
" (declare (in) uvec4 arg0)\n"
" (declare (in) uvec4 arg1))\n"
" ((return (expression bvec4 any_nequal (var_ref arg0) (var_ref arg1)))))\n"
" ((return (expression bvec4 != (var_ref arg0) (var_ref arg1)))))\n"
"))\n"
""
;

24
src/glsl/builtins/ir/equal
View file

@ -3,71 +3,71 @@
(parameters
(declare (in) vec2 arg0)
(declare (in) vec2 arg1))
((return (expression bvec2 all_equal (var_ref arg0) (var_ref arg1)))))
((return (expression bvec2 == (var_ref arg0) (var_ref arg1)))))
(signature bvec3
(parameters
(declare (in) vec3 arg0)
(declare (in) vec3 arg1))
((return (expression bvec3 all_equal (var_ref arg0) (var_ref arg1)))))
((return (expression bvec3 == (var_ref arg0) (var_ref arg1)))))
(signature bvec4
(parameters
(declare (in) vec4 arg0)
(declare (in) vec4 arg1))
((return (expression bvec4 all_equal (var_ref arg0) (var_ref arg1)))))
((return (expression bvec4 == (var_ref arg0) (var_ref arg1)))))
(signature bvec2
(parameters
(declare (in) bvec2 arg0)
(declare (in) bvec2 arg1))
((return (expression bvec2 all_equal (var_ref arg0) (var_ref arg1)))))
((return (expression bvec2 == (var_ref arg0) (var_ref arg1)))))
(signature bvec3
(parameters
(declare (in) bvec3 arg0)
(declare (in) bvec3 arg1))
((return (expression bvec3 all_equal (var_ref arg0) (var_ref arg1)))))
((return (expression bvec3 == (var_ref arg0) (var_ref arg1)))))
(signature bvec4
(parameters
(declare (in) bvec4 arg0)
(declare (in) bvec4 arg1))
((return (expression bvec4 all_equal (var_ref arg0) (var_ref arg1)))))
((return (expression bvec4 == (var_ref arg0) (var_ref arg1)))))
(signature bvec2
(parameters
(declare (in) ivec2 arg0)
(declare (in) ivec2 arg1))
((return (expression bvec2 all_equal (var_ref arg0) (var_ref arg1)))))
((return (expression bvec2 == (var_ref arg0) (var_ref arg1)))))
(signature bvec3
(parameters
(declare (in) ivec3 arg0)
(declare (in) ivec3 arg1))
((return (expression bvec3 all_equal (var_ref arg0) (var_ref arg1)))))
((return (expression bvec3 == (var_ref arg0) (var_ref arg1)))))
(signature bvec4
(parameters
(declare (in) ivec4 arg0)
(declare (in) ivec4 arg1))
((return (expression bvec4 all_equal (var_ref arg0) (var_ref arg1)))))
((return (expression bvec4 == (var_ref arg0) (var_ref arg1)))))
(signature bvec2
(parameters
(declare (in) uvec2 arg0)
(declare (in) uvec2 arg1))
((return (expression bvec2 all_equal (var_ref arg0) (var_ref arg1)))))
((return (expression bvec2 == (var_ref arg0) (var_ref arg1)))))
(signature bvec3
(parameters
(declare (in) uvec3 arg0)
(declare (in) uvec3 arg1))
((return (expression bvec3 all_equal (var_ref arg0) (var_ref arg1)))))
((return (expression bvec3 == (var_ref arg0) (var_ref arg1)))))
(signature bvec4
(parameters
(declare (in) uvec4 arg0)
(declare (in) uvec4 arg1))
((return (expression bvec4 all_equal (var_ref arg0) (var_ref arg1)))))
((return (expression bvec4 == (var_ref arg0) (var_ref arg1)))))
))

24
src/glsl/builtins/ir/notEqual
View file

@ -3,71 +3,71 @@
(parameters
(declare (in) vec2 arg0)
(declare (in) vec2 arg1))
((return (expression bvec2 any_nequal (var_ref arg0) (var_ref arg1)))))
((return (expression bvec2 != (var_ref arg0) (var_ref arg1)))))
(signature bvec3
(parameters
(declare (in) vec3 arg0)
(declare (in) vec3 arg1))
((return (expression bvec3 any_nequal (var_ref arg0) (var_ref arg1)))))
((return (expression bvec3 != (var_ref arg0) (var_ref arg1)))))
(signature bvec4
(parameters
(declare (in) vec4 arg0)
(declare (in) vec4 arg1))
((return (expression bvec4 any_nequal (var_ref arg0) (var_ref arg1)))))
((return (expression bvec4 != (var_ref arg0) (var_ref arg1)))))
(signature bvec2
(parameters
(declare (in) bvec2 arg0)
(declare (in) bvec2 arg1))
((return (expression bvec2 any_nequal (var_ref arg0) (var_ref arg1)))))
((return (expression bvec2 != (var_ref arg0) (var_ref arg1)))))
(signature bvec3
(parameters
(declare (in) bvec3 arg0)
(declare (in) bvec3 arg1))
((return (expression bvec3 any_nequal (var_ref arg0) (var_ref arg1)))))
((return (expression bvec3 != (var_ref arg0) (var_ref arg1)))))
(signature bvec4
(parameters
(declare (in) bvec4 arg0)
(declare (in) bvec4 arg1))
((return (expression bvec4 any_nequal (var_ref arg0) (var_ref arg1)))))
((return (expression bvec4 != (var_ref arg0) (var_ref arg1)))))
(signature bvec2
(parameters
(declare (in) ivec2 arg0)
(declare (in) ivec2 arg1))
((return (expression bvec2 any_nequal (var_ref arg0) (var_ref arg1)))))
((return (expression bvec2 != (var_ref arg0) (var_ref arg1)))))
(signature bvec3
(parameters
(declare (in) ivec3 arg0)
(declare (in) ivec3 arg1))
((return (expression bvec3 any_nequal (var_ref arg0) (var_ref arg1)))))
((return (expression bvec3 != (var_ref arg0) (var_ref arg1)))))
(signature bvec4
(parameters
(declare (in) ivec4 arg0)
(declare (in) ivec4 arg1))
((return (expression bvec4 any_nequal (var_ref arg0) (var_ref arg1)))))
((return (expression bvec4 != (var_ref arg0) (var_ref arg1)))))
(signature bvec2
(parameters
(declare (in) uvec2 arg0)
(declare (in) uvec2 arg1))
((return (expression bvec2 any_nequal (var_ref arg0) (var_ref arg1)))))
((return (expression bvec2 != (var_ref arg0) (var_ref arg1)))))
(signature bvec3
(parameters
(declare (in) uvec3 arg0)
(declare (in) uvec3 arg1))
((return (expression bvec3 any_nequal (var_ref arg0) (var_ref arg1)))))
((return (expression bvec3 != (var_ref arg0) (var_ref arg1)))))
(signature bvec4
(parameters
(declare (in) uvec4 arg0)
(declare (in) uvec4 arg1))
((return (expression bvec4 any_nequal (var_ref arg0) (var_ref arg1)))))
((return (expression bvec4 != (var_ref arg0) (var_ref arg1)))))
))