[PATCH 0/2] MR201: vkd3d-shader/hlsl: Convert ternary operator true/false values to a common type.
From: Nikolay Sivov <nsivov(a)codeweavers.com> --- tests/conditional.shader_test | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/tests/conditional.shader_test b/tests/conditional.shader_test index 423077771..d83596fcd 100644 --- a/tests/conditional.shader_test +++ b/tests/conditional.shader_test @@ -1,19 +1,16 @@ -[vertex shader] -void main(out float tex : texcoord, inout float4 pos : sv_position) -{ - tex = pos.x; -} - [pixel shader] -float4 main(float tex : texcoord) : SV_TARGET +float4 main(uniform float4 u) : sv_target { - if (tex > 0.0) + if (u.x > 0.0) return float4(0.1, 0.2, 0.3, 0.4); else return float4(0.9, 0.8, 0.7, 0.6); } [test] +uniform 0 float4 0.0 0.0 0.0 0.0 +draw quad +probe all rgba (0.9, 0.8, 0.7, 0.6) +uniform 0 float4 0.1 0.0 0.0 0.0 draw quad -probe ( 0, 0, 319, 480) rgba (0.9, 0.8, 0.7, 0.6) -probe (321, 0, 640, 480) rgba (0.1, 0.2, 0.3, 0.4) +probe all rgba (0.1, 0.2, 0.3, 0.4) -- GitLab https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/201
From: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 29 +++++++++++++++++++++++------ tests/hlsl-ternary.shader_test | 20 +++++++++++++++++++- 2 files changed, 42 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 75c0e421c..7a8b56738 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1365,20 +1365,27 @@ static struct hlsl_ir_node *add_unary_logical_expr(struct hlsl_ctx *ctx, struct return add_expr(ctx, instrs, op, args, bool_type, loc); } -static struct hlsl_ir_node *add_binary_arithmetic_expr(struct hlsl_ctx *ctx, struct list *instrs, - enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg1, struct hlsl_ir_node *arg2, - const struct vkd3d_shader_location *loc) +static struct hlsl_type *get_common_numeric_type(struct hlsl_ctx *ctx, const struct hlsl_ir_node *arg1, + const struct hlsl_ir_node *arg2, const struct vkd3d_shader_location *loc) { - struct hlsl_type *common_type; enum hlsl_base_type base = expr_common_base_type(arg1->data_type->base_type, arg2->data_type->base_type); enum hlsl_type_class type; unsigned int dimx, dimy; - struct hlsl_ir_node *args[HLSL_MAX_OPERANDS] = {0}; if (!expr_common_shape(ctx, arg1->data_type, arg2->data_type, loc, &type, &dimx, &dimy)) return NULL; - common_type = hlsl_get_numeric_type(ctx, type, base, dimx, dimy); + return hlsl_get_numeric_type(ctx, type, base, dimx, dimy); +} + +static struct hlsl_ir_node *add_binary_arithmetic_expr(struct hlsl_ctx *ctx, struct list *instrs, + enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg1, struct hlsl_ir_node *arg2, + const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_node *args[HLSL_MAX_OPERANDS] = {0}; + struct hlsl_type *common_type; + + common_type = get_common_numeric_type(ctx, arg1, arg2, loc); if (!(args[0] = add_implicit_conversion(ctx, instrs, arg1, common_type, loc))) return NULL; @@ -5979,12 +5986,22 @@ conditional_expr: | logicor_expr '?' expr ':' assignment_expr { struct hlsl_ir_node *cond = node_from_list($1), *first = node_from_list($3), *second = node_from_list($5); + struct hlsl_type *common_type; list_move_tail($1, $3); list_move_tail($1, $5); vkd3d_free($3); vkd3d_free($5); + if (!(common_type = get_common_numeric_type(ctx, first, second, &@3))) + YYABORT; + + if (!(first = add_implicit_conversion(ctx, $1, first, common_type, &@3))) + YYABORT; + + if (!(second = add_implicit_conversion(ctx, $1, second, common_type, &@5))) + YYABORT; + if (!hlsl_add_conditional(ctx, $1, cond, first, second)) YYABORT; $$ = $1; diff --git a/tests/hlsl-ternary.shader_test b/tests/hlsl-ternary.shader_test index d60971656..1fc2f0701 100644 --- a/tests/hlsl-ternary.shader_test +++ b/tests/hlsl-ternary.shader_test @@ -1,7 +1,7 @@ [pixel shader] uniform float4 x; -float4 main() : SV_TARGET +float4 main() : sv_target { return x.x ? x : x - 1; } @@ -13,3 +13,21 @@ probe all rgba (2.0, 3.0, 4.0, 5.0) uniform 0 float4 0.0 10.0 11.0 12.0 draw quad probe all rgba (-1.0, 9.0, 10.0, 11.0) + +[pixel shader] +uniform float4 x; + +float4 main() : sv_target +{ + float4 ret; + + ret.x = x.x ? x.x : 1; + ret.y = x.y ? 2 : x.y; + ret.z = ret.w = 0.0; + return ret; +} + +[test] +uniform 0 float4 1.1 3.0 4.0 5.0 +draw quad +probe all rgba (1.1, 2.0, 0.0, 0.0) -- GitLab https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/201
Giovanni Mascellani (@giomasce) commented about libs/vkd3d-shader/hlsl.y:
struct hlsl_ir_node *cond = node_from_list($1), *first = node_from_list($3), *second = node_from_list($5); + struct hlsl_type *common_type;
list_move_tail($1, $3); list_move_tail($1, $5); vkd3d_free($3); vkd3d_free($5);
+ if (!(common_type = get_common_numeric_type(ctx, first, second, &@3))) + YYABORT; + + if (!(first = add_implicit_conversion(ctx, $1, first, common_type, &@3))) + YYABORT; + + if (!(second = add_implicit_conversion(ctx, $1, second, common_type, &@5))) + YYABORT;
I wonder if those should rather go inside `hlsl_add_conditional()`. I don't a strong opinion though. -- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/201#note_32141
On Mon May 8 09:16:47 2023 +0000, Giovanni Mascellani wrote:
I wonder if those should rather go inside `hlsl_add_conditional()`. I don't a strong opinion though. I dind't do it this way because assert() is in hlsl_add_conditional(), so I assumed we want to keep that.
-- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/201#note_32142
This merge request was approved by Zebediah Figura. -- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/201
This merge request was approved by Giovanni Mascellani. -- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/201
This merge request was approved by Henri Verbeet. -- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/201
participants (5)
-
Giovanni Mascellani (＠giomasce) -
Henri Verbeet (＠hverbeet)
-
Nikolay Sivov
-
Nikolay Sivov (＠nsivov)
-
Zebediah Figura (＠zfigura)