March 2022 - Wine-commits - list.winehq.org

Giovanni Mascellani : vkd3d-shader/hlsl: Parse left shift.
by Alexandre Julliard 02 Mar '22

02 Mar '22

Module: vkd3d Branch: master Commit: 6fa13816579c58f35e99fb83f6761f47e6f3e4df URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6fa13816579c58f35e99fb8… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Feb 24 12:45:18 2022 -0600 vkd3d-shader/hlsl: Parse left shift. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 4cdb471..7c7c89e 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1171,6 +1171,49 @@ static struct list *add_binary_logical_expr_merge(struct hlsl_ctx *ctx, struct l return list1; } +static struct hlsl_ir_expr *add_binary_shift_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) +{ + enum hlsl_base_type base = arg1->data_type->base_type; + struct hlsl_ir_node *args[HLSL_MAX_OPERANDS] = {0}; + struct hlsl_type *return_type, *integer_type; + enum hlsl_type_class type; + unsigned int dimx, dimy; + + check_integer_type(ctx, arg1); + check_integer_type(ctx, arg2); + + if (base == HLSL_TYPE_BOOL) + base = HLSL_TYPE_INT; + + if (!expr_common_shape(ctx, arg1->data_type, arg2->data_type, loc, &type, &dimx, &dimy)) + return NULL; + + return_type = hlsl_get_numeric_type(ctx, type, base, dimx, dimy); + integer_type = hlsl_get_numeric_type(ctx, type, HLSL_TYPE_INT, dimx, dimy); + + if (!(args[0] = add_implicit_conversion(ctx, instrs, arg1, return_type, loc))) + return NULL; + + if (!(args[1] = add_implicit_conversion(ctx, instrs, arg2, integer_type, loc))) + return NULL; + + return add_expr(ctx, instrs, op, args, return_type, loc); +} + +static struct list *add_binary_shift_expr_merge(struct hlsl_ctx *ctx, struct list *list1, struct list *list2, + enum hlsl_ir_expr_op op, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_node *arg1 = node_from_list(list1), *arg2 = node_from_list(list2); + + list_move_tail(list1, list2); + vkd3d_free(list2); + add_binary_shift_expr(ctx, list1, op, arg1, arg2, loc); + + return list1; +} + static enum hlsl_ir_expr_op op_from_assignment(enum parse_assign_op op) { static const enum hlsl_ir_expr_op ops[] = @@ -3637,7 +3680,7 @@ shift_expr: add_expr | shift_expr OP_LEFTSHIFT add_expr { - hlsl_fixme(ctx, &@$, "Left shift."); + $$ = add_binary_shift_expr_merge(ctx, $1, $3, HLSL_OP2_LSHIFT, &@2); } | shift_expr OP_RIGHTSHIFT add_expr {

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Parse right shift.
by Alexandre Julliard 02 Mar '22

02 Mar '22

Module: vkd3d Branch: master Commit: 7aeb99261c7b84f99205f9ad80251638ea6ddcfd URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7aeb99261c7b84f99205f9a… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Feb 24 12:45:19 2022 -0600 vkd3d-shader/hlsl: Parse right shift. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 7c7c89e..c1c229a 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3684,7 +3684,7 @@ shift_expr: } | shift_expr OP_RIGHTSHIFT add_expr { - hlsl_fixme(ctx, &@$, "Right shift."); + $$ = add_binary_shift_expr_merge(ctx, $1, $3, HLSL_OP2_RSHIFT, &@2); } relational_expr:

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Fix typing rules for bitwise NOT.
by Alexandre Julliard 02 Mar '22

02 Mar '22

Module: vkd3d Branch: master Commit: a83919c22875aeb1abecbb8a6181bf1ec9168a37 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a83919c22875aeb1abecbb8… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Feb 24 12:45:20 2022 -0600 vkd3d-shader/hlsl: Fix typing rules for bitwise NOT. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index c1c229a..328f1bb 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1043,6 +1043,14 @@ static struct hlsl_ir_expr *add_unary_arithmetic_expr(struct hlsl_ctx *ctx, stru return add_expr(ctx, instrs, op, args, arg->data_type, loc); } +static struct hlsl_ir_expr *add_unary_bitwise_expr(struct hlsl_ctx *ctx, struct list *instrs, + enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg, const struct vkd3d_shader_location *loc) +{ + check_integer_type(ctx, arg); + + return add_unary_arithmetic_expr(ctx, instrs, op, arg, loc); +} + static struct hlsl_ir_expr *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) @@ -3595,7 +3603,7 @@ unary_expr: } | '~' unary_expr { - add_unary_arithmetic_expr(ctx, $2, HLSL_OP1_BIT_NOT, node_from_list($2), &@1); + add_unary_bitwise_expr(ctx, $2, HLSL_OP1_BIT_NOT, node_from_list($2), &@1); $$ = $2; } | '!' unary_expr

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Fix typing rules for logical NOT.
by Alexandre Julliard 02 Mar '22

02 Mar '22

Module: vkd3d Branch: master Commit: be5668382ea574ec602c3d0c0eab0ba98014fa54 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=be5668382ea574ec602c3d0… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Feb 24 12:45:21 2022 -0600 vkd3d-shader/hlsl: Fix typing rules for logical NOT. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 328f1bb..92dcb3f 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1051,6 +1051,21 @@ static struct hlsl_ir_expr *add_unary_bitwise_expr(struct hlsl_ctx *ctx, struct return add_unary_arithmetic_expr(ctx, instrs, op, arg, loc); } +static struct hlsl_ir_expr *add_unary_logical_expr(struct hlsl_ctx *ctx, struct list *instrs, + enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_node *args[HLSL_MAX_OPERANDS] = {0}; + struct hlsl_type *bool_type; + + bool_type = hlsl_get_numeric_type(ctx, arg->data_type->type, HLSL_TYPE_BOOL, + arg->data_type->dimx, arg->data_type->dimy); + + if (!(args[0] = add_implicit_conversion(ctx, instrs, arg, bool_type, loc))) + return NULL; + + return add_expr(ctx, instrs, op, args, bool_type, loc); +} + static struct hlsl_ir_expr *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) @@ -3608,7 +3623,7 @@ unary_expr: } | '!' unary_expr { - add_unary_arithmetic_expr(ctx, $2, HLSL_OP1_LOGIC_NOT, node_from_list($2), &@1); + add_unary_logical_expr(ctx, $2, HLSL_OP1_LOGIC_NOT, node_from_list($2), &@1); $$ = $2; } /* var_modifiers is necessary to avoid shift/reduce conflicts. */

1 0

Francisco Casas : vkd3d-shader/hlsl: Fix order of matrix dimensions in hlsl_type_to_string().
by Alexandre Julliard 02 Mar '22

02 Mar '22

Module: vkd3d Branch: master Commit: 94e84423559329a2d31781b0795d4eba9ed89975 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=94e84423559329a2d31781b… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Feb 25 12:25:31 2022 -0300 vkd3d-shader/hlsl: Fix order of matrix dimensions in hlsl_type_to_string(). Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 00a374b..ea5e35d 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -902,7 +902,7 @@ struct vkd3d_string_buffer *hlsl_type_to_string(struct hlsl_ctx *ctx, const stru case HLSL_CLASS_MATRIX: assert(type->base_type < ARRAY_SIZE(base_types)); - vkd3d_string_buffer_printf(string, "%s%ux%u", base_types[type->base_type], type->dimx, type->dimy); + vkd3d_string_buffer_printf(string, "%s%ux%u", base_types[type->base_type], type->dimy, type->dimx); return string; case HLSL_CLASS_ARRAY:

1 0

Matteo Bruni : vkd3d-shader/hlsl: Remove trivial swizzles after each copy prop pass.
by Alexandre Julliard 02 Mar '22

02 Mar '22

Module: vkd3d Branch: master Commit: e1865cf98add49fe4572b69db47878cc8b37c365 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e1865cf98add49fe4572b69… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 2 13:21:21 2022 +0100 vkd3d-shader/hlsl: Remove trivial swizzles after each copy prop pass. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 - libs/vkd3d-shader/hlsl_codegen.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index e4f92bb..f3db6d0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -315,7 +315,6 @@ XFAIL_TESTS = \ tests/hlsl-initializer-numeric.shader_test \ tests/hlsl-initializer-static-array.shader_test \ tests/hlsl-initializer-struct.shader_test \ - tests/hlsl-bool-cast.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ tests/hlsl-function.shader_test \ diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 837d39e..62dbce5 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1666,9 +1666,9 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry { progress = transform_ir(ctx, hlsl_fold_constants, body, NULL); progress |= copy_propagation_execute(ctx, body); + progress |= transform_ir(ctx, remove_trivial_swizzles, body, NULL); } while (progress); - transform_ir(ctx, remove_trivial_swizzles, body, NULL); if (ctx->profile->major_version < 4) transform_ir(ctx, lower_division, body, NULL);

1 0

Henri Verbeet : build: Add the flex and bison sources to the distribution.
by Alexandre Julliard 02 Mar '22

02 Mar '22

Module: vkd3d Branch: master Commit: 2d36d7f16d96b7f1bea3e62ae1e1b3ff775d3015 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2d36d7f16d96b7f1bea3e62… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 2 19:06:18 2022 +0100 build: Add the flex and bison sources to the distribution. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index f3db6d0..db50be7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -228,6 +228,12 @@ libvkd3d_shader_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d-shader/v EXTRA_libvkd3d_shader_la_DEPENDENCIES = $(srcdir)/libs/vkd3d-shader/vkd3d_shader.map endif +EXTRA_DIST = \ + libs/vkd3d-shader/hlsl.l \ + libs/vkd3d-shader/hlsl.y \ + libs/vkd3d-shader/preproc.l \ + libs/vkd3d-shader/preproc.y + libvkd3d_la_SOURCES = \ include/private/vkd3d_blob.h \ include/private/vkd3d_common.h \ @@ -268,7 +274,7 @@ libvkd3d_utils_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d-utils/vkd EXTRA_libvkd3d_utils_la_DEPENDENCIES = $(srcdir)/libs/vkd3d-utils/vkd3d_utils.map endif -EXTRA_DIST = ANNOUNCE LICENSE +EXTRA_DIST += ANNOUNCE LICENSE pkgconfigdir = $(libdir)/pkgconfig pkginclude_HEADERS = $(vkd3d_public_headers)

1 0

Henri Verbeet : build: Add the shader tests to the distribution.
by Alexandre Julliard 02 Mar '22

02 Mar '22

Module: vkd3d Branch: master Commit: f71ffabf810994adddd63255a4127c98d52c86ad URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f71ffabf810994adddd6325… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 2 19:06:19 2022 +0100 build: Add the shader tests to the distribution. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile.am b/Makefile.am index db50be7..adf74f1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -347,6 +347,8 @@ XFAIL_TESTS = \ tests/trigonometry.shader_test endif +EXTRA_DIST += $(vkd3d_shader_tests) + if BUILD_DEMOS DEMOS_LDADD = $(LDADD) libvkd3d-shader.la @DEMO_LIBS@ @VULKAN_LIBS@ DEMOS_CFLAGS = $(AM_CFLAGS) @DEMO_CFLAGS@

1 0

Henri Verbeet : vkd3d-shader: Slightly clarify the documentation for struct vkd3d_shader_descriptor_offset_info.
by Alexandre Julliard 02 Mar '22

02 Mar '22

Module: vkd3d Branch: master Commit: f276cbd8216af6375f7d030bebd27f99f448bda6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f276cbd8216af6375f7d030… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 2 19:06:20 2022 +0100 vkd3d-shader: Slightly clarify the documentation for struct vkd3d_shader_descriptor_offset_info. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index df15047..8797de5 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -538,7 +538,7 @@ struct vkd3d_shader_descriptor_offset_info * binding.count = 2 * \endcode * - * and then pass \c {8, \c 4} as \a binding_offsets here. + * and then pass \c {8, \c 4} as static binding offsets here. * * This field may be NULL, in which case the corresponding offsets are * specified to be 0.

1 0

Henri Verbeet : vkd3d-shader: Add a description for VKD3D_SHADER_TARGET_D3D_ASM.
by Alexandre Julliard 02 Mar '22

02 Mar '22

Module: vkd3d Branch: master Commit: fcf36f56c5a31c3ae8a4453244b6c4a8e613a67c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=fcf36f56c5a31c3ae8a4453… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 2 19:06:21 2022 +0100 vkd3d-shader: Add a description for VKD3D_SHADER_TARGET_D3D_ASM. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 8797de5..406f3af 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -591,6 +591,9 @@ enum vkd3d_shader_target_type */ VKD3D_SHADER_TARGET_SPIRV_BINARY, VKD3D_SHADER_TARGET_SPIRV_TEXT, + /** + * Direct3D shader assembly. \since 1.3 + */ VKD3D_SHADER_TARGET_D3D_ASM, /** * Legacy Direct3D byte-code. This is the format used for Direct3D shader

1 0