- Wine-Commits - list.winehq.org

Francisco Casas : vkd3d-shader/hlsl: Add a more specific error for missing compatible fn. definitions.
by Alexandre Julliard Feb. 20, 2023

Feb. 20, 2023

Module: vkd3d Branch: master Commit: 7f009f59cee74890ccd04f1432fa938beb285f6a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7f009f59cee74890ccd04f1432fa9… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Feb 8 16:37:01 2023 -0300 vkd3d-shader/hlsl: Add a more specific error for missing compatible fn. definitions. --- libs/vkd3d-shader/hlsl.y | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 42acbd95..697b895d 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3194,6 +3194,12 @@ static struct list *add_call(struct hlsl_ctx *ctx, const char *name, if (!intrinsic->handler(ctx, args, loc)) goto fail; } + else if (rb_get(&ctx->functions, name)) + { + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_NOT_DEFINED, "No compatible %u parameter declaration for \"%s\" found.", + args->args_count, name); + goto fail; + } else { hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_NOT_DEFINED, "Function \"%s\" is not defined.", name);

1 0

Zebediah Figura : configure: Declare LFLAGS and YFLAGS as precious.
by Alexandre Julliard Feb. 20, 2023

Feb. 20, 2023

Module: vkd3d Branch: master Commit: 02e3be811b0c9d373d8e2123caaef3397119225c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/02e3be811b0c9d373d8e2123caaef… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 14 18:46:36 2022 -0600 configure: Declare LFLAGS and YFLAGS as precious. Normally AC_PROG_LEX and AC_PROG_YACC do this, but we demand flex and bison specifically. --- configure.ac | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure.ac b/configure.ac index 8258b4cc..99864651 100644 --- a/configure.ac +++ b/configure.ac @@ -32,9 +32,11 @@ AS_IF([test "x$WIDL" = "xno"], [AC_MSG_WARN([widl is required to build header fi AC_CHECK_PROGS([FLEX], [flex], [none]) AS_IF([test "$FLEX" = "none"], [AC_MSG_ERROR([no suitable flex found. Please install the 'flex' package.])]) +AC_ARG_VAR([LFLAGS], [extra flags for flex]) AC_CHECK_PROGS([BISON], [bison], [none]) AS_IF([test "$BISON" = "none"], [AC_MSG_ERROR([no suitable bison found. Please install the 'bison' package.])]) +AC_ARG_VAR([YFLAGS], [extra flags for bison]) DX_PS_FEATURE([OFF]) DX_INIT_DOXYGEN([vkd3d], [Doxyfile], [doc])

1 0

Francisco Casas : vkd3d-shader/hlsl: Parse array types in function parameters.
by Alexandre Julliard Feb. 20, 2023

Feb. 20, 2023

Module: vkd3d Branch: master Commit: d279d34801bfa852d15a699813c6a62227537c5e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d279d34801bfa852d15a699813c6a… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Jan 26 10:13:20 2023 -0300 vkd3d-shader/hlsl: Parse array types in function parameters. --- libs/vkd3d-shader/hlsl.y | 20 ++++++++++++++++---- tests/array-parameters.shader_test | 26 ++++++++++++++++++++------ 2 files changed, 36 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 9967db98..d1ca91b8 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -4317,10 +4317,11 @@ param_list: } parameter: - var_modifiers type_no_void any_identifier colon_attribute + var_modifiers type_no_void any_identifier arrays colon_attribute { - struct hlsl_type *type; unsigned int modifiers = $1; + struct hlsl_type *type; + unsigned int i; if (!(type = apply_type_modifiers(ctx, $2, &modifiers, @1))) YYABORT; @@ -4328,10 +4329,21 @@ parameter: $$.modifiers = modifiers; if (!($$.modifiers & (HLSL_STORAGE_IN | HLSL_STORAGE_OUT))) $$.modifiers |= HLSL_STORAGE_IN; + + for (i = 0; i < $4.count; ++i) + { + if ($4.sizes[i] == HLSL_ARRAY_ELEMENTS_COUNT_IMPLICIT) + { + hlsl_error(ctx, &@3, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "Implicit size arrays not allowed in function parameters."); + } + type = hlsl_new_array_type(ctx, type, $4.sizes[i]); + } $$.type = type; + $$.name = $3; - $$.semantic = $4.semantic; - $$.reg_reservation = $4.reg_reservation; + $$.semantic = $5.semantic; + $$.reg_reservation = $5.reg_reservation; } texture_type: diff --git a/tests/array-parameters.shader_test b/tests/array-parameters.shader_test index 615aa3f4..3b7d628d 100644 --- a/tests/array-parameters.shader_test +++ b/tests/array-parameters.shader_test @@ -1,4 +1,4 @@ -[pixel shader todo] +[pixel shader] float fun(float a[2]) { return 10 * a[0] + a[1]; @@ -12,8 +12,8 @@ float4 main() : sv_target } [test] -todo draw quad -todo probe all rgba (25.0, 25.0, 25.0, 25.0) +draw quad +probe all rgba (25.0, 25.0, 25.0, 25.0) [pixel shader fail] @@ -58,7 +58,7 @@ float4 main() : sv_target } -[pixel shader todo] +[pixel shader] float4 fun(float a[2][4]) { float4 res; @@ -78,8 +78,22 @@ float4 main() : sv_target } [test] -todo draw quad -todo probe all rgba (15.0, 26.0, 37.0, 48.0) +draw quad +probe all rgba (15.0, 26.0, 37.0, 48.0) + + +[pixel shader fail] +float fun(float a[2]) +{ + return a[2]; // out of bounds. +} + +float4 main() : sv_target +{ + float f[2] = {1, 2}; + + return fun(f); +} [pixel shader fail]

1 0

Francisco Casas : vkd3d-shader/hlsl: Find compatible function overloads.
by Alexandre Julliard Feb. 20, 2023

Feb. 20, 2023

Module: vkd3d Branch: master Commit: f08c0a7c035286bdb8339c642de0de7d87abae93 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f08c0a7c035286bdb8339c642de0d… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Jan 23 17:02:40 2023 -0300 vkd3d-shader/hlsl: Find compatible function overloads. But still throw hlsl_fixme() when there is more than one. Prioritizing among multiple compatible function overloads in the same way as the native compiler would require systematic testing. --- libs/vkd3d-shader/hlsl.y | 45 ++++++++++++++++++++++++++---- tests/array-parameters.shader_test | 12 ++++---- tests/cast-broadcast.shader_test | 6 ++-- tests/cast-componentwise-equal.shader_test | 6 ++-- tests/hlsl-intrinsic-override.shader_test | 10 +++---- 5 files changed, 56 insertions(+), 23 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index d1ca91b8..42acbd95 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2220,8 +2220,10 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t struct find_function_call_args { + struct hlsl_ctx *ctx; const struct parse_initializer *params; struct hlsl_ir_function_decl *decl; + unsigned int compatible_overloads_count; }; static void find_function_call_exact(struct rb_entry *entry, void *context) @@ -2241,10 +2243,31 @@ static void find_function_call_exact(struct rb_entry *entry, void *context) args->decl = decl; } +static void find_function_call_compatible(struct rb_entry *entry, void *context) +{ + struct hlsl_ir_function_decl *decl = RB_ENTRY_VALUE(entry, struct hlsl_ir_function_decl, entry); + struct find_function_call_args *args = context; + unsigned int i; + + if (decl->parameters.count != args->params->args_count) + return; + + for (i = 0; i < decl->parameters.count; ++i) + { + if (!implicit_compatible_data_types(args->ctx, args->params->args[i]->data_type, + decl->parameters.vars[i]->data_type)) + return; + } + + args->compatible_overloads_count++; + args->decl = decl; +} + static struct hlsl_ir_function_decl *find_function_call(struct hlsl_ctx *ctx, - const char *name, const struct parse_initializer *params) + const char *name, const struct parse_initializer *params, + const struct vkd3d_shader_location *loc) { - struct find_function_call_args args = {.params = params}; + struct find_function_call_args args = {.ctx = ctx, .params = params}; struct hlsl_ir_function *func; struct rb_entry *entry; @@ -2254,7 +2277,13 @@ static struct hlsl_ir_function_decl *find_function_call(struct hlsl_ctx *ctx, rb_for_each_entry(&func->overloads, find_function_call_exact, &args); if (!args.decl) - FIXME("Search for compatible overloads.\n"); + { + rb_for_each_entry(&func->overloads, find_function_call_compatible, &args); + if (args.compatible_overloads_count > 1) + { + hlsl_fixme(ctx, loc, "Prioritize between multiple compatible function overloads."); + } + } return args.decl; } @@ -3055,7 +3084,7 @@ static struct list *add_call(struct hlsl_ctx *ctx, const char *name, struct intrinsic_function *intrinsic; struct hlsl_ir_function_decl *decl; - if ((decl = find_function_call(ctx, name, args))) + if ((decl = find_function_call(ctx, name, args, loc))) { struct hlsl_ir_node *call; unsigned int i; @@ -3069,8 +3098,12 @@ static struct list *add_call(struct hlsl_ctx *ctx, const char *name, if (!hlsl_types_are_equal(arg->data_type, param->data_type)) { - hlsl_fixme(ctx, &arg->loc, "Implicit cast of a function argument."); - continue; + struct hlsl_ir_node *cast; + + if (!(cast = add_cast(ctx, args->instrs, arg, param->data_type, &arg->loc))) + goto fail; + args->args[i] = cast; + arg = cast; } if (param->storage_modifiers & HLSL_STORAGE_IN) diff --git a/tests/array-parameters.shader_test b/tests/array-parameters.shader_test index 3b7d628d..6e866ceb 100644 --- a/tests/array-parameters.shader_test +++ b/tests/array-parameters.shader_test @@ -139,7 +139,7 @@ float4 main() : sv_target % Arrays with the same number of components are allowed. -[pixel shader todo] +[pixel shader] float fun(float a[2][3]) { return 100*a[0][0] + 10*a[0][2] + a[1][2]; @@ -153,11 +153,11 @@ float4 main() : sv_target } [test] -todo draw quad -todo probe all rgba (136.0, 136.0, 136.0, 136.0) +draw quad +probe all rgba (136.0, 136.0, 136.0, 136.0) -[pixel shader todo] +[pixel shader] float fun(float a[2][3]) { return 100*a[0][0] + 10*a[1][0] + a[1][2]; @@ -171,5 +171,5 @@ float4 main() : sv_target } [test] -todo draw quad -todo probe all rgba (702.0, 702.0, 702.0, 702.0) +draw quad +probe all rgba (702.0, 702.0, 702.0, 702.0) diff --git a/tests/cast-broadcast.shader_test b/tests/cast-broadcast.shader_test index a7462e76..3ec9cd40 100644 --- a/tests/cast-broadcast.shader_test +++ b/tests/cast-broadcast.shader_test @@ -82,7 +82,7 @@ float4 PSMain() : SV_TARGET } -[pixel shader todo] +[pixel shader] float4 fun(float3 f) { return f.xyxy; @@ -94,5 +94,5 @@ float4 main() : SV_TARGET } [test] -todo draw quad -todo probe all rgba (33.0, 33.0, 33.0, 33.0) +draw quad +probe all rgba (33.0, 33.0, 33.0, 33.0) diff --git a/tests/cast-componentwise-equal.shader_test b/tests/cast-componentwise-equal.shader_test index 7fe9304b..4a25f6dd 100644 --- a/tests/cast-componentwise-equal.shader_test +++ b/tests/cast-componentwise-equal.shader_test @@ -124,7 +124,7 @@ draw quad probe all rgba (4.0, 4.0, 4.0, 4.0) -[pixel shader todo] +[pixel shader] Texture2D tex; struct apple @@ -154,8 +154,8 @@ float4 main() : sv_target } [test] -todo draw quad -todo probe all rgba (5.0, 5.0, 5.0, 5.0) +draw quad +probe all rgba (5.0, 5.0, 5.0, 5.0) [pixel shader] diff --git a/tests/hlsl-intrinsic-override.shader_test b/tests/hlsl-intrinsic-override.shader_test index f9233a5c..13e1752d 100644 --- a/tests/hlsl-intrinsic-override.shader_test +++ b/tests/hlsl-intrinsic-override.shader_test @@ -1,4 +1,4 @@ -[pixel shader todo] +[pixel shader] float2 max(float2 a, float2 b) { @@ -11,10 +11,10 @@ float4 main() : sv_target } [test] -todo draw quad -probe all rgba (0.3, 0.3, 0.4, 0.6) +draw quad +todo probe all rgba (0.3, 0.3, 0.4, 0.6) -[pixel shader todo] +[pixel shader] float2 max(float2 a, float3 b) { @@ -27,5 +27,5 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (0.3, 0.3, 0.3, 0.4)

1 0

Francisco Casas : tests: Test array parameters on functions.
by Alexandre Julliard Feb. 20, 2023

Feb. 20, 2023

Module: vkd3d Branch: master Commit: 9df54851c958819cb82f92506a9d37e7d7ab87e2 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9df54851c958819cb82f92506a9d3… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Jan 26 11:40:02 2023 -0300 tests: Test array parameters on functions. --- Makefile.am | 1 + tests/array-parameters.shader_test | 161 +++++++++++++++++++++++++++++++++++++ 2 files changed, 162 insertions(+) diff --git a/Makefile.am b/Makefile.am index 1f892ef9..5eadfc29 100644 --- a/Makefile.am +++ b/Makefile.am @@ -49,6 +49,7 @@ vkd3d_shader_tests = \ tests/arithmetic-int.shader_test \ tests/arithmetic-int-uniform.shader_test \ tests/arithmetic-uint.shader_test \ + tests/array-parameters.shader_test \ tests/bitwise.shader_test \ tests/cast-broadcast.shader_test \ tests/cast-componentwise-equal.shader_test \ diff --git a/tests/array-parameters.shader_test b/tests/array-parameters.shader_test new file mode 100644 index 00000000..615aa3f4 --- /dev/null +++ b/tests/array-parameters.shader_test @@ -0,0 +1,161 @@ +[pixel shader todo] +float fun(float a[2]) +{ + return 10 * a[0] + a[1]; +} + +float4 main() : sv_target +{ + float f[2] = {2, 5}; + + return fun(f); +} + +[test] +todo draw quad +todo probe all rgba (25.0, 25.0, 25.0, 25.0) + + +[pixel shader fail] +float fun(float a[2]) +{ + return 0; +} + +float4 main() : sv_target +{ + int f[2] = {2, 5}; + + return fun(f); +} + + +[pixel shader fail] +float fun(float a[1]) +{ + return 0; +} + +float4 main() : sv_target +{ + float f = 4; + + return fun(f); +} + + +[pixel shader fail] +float fun(int a[2]) +{ + return 0; +} + +float4 main() : sv_target +{ + float f[2] = {1, 2}; + + return fun(f); +} + + +[pixel shader todo] +float4 fun(float a[2][4]) +{ + float4 res; + + res.x = 10 * a[0][0] + a[1][0]; + res.y = 10 * a[0][1] + a[1][1]; + res.z = 10 * a[0][2] + a[1][2]; + res.w = 10 * a[0][3] + a[1][3]; + return res; +} + +float4 main() : sv_target +{ + float f[2][4] = {1, 2, 3, 4, 5, 6, 7, 8}; + + return fun(f); +} + +[test] +todo draw quad +todo probe all rgba (15.0, 26.0, 37.0, 48.0) + + +[pixel shader fail] +float fun(float a[2]) +{ + return 0; +} + +float4 main() : sv_target +{ + float f[3] = {1, 2, 3}; + + return fun(f); +} + + +% Implicit size arrays are not allowed. +[pixel shader fail] +float fun(float a[]) +{ + return 0; +} + +float4 main() : sv_target +{ + float f[2] = {1, 2}; + + return fun(f); +} + +[pixel shader fail] +float4 fun(float a[4]) +{ + return 0; +} + +float4 main() : sv_target +{ + float4 v = {1, 2, 3, 4}; + + return fun(v); +} + + +% Arrays with the same number of components are allowed. +[pixel shader todo] +float fun(float a[2][3]) +{ + return 100*a[0][0] + 10*a[0][2] + a[1][2]; +} + +float4 main() : sv_target +{ + float f[3][2] = {1, 2, 3, 4, 5, 6}; + + return fun(f); +} + +[test] +todo draw quad +todo probe all rgba (136.0, 136.0, 136.0, 136.0) + + +[pixel shader todo] +float fun(float a[2][3]) +{ + return 100*a[0][0] + 10*a[1][0] + a[1][2]; +} + +float4 main() : sv_target +{ + float f[6] = {7, 8, 9, 0, 1, 2}; + + return fun(f); +} + +[test] +todo draw quad +todo probe all rgba (702.0, 702.0, 702.0, 702.0)

1 0

Francisco Casas : tests: Add more tests for broadcasts in function call args.
by Alexandre Julliard Feb. 20, 2023

Feb. 20, 2023

Module: vkd3d Branch: master Commit: 1b951c87f610b0bbee541817219ef5b6ed5e3386 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1b951c87f610b0bbee541817219ef… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Jan 23 18:27:26 2023 -0300 tests: Add more tests for broadcasts in function call args. --- tests/cast-broadcast.shader_test | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/tests/cast-broadcast.shader_test b/tests/cast-broadcast.shader_test index d8571fc8..a7462e76 100644 --- a/tests/cast-broadcast.shader_test +++ b/tests/cast-broadcast.shader_test @@ -55,6 +55,18 @@ float4 main() : SV_TARGET } +[pixel shader fail] +float4 fun(float f[7]) +{ + return f[1]; +} + +float4 main() : SV_TARGET +{ + return fun(32); +} + + [pixel shader fail] struct apple { @@ -68,3 +80,19 @@ float4 PSMain() : SV_TARGET a1 = (struct apple)1; return a1.foo; } + + +[pixel shader todo] +float4 fun(float3 f) +{ + return f.xyxy; +} + +float4 main() : SV_TARGET +{ + return fun(33); +} + +[test] +todo draw quad +todo probe all rgba (33.0, 33.0, 33.0, 33.0)

1 0

Francisco Casas : vkd3d-shader/hlsl: Rename compatible_data_types() to be more specific.
by Alexandre Julliard Feb. 20, 2023

Feb. 20, 2023

Module: vkd3d Branch: master Commit: 2a9b9f75302830c4b230fcfe818fe12f7a4948fe URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2a9b9f75302830c4b230fcfe818fe… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Jan 26 12:16:22 2023 -0300 vkd3d-shader/hlsl: Rename compatible_data_types() to be more specific. --- libs/vkd3d-shader/hlsl.y | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index eec76a6a..9967db98 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -217,7 +217,7 @@ static bool type_contains_only_numerics(struct hlsl_type *type) return type->type <= HLSL_CLASS_LAST_NUMERIC; } -static bool compatible_data_types(struct hlsl_ctx *ctx, struct hlsl_type *src, struct hlsl_type *dst) +static bool explicit_compatible_data_types(struct hlsl_ctx *ctx, struct hlsl_type *src, struct hlsl_type *dst) { if (src->type <= HLSL_CLASS_LAST_NUMERIC && src->dimx == 1 && src->dimy == 1 && type_contains_only_numerics(dst)) return true; @@ -5240,7 +5240,7 @@ unary_expr: dst_type = hlsl_new_array_type(ctx, dst_type, $4.sizes[i]); } - if (!compatible_data_types(ctx, src_type, dst_type)) + if (!explicit_compatible_data_types(ctx, src_type, dst_type)) { struct vkd3d_string_buffer *src_string, *dst_string;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Avoid warning for each variable when in/out modifiers are specified on non-parameters.
by Alexandre Julliard Feb. 20, 2023

Feb. 20, 2023

Module: vkd3d Branch: master Commit: 6767b7abbf0cf8ea1be170ca2df6c9c6f98f2ea4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6767b7abbf0cf8ea1be170ca2df6c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Apr 6 13:55:34 2022 -0500 vkd3d-shader/hlsl: Avoid warning for each variable when in/out modifiers are specified on non-parameters. --- libs/vkd3d-shader/hlsl.y | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index e158f1de..eec76a6a 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1940,10 +1940,11 @@ static bool type_has_numeric_components(struct hlsl_type *type) } static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_type, - DWORD modifiers, struct list *var_list) + unsigned int modifiers, const struct vkd3d_shader_location *modifiers_loc, struct list *var_list) { struct parse_variable_def *v, *v_next; struct hlsl_ir_function_decl *func; + unsigned int invalid_modifiers; struct list *statements_list; struct hlsl_ir_var *var; struct hlsl_type *type; @@ -1963,6 +1964,17 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t if (!var_list) return statements_list; + invalid_modifiers = modifiers & (HLSL_STORAGE_IN | HLSL_STORAGE_OUT); + if (invalid_modifiers) + { + struct vkd3d_string_buffer *string; + + if ((string = hlsl_modifiers_to_string(ctx, invalid_modifiers))) + hlsl_error(ctx, modifiers_loc, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, + "Modifiers '%s' are not allowed on non-parameter variables.", string->buffer); + hlsl_release_string_buffer(ctx, string); + } + LIST_FOR_EACH_ENTRY_SAFE(v, v_next, var_list, struct parse_variable_def, entry) { bool unbounded_res_array = false; @@ -2039,16 +2051,6 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t } vkd3d_free(v->arrays.sizes); - if (modifiers & (HLSL_STORAGE_IN | HLSL_STORAGE_OUT)) - { - struct vkd3d_string_buffer *string; - - if ((string = hlsl_modifiers_to_string(ctx, modifiers & (HLSL_STORAGE_IN | HLSL_STORAGE_OUT)))) - hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, - "Modifiers '%s' are not allowed on non-parameter variables.", string->buffer); - hlsl_release_string_buffer(ctx, string); - } - if (!(var = hlsl_new_var(ctx, v->name, type, v->loc, &v->semantic, modifiers, &v->reg_reservation))) { free_parse_variable_def(v); @@ -3862,7 +3864,7 @@ struct_declaration: if (!(type = apply_type_modifiers(ctx, $2, &modifiers, @1))) YYABORT; - $$ = declare_vars(ctx, type, modifiers, $3); + $$ = declare_vars(ctx, type, modifiers, &@1, $3); } struct_spec: @@ -4585,7 +4587,7 @@ declaration: if (!(type = apply_type_modifiers(ctx, $2, &modifiers, @1))) YYABORT; - $$ = declare_vars(ctx, type, modifiers, $3); + $$ = declare_vars(ctx, type, modifiers, &@1, $3); } variables_def_optional:

1 0

Zebediah Figura : vkd3d-shader/hlsl: Check for majority modifiers on non-matrices in apply_type_modifiers().
by Alexandre Julliard Feb. 20, 2023

Feb. 20, 2023

Module: vkd3d Branch: master Commit: af652874236825405ac5e4a26333b79d98f2aa76 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/af652874236825405ac5e4a26333b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 29 16:56:03 2022 -0500 vkd3d-shader/hlsl: Check for majority modifiers on non-matrices in apply_type_modifiers(). --- libs/vkd3d-shader/hlsl.y | 7 ++++--- tests/majority-syntax.shader_test | 10 +++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 2b62eccf..da78d291 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -903,6 +903,10 @@ static struct hlsl_type *apply_type_modifiers(struct hlsl_ctx *ctx, struct hlsl_ else default_majority = HLSL_MODIFIER_ROW_MAJOR; } + else if (type->type != HLSL_CLASS_MATRIX) + { + check_invalid_matrix_modifiers(ctx, *modifiers, loc); + } if (!default_majority && !(*modifiers & HLSL_TYPE_MODIFIERS_MASK)) return type; @@ -2041,9 +2045,6 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t } vkd3d_free(v->arrays.sizes); - if (type->type != HLSL_CLASS_MATRIX) - check_invalid_matrix_modifiers(ctx, modifiers, v->loc); - if (modifiers & (HLSL_STORAGE_IN | HLSL_STORAGE_OUT)) { struct vkd3d_string_buffer *string; diff --git a/tests/majority-syntax.shader_test b/tests/majority-syntax.shader_test index 63ba18f3..4ab385a5 100644 --- a/tests/majority-syntax.shader_test +++ b/tests/majority-syntax.shader_test @@ -48,7 +48,7 @@ float4 main() : sv_target return 0; } -[pixel shader fail todo] +[pixel shader fail] column_major float4 f; float4 main() : sv_target @@ -68,7 +68,7 @@ float4 main() : sv_target return 0; } -[pixel shader fail todo] +[pixel shader fail] struct apple { float4x4 m; @@ -80,7 +80,7 @@ float4 main() : sv_target return 0; } -[pixel shader fail todo] +[pixel shader fail] typedef float4x4 myarray_t[2]; row_major myarray_t a; @@ -90,13 +90,13 @@ float4 main() : sv_target return 0; } -[pixel shader fail todo] +[pixel shader fail] float4 main(uniform row_major float4 f) : sv_target { return 0; } -[pixel shader fail todo] +[pixel shader fail] struct apple { row_major float4 f;

1 0

Zebediah Figura : tests: Test macro expansion in pack_matrix pragmas.
by Alexandre Julliard Feb. 20, 2023

Feb. 20, 2023

Module: vkd3d Branch: master Commit: 1c29b45c1fa7474ebd1c0d0a63084290df8c1f2a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1c29b45c1fa7474ebd1c0d0a63084… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Sep 14 18:07:10 2021 -0500 tests: Test macro expansion in pack_matrix pragmas. --- tests/hlsl-majority-pragma.shader_test | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/tests/hlsl-majority-pragma.shader_test b/tests/hlsl-majority-pragma.shader_test index e7fc75cd..d269e859 100644 --- a/tests/hlsl-majority-pragma.shader_test +++ b/tests/hlsl-majority-pragma.shader_test @@ -19,3 +19,31 @@ uniform 8 float4 0.1 0.3 0.0 0.0 uniform 12 float4 0.2 0.4 0.0 0.0 draw quad probe all rgba (0.17, 0.39, 0.17, 0.39) 1 + +% The documentation claims these strings are subject to macro expansion. +% They are not. + +[pixel shader] + +#define KEY pack_matrix +#pragma KEY(row_major) +#define VALUE row_major +#pragma pack_matrix(VALUE) +#define PRAGMA pack_matrix(row_major) +#pragma PRAGMA + +uniform float2x2 r; + +float4 main() : sv_target +{ + float4 ret; + ret.xy = mul(r, float2(0.5, 0.6)); + ret.zw = 0.5; + return ret; +} + +[test] +uniform 0 float4 0.1 0.2 0.0 0.0 +uniform 4 float4 0.3 0.4 0.0 0.0 +draw quad +probe all rgba (0.23, 0.34, 0.5, 0.5) 1

1 0