wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-04-13 05:43:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/hlsl: Remove HLSL_OP2_GREATER and HLSL_OP2_LEQUAL.

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

Signed-off-by: Giovanni Mascellani <gmascellani@codeweavers.com>
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Giovanni Mascellani
2022-01-19 12:52:06 +01:00
committed by Alexandre Julliard
parent 9182e73e64
commit 2d619f3d52
4 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -288,7 +288,6 @@ XFAIL_TESTS = \
tests/cast-to-half.shader_test \ tests/cast-to-half.shader_test \
tests/cast-to-int.shader_test \ tests/cast-to-int.shader_test \
tests/cast-to-uint.shader_test \ tests/cast-to-uint.shader_test \
tests/conditional.shader_test \
tests/hlsl-array-dimension.shader_test \ tests/hlsl-array-dimension.shader_test \
tests/hlsl-bool-cast.shader_test \ tests/hlsl-bool-cast.shader_test \
tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \

2
libs/vkd3d-shader/hlsl.c
View File

@ -1198,8 +1198,6 @@ const char *debug_hlsl_expr_op(enum hlsl_ir_expr_op op)
[HLSL_OP2_DOT] = "dot", [HLSL_OP2_DOT] = "dot",
[HLSL_OP2_EQUAL] = "==", [HLSL_OP2_EQUAL] = "==",
[HLSL_OP2_GEQUAL] = ">=", [HLSL_OP2_GEQUAL] = ">=",
[HLSL_OP2_GREATER] = ">",
[HLSL_OP2_LEQUAL] = "<=",
[HLSL_OP2_LESS] = "<", [HLSL_OP2_LESS] = "<",
[HLSL_OP2_LOGIC_AND] = "&&", [HLSL_OP2_LOGIC_AND] = "&&",
[HLSL_OP2_LOGIC_OR] = "||", [HLSL_OP2_LOGIC_OR] = "||",

2
libs/vkd3d-shader/hlsl.h
View File

@ -316,8 +316,6 @@ enum hlsl_ir_expr_op
HLSL_OP2_DOT, HLSL_OP2_DOT,
HLSL_OP2_EQUAL, HLSL_OP2_EQUAL,
HLSL_OP2_GEQUAL, HLSL_OP2_GEQUAL,
HLSL_OP2_GREATER,
HLSL_OP2_LEQUAL,
HLSL_OP2_LESS, HLSL_OP2_LESS,
HLSL_OP2_LOGIC_AND, HLSL_OP2_LOGIC_AND,
HLSL_OP2_LOGIC_OR, HLSL_OP2_LOGIC_OR,

4
libs/vkd3d-shader/hlsl.y
View File

@ -3422,11 +3422,11 @@ relational_expr:
} }
| relational_expr '>' shift_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 | 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 | relational_expr OP_GE shift_expr
{ {