glsl/builtins: Fix equal and notEqual builtins.

Commit 309cd4115b7cba669a0bf858e7809cb6dae90ddf incorrectly converted
these to all_equal and any_nequal, which is the wrong operation.

diff --git a/src/glsl/builtin_function.cpp b/src/glsl/builtin_function.cpp
index 1e633e3f3a8d4faf3988017f7afe7e05c4b04a6e..e7f00701a2d8658df6b33e8ee94b3ff5dd2db11d 100644 (file)
--- a/src/glsl/builtin_function.cpp
+++ b/src/glsl/builtin_function.cpp
@@ -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"
    ""
 ;

diff --git a/src/glsl/builtins/ir/equal b/src/glsl/builtins/ir/equal
index f6578dc1e32be7e6244cc731a5c040d136936d59..a414b3e535fb3a3427eb9d04f290fdbc7cbddde1 100644 (file)
--- a/src/glsl/builtins/ir/equal
+++ b/src/glsl/builtins/ir/equal
@@ -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)))))
 ))

diff --git a/src/glsl/builtins/ir/notEqual b/src/glsl/builtins/ir/notEqual
index d07cdbf41f15ff59e1948e5c99cf8d917e87a7e5..abaf1914c9f778826b07b1d996d8dd7beb5b21a0 100644 (file)
--- a/src/glsl/builtins/ir/notEqual
+++ b/src/glsl/builtins/ir/notEqual
@@ -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)))))
 ))