January 2024 - Wine-Commits

Nikolay Sivov : vkd3d-shader/fx: Check technique type in global scope as well.
by Alexandre Julliard Jan. 23, 2024

Jan. 23, 2024

Module: vkd3d Branch: master Commit: 56100d36b1534fa12888e55c749ee4f57c6adc65 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/56100d36b1534fa12888e55c749ee… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 16 12:09:41 2024 +0100 vkd3d-shader/fx: Check technique type in global scope as well. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/fx.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index 17b9627b..f9e03adf 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -176,9 +176,7 @@ static void write_techniques(struct hlsl_scope *scope, struct fx_write_context * LIST_FOR_EACH_ENTRY(var, &scope->vars, struct hlsl_ir_var, scope_entry) { - const struct hlsl_type *type = var->data_type; - - if (type->base_type == HLSL_TYPE_TECHNIQUE && type->e.version == 10) + if (technique_matches_version(var, fx)) { write_technique(var, fx); ++fx->technique_count;

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Add passes variables to the techniques.
by Alexandre Julliard Jan. 23, 2024

Jan. 23, 2024

Module: vkd3d Branch: master Commit: e72f8f9a30036d7c1cfc4b81b42765ea3ed328df URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e72f8f9a30036d7c1cfc4b81b4276… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 11 01:06:45 2023 +0100 vkd3d-shader/hlsl: Add passes variables to the techniques. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 1 + libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl.y | 27 +++++++++++++++++++++++++++ 3 files changed, 29 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 6a5a6d0e..a990e021 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -3366,6 +3366,7 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) {"vector", HLSL_CLASS_VECTOR, HLSL_TYPE_FLOAT, 4, 1}, {"matrix", HLSL_CLASS_MATRIX, HLSL_TYPE_FLOAT, 4, 4}, {"fxgroup", HLSL_CLASS_OBJECT, HLSL_TYPE_EFFECT_GROUP, 1, 1}, + {"pass", HLSL_CLASS_OBJECT, HLSL_TYPE_PASS, 1, 1}, {"STRING", HLSL_CLASS_OBJECT, HLSL_TYPE_STRING, 1, 1}, {"TEXTURE", HLSL_CLASS_OBJECT, HLSL_TYPE_TEXTURE, 1, 1}, {"PIXELSHADER", HLSL_CLASS_OBJECT, HLSL_TYPE_PIXELSHADER, 1, 1}, diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index bf2f757f..58188ce6 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -95,6 +95,7 @@ enum hlsl_base_type HLSL_TYPE_UAV, HLSL_TYPE_PIXELSHADER, HLSL_TYPE_VERTEXSHADER, + HLSL_TYPE_PASS, HLSL_TYPE_TECHNIQUE, HLSL_TYPE_EFFECT_GROUP, HLSL_TYPE_STRING, diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index f33032f5..a132b154 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1096,6 +1096,29 @@ static bool add_func_parameter(struct hlsl_ctx *ctx, struct hlsl_func_parameters return true; } +static bool add_pass(struct hlsl_ctx *ctx, const char *name, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_var *var; + struct hlsl_type *type; + + type = hlsl_get_type(ctx->globals, "pass", false, false); + if (!(var = hlsl_new_var(ctx, name, type, loc, NULL, 0, NULL))) + return false; + + if (!hlsl_add_var(ctx, var, false)) + { + struct hlsl_ir_var *old = hlsl_get_var(ctx->cur_scope, var->name); + + hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_REDEFINED, + "Identifier \"%s\" was already declared in this scope.", var->name); + hlsl_note(ctx, &old->loc, VKD3D_SHADER_LOG_ERROR, "\"%s\" was previously declared here.", old->name); + hlsl_free_var(var); + return false; + } + + return true; +} + static bool add_technique(struct hlsl_ctx *ctx, const char *name, struct hlsl_scope *scope, const char *typename, const struct vkd3d_shader_location *loc) { @@ -5245,6 +5268,10 @@ name_opt: pass: KW_PASS name_opt '{' '}' + { + if (!add_pass(ctx, $2, &@1)) + YYABORT; + } annotations_list: variables_def_typed ';'

1 0

Nikolay Sivov : tests/hlsl: Add some tests for annotations.
by Alexandre Julliard Jan. 23, 2024

Jan. 23, 2024

Module: vkd3d Branch: master Commit: 341963bbecf441e882ab6ae0e9cebc8fea22ada4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/341963bbecf441e882ab6ae0e9ceb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 17 18:45:31 2024 +0100 tests/hlsl: Add some tests for annotations. --- Makefile.am | 1 + tests/hlsl/annotations.shader_test | 90 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+) diff --git a/Makefile.am b/Makefile.am index 648dfb25..1b9abc35 100644 --- a/Makefile.am +++ b/Makefile.am @@ -47,6 +47,7 @@ vkd3d_shader_tests = \ tests/hlsl/abs.shader_test \ tests/hlsl/all.shader_test \ tests/hlsl/angle-unit.shader_test \ + tests/hlsl/annotations.shader_test \ tests/hlsl/any.shader_test \ tests/hlsl/arithmetic-float-uniform.shader_test \ tests/hlsl/arithmetic-float.shader_test \ diff --git a/tests/hlsl/annotations.shader_test b/tests/hlsl/annotations.shader_test new file mode 100644 index 00000000..8592d274 --- /dev/null +++ b/tests/hlsl/annotations.shader_test @@ -0,0 +1,90 @@ +[require] +shader model >= 4.0 +shader model < 6.0 + +[effect todo] +// Annotations on techniques +technique10 t1 < int a = 1; > {} +technique10 t2 < int a = 2; int t1 = 3; int t2 = 4; > {} + +[effect todo] +// Annotations on passes +technique10 t1 < int a = 1; > +{ + pass < int t1 = 2; > {} +} + +[effect todo] +// Using names from the global scope +float a; + +technique10 t1 < int a = 1; > +{ + pass < int a = 2; > {} +} + +[effect todo] +// Evaluated literal constant expression for initial values +technique10 < int a = 1+2; > {} + +[effect todo] +// Using constant variables in the initializer +static const int b = 123; +technique10 < int a = b; > {} + +[effect todo] +// Implicitly sized array +technique10 < float a[] = {1, 2}; > {} + +[effect todo] +// Nested braces +technique10 < float4 a = {1, {{{2, {3}}, 4}}}; > {} + +[effect todo] +// Flattening +technique10 < float4 a = {1, float2(2, 3), 4}; > {} + +[effect todo] +// Comma separated initializers +technique10 < int a = 1, b = 2; > {} + +[effect todo] +// Majority modifier +technique10 < row_major float3x2 m = {1, 2, 3, 4, 5, 6}; > {} + +[effect fail] +// Without closing semicolon +technique10 t1 < int a = 1 > {} + +[effect fail] +// Redefinition +technique10 < int a = 0; float a = 1.0; > {} + +[effect fail] +technique10 +{ + pass < int a = 0; float a = 1.0; > {} +} + +[effect fail] +// Without initializer +technique10 < int a; > {} + +[effect fail] +// Only numeric types and strings are allowed +technique10 < DepthStencilState ds = { 0 }; > {} + +[effect fail] +// Type declarations are not allowed +technique10 < struct s { int a; } var = { 2 }; > {} + +[effect fail] +// Static modifier is not allowed +technique10 < static int a = 5; > {} + +[effect fail] +// Initializer should not depend on other annotations +technique10 < int a = 1, b = a; > {} + +[effect fail] +technique10 < int a = 1; int b = a; > {}

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Add initial support for parsing annotations.
by Alexandre Julliard Jan. 23, 2024

Jan. 23, 2024

Module: vkd3d Branch: master Commit: fe8881747beef8e8bc7535e2d582a4a428821a42 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fe8881747beef8e8bc7535e2d582a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 14 01:28:28 2023 +0100 vkd3d-shader/hlsl: Add initial support for parsing annotations. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.h | 2 ++ libs/vkd3d-shader/hlsl.y | 32 +++++++++++++++++++++++++++++--- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 536b4687..bf2f757f 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -408,6 +408,8 @@ struct hlsl_ir_var struct list extern_entry; /* Scope that variable itself defines, used to provide a container for techniques and passes. */ struct hlsl_scope *scope; + /* Scope that contains annotations for this variable. */ + struct hlsl_scope *annotations; /* Indexes of the IR instructions where the variable is first written and last read (liveness * range). The IR instructions are numerated starting from 2, because 0 means unused, and 1 diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index c308916e..f33032f5 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1122,7 +1122,7 @@ static bool add_technique(struct hlsl_ctx *ctx, const char *name, struct hlsl_sc } static bool add_effect_group(struct hlsl_ctx *ctx, const char *name, struct hlsl_scope *scope, - const struct vkd3d_shader_location *loc) + struct hlsl_scope *annotations, const struct vkd3d_shader_location *loc) { struct hlsl_ir_var *var; struct hlsl_type *type; @@ -1131,6 +1131,7 @@ static bool add_effect_group(struct hlsl_ctx *ctx, const char *name, struct hlsl if (!(var = hlsl_new_var(ctx, name, type, loc, NULL, 0, NULL))) return false; var->scope = scope; + var->annotations = annotations; if (!hlsl_add_var(ctx, var, false)) { @@ -4999,6 +5000,7 @@ static void check_duplicated_switch_cases(struct hlsl_ctx *ctx, const struct hls struct hlsl_attribute *attr; struct parse_attribute_list attr_list; struct hlsl_ir_switch_case *switch_case; + struct hlsl_scope *scope; } %token KW_BLENDSTATE @@ -5124,6 +5126,8 @@ static void check_duplicated_switch_cases(struct hlsl_ctx *ctx, const struct hls %token <name> STRING %token <name> TYPE_IDENTIFIER +%type <scope> annotations_opt + %type <arrays> arrays %type <assign_op> assign_op @@ -5242,6 +5246,28 @@ name_opt: pass: KW_PASS name_opt '{' '}' +annotations_list: + variables_def_typed ';' + | annotations_list variables_def_typed ';' + +annotations_opt: + %empty + { + $$ = NULL; + } + | '<' scope_start '>' + { + hlsl_pop_scope(ctx); + $$ = NULL; + } + | '<' scope_start annotations_list '>' + { + struct hlsl_scope *scope = ctx->cur_scope; + + hlsl_pop_scope(ctx); + $$ = scope; + } + pass_list: pass | pass_list pass @@ -5302,11 +5328,11 @@ group_techniques: | group_techniques group_technique effect_group: - KW_FXGROUP any_identifier '{' scope_start group_techniques '}' + KW_FXGROUP any_identifier annotations_opt '{' scope_start group_techniques '}' { struct hlsl_scope *scope = ctx->cur_scope; hlsl_pop_scope(ctx); - if (!(add_effect_group(ctx, $2, scope, &@2))) + if (!(add_effect_group(ctx, $2, scope, $3, &@2))) YYABORT; }

1 0

Zhiyi Zhang : win32u: Don't set the high word of keyboard layout to 0xe001 in CJK locales.
by Alexandre Julliard Jan. 23, 2024

Jan. 23, 2024

Module: wine Branch: master Commit: 28a829a1da93af950def9fd6f56c24a567a190a7 URL: https://gitlab.winehq.org/wine/wine/-/commit/28a829a1da93af950def9fd6f56c24… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jan 18 19:56:49 2024 +0800 win32u: Don't set the high word of keyboard layout to 0xe001 in CJK locales. The high word of the keyboard layout in CJK locale on Vista+ is the same as the low word, even when IME is on according to tests in user32 and manual tests on Windows 10. Fix Super Robo Wars 30 (SteamID: 898750) crash on start when CJK locales are used. --- dlls/user32/input.c | 15 +-------------- dlls/user32/tests/input.c | 2 -- dlls/win32u/input.c | 15 +-------------- 3 files changed, 2 insertions(+), 30 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 8f3cd8acae7..1fff29c7f87 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -38,7 +38,6 @@ WINE_DECLARE_DEBUG_CHANNEL(keyboard); static HKL get_locale_kbd_layout(void) { ULONG_PTR layout; - LANGID langid; /* FIXME: * @@ -52,19 +51,7 @@ static HKL get_locale_kbd_layout(void) */ layout = GetUserDefaultLCID(); - - /* - * Microsoft Office expects this value to be something specific - * for Japanese and Korean Windows with an IME the value is 0xe001 - * We should probably check to see if an IME exists and if so then - * set this word properly. - */ - langid = PRIMARYLANGID( LANGIDFROMLCID( layout ) ); - if (langid == LANG_CHINESE || langid == LANG_JAPANESE || langid == LANG_KOREAN) - layout = MAKELONG( layout, 0xe001 ); /* IME */ - else - layout = MAKELONG( layout, layout ); - + layout = MAKELONG( layout, layout ); return (HKL)layout; } diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 5bc1003f644..2e66b084d6a 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -5248,7 +5248,6 @@ static void test_keyboard_layout(void) if (lang_id == LANG_CHINESE || lang_id == LANG_JAPANESE || lang_id == LANG_KOREAN) { hkl = GetKeyboardLayout(0); - todo_wine ok(HIWORD(hkl) == LOWORD(hkl), "Got unexpected hkl %p.\n", hkl); if (lang_id == LANG_CHINESE) @@ -5258,7 +5257,6 @@ static void test_keyboard_layout(void) else if (lang_id == LANG_KOREAN) layout_name = "00000412"; hkl = LoadKeyboardLayoutA(layout_name, 0); - todo_wine ok(HIWORD(hkl) == LOWORD(hkl), "Got unexpected hkl %p.\n", hkl); } } diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index aaaac12ce36..ef8d564c264 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -913,7 +913,6 @@ DWORD get_input_state(void) static HKL get_locale_kbd_layout(void) { LCID layout; - LANGID langid; /* FIXME: * @@ -927,19 +926,7 @@ static HKL get_locale_kbd_layout(void) */ NtQueryDefaultLocale( TRUE, &layout ); - - /* - * Microsoft Office expects this value to be something specific - * for Japanese and Korean Windows with an IME the value is 0xe001 - * We should probably check to see if an IME exists and if so then - * set this word properly. - */ - langid = PRIMARYLANGID( LANGIDFROMLCID( layout ) ); - if (langid == LANG_CHINESE || langid == LANG_JAPANESE || langid == LANG_KOREAN) - layout = MAKELONG( layout, 0xe001 ); /* IME */ - else - layout = MAKELONG( layout, layout ); - + layout = MAKELONG( layout, layout ); return ULongToHandle( layout ); }

1 0

Zhiyi Zhang : user32/tests: Test keyboard layout in CJK locales.
by Alexandre Julliard Jan. 23, 2024

Jan. 23, 2024

Module: wine Branch: master Commit: 0b19f8b2ffc60f9156d1df801d9fdae9688e0fb4 URL: https://gitlab.winehq.org/wine/wine/-/commit/0b19f8b2ffc60f9156d1df801d9fda… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jan 18 19:55:19 2024 +0800 user32/tests: Test keyboard layout in CJK locales. Also tested manually on Windows 10 with Korean, Chinese, and Japanese IME activated. --- dlls/user32/tests/input.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index d48440a20be..5bc1003f644 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -5236,6 +5236,33 @@ static void test_input_desktop( char **argv ) ok_ret( 1, SetCursorPos( pos.x, pos.y ) ); } +static void test_keyboard_layout(void) +{ + const CHAR *layout_name; + LANGID lang_id; + HKL hkl; + + /* Test that the high word of the keyboard layout in CJK locale is the same as the low word, + * even when IME is on */ + lang_id = PRIMARYLANGID(GetUserDefaultLCID()); + if (lang_id == LANG_CHINESE || lang_id == LANG_JAPANESE || lang_id == LANG_KOREAN) + { + hkl = GetKeyboardLayout(0); + todo_wine + ok(HIWORD(hkl) == LOWORD(hkl), "Got unexpected hkl %p.\n", hkl); + + if (lang_id == LANG_CHINESE) + layout_name = "00000804"; + else if (lang_id == LANG_JAPANESE) + layout_name = "00000411"; + else if (lang_id == LANG_KOREAN) + layout_name = "00000412"; + hkl = LoadKeyboardLayoutA(layout_name, 0); + todo_wine + ok(HIWORD(hkl) == LOWORD(hkl), "Got unexpected hkl %p.\n", hkl); + } +} + START_TEST(input) { char **argv; @@ -5269,6 +5296,7 @@ START_TEST(input) test_ToUnicode(); test_ToAscii(); test_get_async_key_state(); + test_keyboard_layout(); test_keyboard_layout_name(); test_ActivateKeyboardLayout( argv ); test_key_names();

1 0

Giovanni Mascellani : vkd3d-shader/ir: Do not allow IMMCONST and IMMCONST64 as destination registers.
by Alexandre Julliard Jan. 23, 2024

Jan. 23, 2024

Module: vkd3d Branch: master Commit: 56f90579851b1e5933f1f4c3b6e3a41f28edd059 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/56f90579851b1e5933f1f4c3b6e3a… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jan 12 15:39:52 2024 +0100 vkd3d-shader/ir: Do not allow IMMCONST and IMMCONST64 as destination registers. --- libs/vkd3d-shader/ir.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index b2ca1a78..cbec143d 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -2623,6 +2623,16 @@ static void vsir_validate_dst_param(struct validation_context *ctx, } break; + case VKD3DSPR_IMMCONST: + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_REGISTER_TYPE, + "Invalid IMMCONST register used as destination parameter."); + break; + + case VKD3DSPR_IMMCONST64: + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_REGISTER_TYPE, + "Invalid IMMCONST64 register used as destination parameter."); + break; + default: break; }

1 0

Giovanni Mascellani : vkd3d-shader/ir: Validate PHI instructions.
by Alexandre Julliard Jan. 23, 2024

Jan. 23, 2024

Module: vkd3d Branch: master Commit: 232b2ad3607d919edad200e67c1a3074e1ee5f12 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/232b2ad3607d919edad200e67c1a3… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Jan 15 12:43:26 2024 +0100 vkd3d-shader/ir: Validate PHI instructions. --- libs/vkd3d-shader/ir.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index cbec143d..fb7982a3 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -3042,6 +3042,62 @@ static void vsir_validate_instruction(struct validation_context *ctx) break; } + case VKD3DSIH_PHI: + { + unsigned int incoming_count; + + vsir_validate_cf_type(ctx, instruction, CF_TYPE_BLOCKS); + vsir_validate_dst_count(ctx, instruction, 1); + vsir_validate_src_min_count(ctx, instruction, 2); + if (instruction->src_count % 2 != 0) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_SOURCE_COUNT, + "Invalid source count %u for a PHI instruction, it must be an even number.", + instruction->src_count); + incoming_count = instruction->src_count / 2; + + if (!register_is_ssa(&instruction->dst[0].reg)) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_REGISTER_TYPE, + "Invalid destination of type %#x in PHI instruction, expected SSA.", + instruction->dst[0].reg.type); + + if (instruction->dst[0].reg.dimension != VSIR_DIMENSION_SCALAR) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_DIMENSION, + "Invalid destination dimension %#x in PHI instruction, expected scalar.", + instruction->dst[0].reg.dimension); + + if (instruction->dst[0].modifiers != VKD3DSPDM_NONE) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_MODIFIERS, + "Invalid modifiers %#x for the destination of a PHI instruction, expected none.", + instruction->dst[0].modifiers); + + if (instruction->dst[0].shift != 0) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_SHIFT, + "Invalid shift %#x for the destination of a PHI instruction, expected none.", + instruction->dst[0].shift); + + for (i = 0; i < incoming_count; ++i) + { + unsigned int value_idx = 2 * i; + unsigned int label_idx = 2 * i + 1; + + if (!register_is_constant(&instruction->src[value_idx].reg) && !register_is_ssa(&instruction->src[value_idx].reg)) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_REGISTER_TYPE, + "Invalid value register for incoming %zu of type %#x in PHI instruction, " + "expected SSA, IMMCONST or IMMCONST64.", i, instruction->src[value_idx].reg.type); + + if (instruction->src[value_idx].reg.dimension != VSIR_DIMENSION_SCALAR) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_DIMENSION, + "Invalid value dimension %#x for incoming %zu in PHI instruction, expected scalar.", + instruction->src[value_idx].reg.dimension, i); + + if (!vsir_register_is_label(&instruction->src[label_idx].reg)) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_REGISTER_TYPE, + "Invalid label register for case %zu of type %#x in PHI instruction, " + "expected LABEL.", i, instruction->src[value_idx].reg.type); + } + break; + } + default: break; }

1 0

Giovanni Mascellani : vkd3d-shader/ir: Refactor register-type-specific code in parameter validation.
by Alexandre Julliard Jan. 23, 2024

Jan. 23, 2024

Module: vkd3d Branch: master Commit: 21633fcc5220d44b23cd731d0fdf06fc1595ca65 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/21633fcc5220d44b23cd731d0fdf0… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jan 19 00:02:13 2024 +0100 vkd3d-shader/ir: Refactor register-type-specific code in parameter validation. To better accommodate code for other register types. --- libs/vkd3d-shader/ir.c | 52 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 18 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index bcec73f4..b2ca1a78 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -2602,21 +2602,29 @@ static void vsir_validate_dst_param(struct validation_context *ctx, dst->shift); } - if (dst->reg.type == VKD3DSPR_SSA && dst->reg.idx[0].offset < ctx->program->ssa_count) + switch (dst->reg.type) { - struct validation_context_ssa_data *data = &ctx->ssas[dst->reg.idx[0].offset]; + case VKD3DSPR_SSA: + if (dst->reg.idx[0].offset < ctx->parser->program.ssa_count) + { + struct validation_context_ssa_data *data = &ctx->ssas[dst->reg.idx[0].offset]; - if (data->write_mask == 0) - { - data->write_mask = dst->write_mask; - data->first_assigned = ctx->instruction_idx; - } - else - { - validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_SSA_USAGE, - "SSA register is already assigned at instruction %zu.", - data->first_assigned); - } + if (data->write_mask == 0) + { + data->write_mask = dst->write_mask; + data->first_assigned = ctx->instruction_idx; + } + else + { + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_SSA_USAGE, + "SSA register is already assigned at instruction %zu.", + data->first_assigned); + } + } + break; + + default: + break; } } @@ -2637,13 +2645,21 @@ static void vsir_validate_src_param(struct validation_context *ctx, validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_MODIFIERS, "Source has invalid modifiers %#x.", src->modifiers); - if (src->reg.type == VKD3DSPR_SSA && src->reg.idx[0].offset < ctx->program->ssa_count) + switch (src->reg.type) { - struct validation_context_ssa_data *data = &ctx->ssas[src->reg.idx[0].offset]; - unsigned int i; + case VKD3DSPR_SSA: + if (src->reg.idx[0].offset < ctx->parser->program.ssa_count) + { + struct validation_context_ssa_data *data = &ctx->ssas[src->reg.idx[0].offset]; + unsigned int i; - for (i = 0; i < VKD3D_VEC4_SIZE; ++i) - data->read_mask |= (1u << vsir_swizzle_get_component(src->swizzle, i)); + for (i = 0; i < VKD3D_VEC4_SIZE; ++i) + data->read_mask |= (1u << vsir_swizzle_get_component(src->swizzle, i)); + } + break; + + default: + break; } }

1 0

Giovanni Mascellani : vkd3d-shader/ir: Check that all instructions appear in a block.
by Alexandre Julliard Jan. 23, 2024

Jan. 23, 2024

Module: vkd3d Branch: master Commit: fb6409bda10392ddb094a013e85e7eff3a02bb6f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fb6409bda10392ddb094a013e85e7… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jan 12 11:20:26 2024 +0100 vkd3d-shader/ir: Check that all instructions appear in a block. --- libs/vkd3d-shader/ir.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index a797e493..bcec73f4 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -2312,6 +2312,7 @@ struct validation_context CF_TYPE_STRUCTURED, CF_TYPE_BLOCKS, } cf_type; + bool inside_block; struct validation_context_temp_data { @@ -2781,6 +2782,33 @@ static void vsir_validate_instruction(struct validation_context *ctx) ctx->cf_type = CF_TYPE_STRUCTURED; } + if (ctx->cf_type == CF_TYPE_BLOCKS && !vsir_instruction_is_dcl(instruction)) + { + switch (instruction->handler_idx) + { + case VKD3DSIH_LABEL: + if (ctx->inside_block) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_CONTROL_FLOW, "Invalid LABEL instruction inside a block."); + ctx->inside_block = true; + break; + + case VKD3DSIH_RET: + case VKD3DSIH_BRANCH: + case VKD3DSIH_SWITCH_MONOLITHIC: + if (!ctx->inside_block) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_CONTROL_FLOW, "Invalid instruction %#x outside any block.", + instruction->handler_idx); + ctx->inside_block = false; + break; + + default: + if (!ctx->inside_block) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_CONTROL_FLOW, "Invalid instruction %#x outside any block.", + instruction->handler_idx); + break; + } + } + switch (instruction->handler_idx) { case VKD3DSIH_DCL_TEMPS: @@ -3020,6 +3048,9 @@ enum vkd3d_result vsir_validate(struct vkd3d_shader_parser *parser) if (ctx.depth != 0) validator_error(&ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_CONTROL_FLOW, "%zu nested blocks were not closed.", ctx.depth); + if (ctx.inside_block) + validator_error(&ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_CONTROL_FLOW, "Last block was not closed."); + for (i = 0; i < ctx.program->ssa_count; ++i) { struct validation_context_ssa_data *data = &ctx.ssas[i];

1 0