Giovanni Mascellani : vkd3d-shader/hlsl: Remove HLSL_OP2_GREATER and HLSL_OP2_LEQUAL.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 2d619f3d5293c5778b9884d7757bc39c97896ba0
URL:    https://source.winehq.org/git/vkd3d.git/?a=commit;h=2d619f3d5293c5778b9884d7757bc39c97896ba0

Author: Giovanni Mascellani <gmascellani at codeweavers.com>
Date:   Wed Jan 19 12:52:06 2022 +0100

vkd3d-shader/hlsl: Remove HLSL_OP2_GREATER and HLSL_OP2_LEQUAL.

They are replaced with HLSL_OP2_LESS and HLSL_OP2_GEQUAL after swapping
the parameters.

Signed-off-by: Giovanni Mascellani <gmascellani at codeweavers.com>
Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 Makefile.am              | 1 -
 libs/vkd3d-shader/hlsl.c | 2 --
 libs/vkd3d-shader/hlsl.h | 2 --
 libs/vkd3d-shader/hlsl.y | 4 ++--
 4 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 0c2fbf7..a3ec685 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -288,7 +288,6 @@ XFAIL_TESTS = \
 	tests/cast-to-half.shader_test \
 	tests/cast-to-int.shader_test \
 	tests/cast-to-uint.shader_test \
-	tests/conditional.shader_test \
 	tests/hlsl-array-dimension.shader_test \
 	tests/hlsl-bool-cast.shader_test \
 	tests/hlsl-duplicate-modifiers.shader_test \
diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c
index d2ea4c3..8ae3130 100644
--- a/libs/vkd3d-shader/hlsl.c
+++ b/libs/vkd3d-shader/hlsl.c
@@ -1198,8 +1198,6 @@ const char *debug_hlsl_expr_op(enum hlsl_ir_expr_op op)
         [HLSL_OP2_DOT]         = "dot",
         [HLSL_OP2_EQUAL]       = "==",
         [HLSL_OP2_GEQUAL]      = ">=",
-        [HLSL_OP2_GREATER]     = ">",
-        [HLSL_OP2_LEQUAL]      = "<=",
         [HLSL_OP2_LESS]        = "<",
         [HLSL_OP2_LOGIC_AND]   = "&&",
         [HLSL_OP2_LOGIC_OR]    = "||",
diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h
index 57acf3a..6aec0b0 100644
--- a/libs/vkd3d-shader/hlsl.h
+++ b/libs/vkd3d-shader/hlsl.h
@@ -316,8 +316,6 @@ enum hlsl_ir_expr_op
     HLSL_OP2_DOT,
     HLSL_OP2_EQUAL,
     HLSL_OP2_GEQUAL,
-    HLSL_OP2_GREATER,
-    HLSL_OP2_LEQUAL,
     HLSL_OP2_LESS,
     HLSL_OP2_LOGIC_AND,
     HLSL_OP2_LOGIC_OR,
diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
index 5a17449..cff56a7 100644
--- a/libs/vkd3d-shader/hlsl.y
+++ b/libs/vkd3d-shader/hlsl.y
@@ -3422,11 +3422,11 @@ relational_expr:
         }
     | relational_expr '>' shift_expr
         {
-            $$ = add_binary_comparison_expr_merge(ctx, $1, $3, HLSL_OP2_GREATER, @2);
+            $$ = add_binary_comparison_expr_merge(ctx, $3, $1, HLSL_OP2_LESS, @2);
         }
     | relational_expr OP_LE shift_expr
         {
-            $$ = add_binary_comparison_expr_merge(ctx, $1, $3, HLSL_OP2_LEQUAL, @2);
+            $$ = add_binary_comparison_expr_merge(ctx, $3, $1, HLSL_OP2_GEQUAL, @2);
         }
     | relational_expr OP_GE shift_expr
         {