January 2023 - Wine-Commits

Alexandre Julliard : Wine release 8.0-rc5
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: website Branch: master Commit: c5e190372070dd54b5012fe03e63254cb9d4c91d URL: https://gitlab.winehq.org/winehq/winehq/-/commit/c5e190372070dd54b5012fe03e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 20 19:11:39 2023 +0100 Wine release 8.0-rc5 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2023012001.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/en/2023012001.xml b/news/en/2023012001.xml new file mode 100644 index 00000000..361b5bb5 --- /dev/null +++ b/news/en/2023012001.xml @@ -0,0 +1,13 @@ +<news> +<date>January 20, 2023</date> +<title>Wine 8.0-rc5 Released</title> +<body> + The Wine development release 8.0-rc5 is now available. This is expected to be the last release candidate before the final 8.0. + <a href="{$root}/announce/8.0-rc5">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/8.0/wine-8.0-rc5.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 8.0-rc5.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: eb3355bcf801b5484aa1ca968fdb051fe5a94bb5 URL: https://gitlab.winehq.org/wine/wine/-/commit/eb3355bcf801b5484aa1ca968fdb05… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 20 19:07:17 2023 +0100 Release 8.0-rc5. --- ANNOUNCE | 167 ++++++++++++++++++++++---------------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +++---- 4 files changed, 69 insertions(+), 119 deletions(-)

1 0

Francois Gouget : win32u: Document the font_lock handling in font_EnumFonts().
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: a9c03e6d5b4741c204ca8185ce231d80dbb16d58 URL: https://gitlab.winehq.org/wine/wine/-/commit/a9c03e6d5b4741c204ca8185ce231d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 20 11:24:25 2023 +0100 win32u: Document the font_lock handling in font_EnumFonts(). Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=49202 --- dlls/win32u/font.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index 832ffc0bed0..c3ba1a9a377 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -3551,7 +3551,7 @@ static BOOL CDECL font_EnumFonts( PHYSDEV dev, LOGFONTW *lf, FONTENUMPROCW proc, { if (!face_matches( family->family_name, face, face_name )) continue; if (!enum_face_charsets( family, face, enum_charsets, count, proc, lparam, orig_name )) - return FALSE; + return FALSE; /* enum_face_charsets() unlocked font_lock */ } } } @@ -3562,7 +3562,7 @@ static BOOL CDECL font_EnumFonts( PHYSDEV dev, LOGFONTW *lf, FONTENUMPROCW proc, { face = LIST_ENTRY( list_head(get_family_face_list(family)), struct gdi_font_face, entry ); if (!enum_face_charsets( family, face, enum_charsets, count, proc, lparam, NULL )) - return FALSE; + return FALSE; /* enum_face_charsets() unlocked font_lock */ } } pthread_mutex_unlock( &font_lock );

1 0

Fan WenJie : winebuild: Only set thumb_mode on ARM targets.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: 7f62f7be878a2dd17ad9824dc88df17613ccb1cd URL: https://gitlab.winehq.org/wine/wine/-/commit/7f62f7be878a2dd17ad9824dc88df1… Author: Fan WenJie <fanwj(a)mail.ustc.edu.cn> Date: Fri Jan 20 21:07:45 2023 +0800 winebuild: Only set thumb_mode on ARM targets. Signed-off-by: Fan WenJie <fanwj(a)mail.ustc.edu.cn> --- tools/winebuild/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index aae223f9e57..7798276d79c 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -174,7 +174,7 @@ static void set_target( const char *name ) target_alias = xstrdup( name ); if (!parse_target( name, &target )) fatal_error( "Unrecognized target '%s'\n", name ); - if (target.cpu == CPU_ARM && is_pe()) thumb_mode = 1; + thumb_mode = target.cpu == CPU_ARM && is_pe(); if (is_pe()) unwind_tables = 1; }

1 0

Byeongsik Jeon : po: Update Korean translation.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: dd917e74133e498a4a06ffafda7854a93d5f42e9 URL: https://gitlab.winehq.org/wine/wine/-/commit/dd917e74133e498a4a06ffafda7854… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Fri Jan 20 20:39:20 2023 +0900 po: Update Korean translation. --- po/ko.po | 66 ++++++++++++++++++++++++++++------------------------------------ 1 file changed, 29 insertions(+), 37 deletions(-) diff --git a/po/ko.po b/po/ko.po index ff4d3f5e5dc..30301f559f1 100644 --- a/po/ko.po +++ b/po/ko.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2022-07-15 15:16+0900\n" +"PO-Revision-Date: 2023-01-20 20:34+0900\n" "Last-Translator: Byeongsik Jeon <bsjeon(a)hanmail.net>\n" "Language-Team: Korean\n" "Language: ko\n" @@ -1331,8 +1331,6 @@ msgid "Options" msgstr "옵션" #: dlls/compstui/compstui.rc:31 -#, fuzzy -#| msgid "Defaults" msgid "Default" msgstr "기본값" @@ -3728,95 +3726,93 @@ msgid "" "After disabling or enabling a device, the connected joysticks won't be " "updated here until you restart this applet." msgstr "" -"장치를 비활성화하거나 활성화한 후, 이 애플릿을 다시 시작할 때까지 연결된 조이" -"스틱을 업데이트하지 않습니다." +"장치를 비활성화하거나 활성화한 후에는, 이 애플릿을 다시 시작할 때까지 연결된 " +"조이스틱이 업데이트되지 않습니다." #: dlls/joy.cpl/joy.rc:55 msgid "DInput" -msgstr "" +msgstr "DInput" #: dlls/joy.cpl/joy.rc:59 msgid "Axes" -msgstr "" +msgstr "축" #: dlls/joy.cpl/joy.rc:60 msgid "POVs" -msgstr "" +msgstr "시점" #: dlls/joy.cpl/joy.rc:61 msgid "Buttons" msgstr "버튼" #: dlls/joy.cpl/joy.rc:62 -#, fuzzy -#| msgid "Test Force Feedback" msgid "Force Feedback Effect" -msgstr "강제 피드백 테스트" +msgstr "피드백 효과 강제" #: dlls/joy.cpl/joy.rc:64 msgid "" "Press any button in the controller to activate the chosen effect. The effect " "direction can be changed with the controller axis." msgstr "" -"컨트롤러의 아무 버튼이나 눌러 선택한 효과를 활성화합니다. 컨트롤러 축을 이용" -"하여 효과 방향을 바꿀 수 있습니다." +"선택한 효과를 활성화하려면 컨트롤러의 아무 버튼이나 누르십시오. 효과 방향은 " +"컨트롤러 축으로 변경할 수 있습니다." #: dlls/joy.cpl/joy.rc:70 msgid "XInput" -msgstr "" +msgstr "XInput" #: dlls/joy.cpl/joy.rc:73 -#, fuzzy -#| msgid "User" msgid "User #0" -msgstr "사용자" +msgstr "사용자 #0" #: dlls/joy.cpl/joy.rc:74 -#, fuzzy -#| msgid "User" msgid "User #1" -msgstr "사용자" +msgstr "사용자 #1" #: dlls/joy.cpl/joy.rc:75 -#, fuzzy -#| msgid "User" msgid "User #2" -msgstr "사용자" +msgstr "사용자 #2" #: dlls/joy.cpl/joy.rc:76 -#, fuzzy -#| msgid "User" msgid "User #3" -msgstr "사용자" +msgstr "사용자 #3" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " "overridden for DInput in the Joysticks tab." msgstr "" +"슬롯 #0 사용이 감지되지 않았습니다. 게임패드가 연결되어 있는지, 조이스틱 탭에" +"서 DInput으로 재정의되지 않았는지 확인하십시오." #: dlls/joy.cpl/joy.rc:82 msgid "" "No user detected on slot #1, make sure your gamepad is plugged in, and not " "overridden for DInput in the Joysticks tab." msgstr "" +"슬롯 #1 사용이 감지되지 않았습니다. 게임패드가 연결되어 있는지, 조이스틱 탭에" +"서 DInput으로 재정의되지 않았는지 확인하십시오." #: dlls/joy.cpl/joy.rc:86 msgid "" "No user detected on slot #2, make sure your gamepad is plugged in, and not " "overridden for DInput in the Joysticks tab." msgstr "" +"슬롯 #2 사용이 감지되지 않았습니다. 게임패드가 연결되어 있는지, 조이스틱 탭에" +"서 DInput으로 재정의되지 않았는지 확인하십시오." #: dlls/joy.cpl/joy.rc:90 msgid "" "No user detected on slot #3, make sure your gamepad is plugged in, and not " "overridden for DInput in the Joysticks tab." msgstr "" +"슬롯 #3 사용이 감지되지 않았습니다. 게임패드가 연결되어 있는지, 조이스틱 탭에" +"서 DInput으로 재정의되지 않았는지 확인하십시오." #: dlls/joy.cpl/joy.rc:95 dlls/joy.cpl/joy.rc:96 dlls/joy.cpl/joy.rc:97 #: dlls/joy.cpl/joy.rc:98 msgid "Rumble" -msgstr "" +msgstr "진동" #: dlls/joy.cpl/joy.rc:31 msgid "Game Controllers" @@ -15082,10 +15078,8 @@ msgid "&Replace...\tCtrl+H" msgstr "바꾸기(&R)...\tCtrl+H" #: programs/notepad/notepad.rc:59 -#, fuzzy -#| msgid "&New...\tCtrl+N" msgid "&Go To...\tCtrl+G" -msgstr "새 파일(&N)...\tCtrl+N" +msgstr "이동(&G)...\tCtrl+G" #: programs/notepad/notepad.rc:63 programs/oleview/oleview.rc:68 #: programs/oleview/oleview.rc:90 programs/winefile/winefile.rc:67 @@ -15128,17 +15122,15 @@ msgstr "위(&T):" #: programs/notepad/notepad.rc:132 msgid "Go To Line" -msgstr "" +msgstr "줄 이동" #: programs/notepad/notepad.rc:134 -#, fuzzy -#| msgid "CRL Number" msgid "&Line Number:" -msgstr "CRL 번호" +msgstr "줄 번호(&L):" #: programs/notepad/notepad.rc:137 msgid "Go To" -msgstr "" +msgstr "이동" #: programs/notepad/notepad.rc:145 msgid "Encoding:" @@ -15204,7 +15196,7 @@ msgstr "Z" #: programs/notepad/notepad.rc:162 msgctxt "accelerator GoTo" msgid "G" -msgstr "" +msgstr "G" #: programs/notepad/notepad.rc:74 msgid "Page &p" @@ -15281,7 +15273,7 @@ msgstr "" #: programs/notepad/notepad.rc:90 msgid "Ln %ld, Col %ld" -msgstr "" +msgstr "Ln %ld, Col %ld" #: programs/oleview/oleview.rc:32 msgid "&Bind to file..."

1 0

Zebediah Figura : vkd3d-shader/hlsl: Remove the unused "intrinsic" argument from hlsl_add_function().
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: vkd3d Branch: master Commit: 447463e5900ca6a636998a65429b8a08a5441657 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/447463e5900ca6a636998a65429b8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Nov 10 19:30:03 2022 -0600 vkd3d-shader/hlsl: Remove the unused "intrinsic" argument from hlsl_add_function(). --- libs/vkd3d-shader/hlsl.c | 2 +- libs/vkd3d-shader/hlsl.h | 2 +- libs/vkd3d-shader/hlsl.y | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index a440aa39..8cca8d47 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -2185,7 +2185,7 @@ static void free_function_rb(struct rb_entry *entry, void *context) free_function(RB_ENTRY_VALUE(entry, struct hlsl_ir_function, entry)); } -void hlsl_add_function(struct hlsl_ctx *ctx, char *name, struct hlsl_ir_function_decl *decl, bool intrinsic) +void hlsl_add_function(struct hlsl_ctx *ctx, char *name, struct hlsl_ir_function_decl *decl) { struct hlsl_ir_function *func; struct rb_entry *func_entry, *old_entry; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 3317bd6f..50e244e3 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -950,7 +950,7 @@ struct vkd3d_string_buffer *hlsl_type_to_string(struct hlsl_ctx *ctx, const stru struct vkd3d_string_buffer *hlsl_modifiers_to_string(struct hlsl_ctx *ctx, unsigned int modifiers); const char *hlsl_node_type_to_string(enum hlsl_ir_node_type type); -void hlsl_add_function(struct hlsl_ctx *ctx, char *name, struct hlsl_ir_function_decl *decl, bool intrinsic); +void hlsl_add_function(struct hlsl_ctx *ctx, char *name, struct hlsl_ir_function_decl *decl); bool hlsl_add_var(struct hlsl_ctx *ctx, struct hlsl_ir_var *decl, bool local_var); void hlsl_dump_function(struct hlsl_ctx *ctx, const struct hlsl_ir_function_decl *func); diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 71dfe03f..fe54b1f0 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3701,7 +3701,7 @@ hlsl_prog: } } - hlsl_add_function(ctx, $2.name, $2.decl, false); + hlsl_add_function(ctx, $2.name, $2.decl); } | hlsl_prog buffer_declaration buffer_body | hlsl_prog declaration_statement

1 0

Francisco Casas : vkd3d-shader/hlsl: Support cos() intrinsic.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: vkd3d Branch: master Commit: 8d5f16d80390038de9b7cc2f75723f19dcb245c2 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8d5f16d80390038de9b7cc2f75723… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Jan 13 15:34:33 2023 -0300 vkd3d-shader/hlsl: Support cos() intrinsic. --- libs/vkd3d-shader/hlsl.y | 12 ++++++++++++ libs/vkd3d-shader/hlsl_sm4.c | 5 +++++ tests/trigonometry.shader_test | 10 +++++----- 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index d096856d..35be0f12 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2421,6 +2421,17 @@ static bool intrinsic_clamp(struct hlsl_ctx *ctx, return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MIN, max, params->args[2], loc); } +static bool intrinsic_cos(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_node *arg; + + if (!(arg = intrinsic_float_convert_arg(ctx, params, params->args[0], loc))) + return false; + + return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_COS, arg, loc); +} + static bool intrinsic_cross(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -2878,6 +2889,7 @@ intrinsic_functions[] = {"abs", 1, true, intrinsic_abs}, {"asuint", -1, true, intrinsic_asuint}, {"clamp", 3, true, intrinsic_clamp}, + {"cos", 1, true, intrinsic_cos}, {"cross", 2, true, intrinsic_cross}, {"dot", 2, true, intrinsic_dot}, {"floor", 1, true, intrinsic_floor}, diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index c7231826..e06f4b15 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1698,6 +1698,11 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, write_sm4_cast(ctx, buffer, expr); break; + case HLSL_OP1_COS: + assert(type_is_float(dst_type)); + write_sm4_unary_op_with_two_destinations(buffer, VKD3D_SM4_OP_SINCOS, &expr->node, 1, arg1); + break; + case HLSL_OP1_EXP2: assert(type_is_float(dst_type)); write_sm4_unary_op(buffer, VKD3D_SM4_OP_EXP, &expr->node, arg1, 0); diff --git a/tests/trigonometry.shader_test b/tests/trigonometry.shader_test index 919eea20..09933d3b 100644 --- a/tests/trigonometry.shader_test +++ b/tests/trigonometry.shader_test @@ -4,7 +4,7 @@ void main(out float tex : texcoord, inout float4 pos : sv_position) tex = (pos.x + 1) * 320; } -[pixel shader todo] +[pixel shader] float4 main(float tex : texcoord) : sv_target { tex = floor(tex + 0.25); @@ -12,7 +12,7 @@ float4 main(float tex : texcoord) : sv_target } [test] -todo draw quad +draw quad probe ( 0, 0) rgba ( 0.00000000, 1.00000000, 0.0, 0.0) probe ( 1, 0) rgba ( 0.84147098, 0.54030231, 0.0, 0.0) 1024 probe ( 2, 0) rgba ( 0.90929743, -0.41614684, 0.0, 0.0) 1024 @@ -45,7 +45,7 @@ draw quad probe all rgba (0.0, 500.0, 500.0, 0.0) -[pixel shader todo] +[pixel shader] uniform float4 a; float4 main() : sv_target @@ -55,5 +55,5 @@ float4 main() : sv_target [test] uniform 0 float4 0.0 0.78539816 1.57079632 2.35619449 -todo draw quad -todo probe all rgba (1000.0, 707.0, -0.0, -707.0) +draw quad +probe all rgba (1000.0, 707.0, -0.0, -707.0)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Forbid recursive calls.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: vkd3d Branch: master Commit: 9c817e5e6d8bfc639a4a17bb30a2b30b9db8477f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9c817e5e6d8bfc639a4a17bb30a2b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Sep 11 11:20:32 2021 -0500 vkd3d-shader/hlsl: Forbid recursive calls. --- libs/vkd3d-shader/hlsl_codegen.c | 47 ++++++++++++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 1 + tests/hlsl-function.shader_test | 38 ++++++++++++++++++++++++++ tests/shader_runner.c | 10 +++++++ 4 files changed, 96 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 5076274e..9b644d1b 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -457,6 +457,48 @@ static bool transform_ir(struct hlsl_ctx *ctx, bool (*func)(struct hlsl_ctx *ctx return progress; } +struct recursive_call_ctx +{ + const struct hlsl_ir_function_decl **backtrace; + size_t count, capacity; +}; + +static bool find_recursive_calls(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +{ + struct recursive_call_ctx *call_ctx = context; + struct hlsl_ir_function_decl *decl; + const struct hlsl_ir_call *call; + size_t i; + + if (instr->type != HLSL_IR_CALL) + return false; + call = hlsl_ir_call(instr); + decl = call->decl; + + for (i = 0; i < call_ctx->count; ++i) + { + if (call_ctx->backtrace[i] == decl) + { + hlsl_error(ctx, &call->node.loc, VKD3D_SHADER_ERROR_HLSL_RECURSIVE_CALL, + "Recursive call to \"%s\".", decl->func->name); + /* Native returns E_NOTIMPL instead of E_FAIL here. */ + ctx->result = VKD3D_ERROR_NOT_IMPLEMENTED; + return false; + } + } + + if (!hlsl_array_reserve(ctx, (void **)&call_ctx->backtrace, &call_ctx->capacity, + call_ctx->count + 1, sizeof(*call_ctx->backtrace))) + return false; + call_ctx->backtrace[call_ctx->count++] = decl; + + transform_ir(ctx, find_recursive_calls, &decl->body, call_ctx); + + --call_ctx->count; + + return false; +} + /* Lower casts from vec1 to vecN to swizzles. */ static bool lower_broadcasts(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { @@ -2628,12 +2670,17 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry { const struct hlsl_profile_info *profile = ctx->profile; struct hlsl_block *const body = &entry_func->body; + struct recursive_call_ctx recursive_call_ctx; struct hlsl_ir_var *var; unsigned int i; bool progress; list_move_head(&body->instrs, &ctx->static_initializers); + memset(&recursive_call_ctx, 0, sizeof(recursive_call_ctx)); + transform_ir(ctx, find_recursive_calls, body, &recursive_call_ctx); + vkd3d_free(recursive_call_ctx.backtrace); + LIST_FOR_EACH_ENTRY(var, &ctx->globals->vars, struct hlsl_ir_var, scope_entry) { if (var->storage_modifiers & HLSL_STORAGE_UNIFORM) diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 74edf049..5002a13c 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -121,6 +121,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_HLSL_NON_STATIC_OBJECT_REF = 5022, VKD3D_SHADER_ERROR_HLSL_INVALID_THREAD_COUNT = 5023, VKD3D_SHADER_ERROR_HLSL_MISSING_ATTRIBUTE = 5024, + VKD3D_SHADER_ERROR_HLSL_RECURSIVE_CALL = 5025, VKD3D_SHADER_WARNING_HLSL_IMPLICIT_TRUNCATION = 5300, VKD3D_SHADER_WARNING_HLSL_DIVISION_BY_ZERO = 5301, diff --git a/tests/hlsl-function.shader_test b/tests/hlsl-function.shader_test index e8bb80c4..eee6f2d1 100644 --- a/tests/hlsl-function.shader_test +++ b/tests/hlsl-function.shader_test @@ -162,3 +162,41 @@ float4 main() : sv_target [test] draw quad todo probe all rgba (0.6, 0.1, 0.5, 0) + +% Recursion is forbidden. + +[pixel shader notimpl] + +void bar(); + +void foo() +{ + bar(); +} + +void bar() +{ + foo(); +} + +float4 main() : sv_target +{ + foo(); + return 0; +} + +[pixel shader notimpl todo] + +% Even trivially finite recursion is forbidden. + +void func(bool x) +{ + if (x) + func(false); +} + +float4 main() : sv_target +{ + func(true); + return 0; +} diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 0ed070a1..0f205bfe 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -893,6 +893,16 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const state = STATE_SHADER_PIXEL_TODO; expect_hr = E_FAIL; } + else if (!strcmp(line, "[pixel shader notimpl]\n")) + { + state = STATE_SHADER_PIXEL; + expect_hr = E_NOTIMPL; + } + else if (!strcmp(line, "[pixel shader notimpl todo]\n")) + { + state = STATE_SHADER_PIXEL_TODO; + expect_hr = E_NOTIMPL; + } else if (sscanf(line, "[sampler %u]\n", &index)) { state = STATE_SAMPLER;

1 0

Zebediah Figura : tests/shader_runner: Explicitly track the expected shader compilation HRESULT instead of using a boolean flag.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: vkd3d Branch: master Commit: 503be4243c83318d8279ee21ae9cc402803de4ae URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/503be4243c83318d8279ee21ae9cc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jan 16 16:08:01 2023 -0600 tests/shader_runner: Explicitly track the expected shader compilation HRESULT instead of using a boolean flag. --- tests/shader_runner.c | 52 ++++++++++++++++++--------------------------------- 1 file changed, 18 insertions(+), 34 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 4750b946..0ed070a1 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -82,10 +82,6 @@ enum parse_state STATE_SAMPLER, STATE_SHADER_COMPUTE, STATE_SHADER_COMPUTE_TODO, - STATE_SHADER_INVALID_COMPUTE, - STATE_SHADER_INVALID_COMPUTE_TODO, - STATE_SHADER_INVALID_PIXEL, - STATE_SHADER_INVALID_PIXEL_TODO, STATE_SHADER_PIXEL, STATE_SHADER_PIXEL_TODO, STATE_SHADER_VERTEX, @@ -661,7 +657,7 @@ unsigned int get_vb_stride(const struct shader_runner *runner, unsigned int slot return stride; } -static void compile_shader(struct shader_runner *runner, const char *source, size_t len, const char *type, bool invalid) +static void compile_shader(struct shader_runner *runner, const char *source, size_t len, const char *type, HRESULT expect) { ID3D10Blob *blob = NULL, *errors = NULL; char profile[7]; @@ -678,10 +674,7 @@ static void compile_shader(struct shader_runner *runner, const char *source, siz sprintf(profile, "%s_%s", type, shader_models[runner->minimum_shader_model]); hr = D3DCompile(source, len, NULL, NULL, NULL, "main", profile, 0, 0, &blob, &errors); - if (invalid) - ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); - else - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == expect, "Got unexpected hr %#x.\n", hr); if (hr == S_OK) { ID3D10Blob_Release(blob); @@ -708,6 +701,7 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const unsigned int i, line_number = 0; const char *filename = NULL; char *shader_source = NULL; + HRESULT expect_hr = S_OK; char line[256]; FILE *f; @@ -766,7 +760,7 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const case STATE_SHADER_COMPUTE: case STATE_SHADER_COMPUTE_TODO: todo_if (state == STATE_SHADER_COMPUTE_TODO) - compile_shader(runner, shader_source, shader_source_len, "cs", false); + compile_shader(runner, shader_source, shader_source_len, "cs", expect_hr); free(runner->cs_source); runner->cs_source = shader_source; shader_source = NULL; @@ -777,7 +771,7 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const case STATE_SHADER_PIXEL: case STATE_SHADER_PIXEL_TODO: todo_if (state == STATE_SHADER_PIXEL_TODO) - compile_shader(runner, shader_source, shader_source_len, "ps", false); + compile_shader(runner, shader_source, shader_source_len, "ps", expect_hr); free(runner->ps_source); runner->ps_source = shader_source; shader_source = NULL; @@ -786,7 +780,7 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const break; case STATE_SHADER_VERTEX: - compile_shader(runner, shader_source, shader_source_len, "vs", false); + compile_shader(runner, shader_source, shader_source_len, "vs", expect_hr); free(runner->vs_source); runner->vs_source = shader_source; shader_source = NULL; @@ -794,20 +788,6 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const shader_source_size = 0; break; - case STATE_SHADER_INVALID_COMPUTE: - case STATE_SHADER_INVALID_COMPUTE_TODO: - todo_if (state == STATE_SHADER_INVALID_COMPUTE_TODO) - compile_shader(runner, shader_source, shader_source_len, "cs", true); - shader_source_len = 0; - break; - - case STATE_SHADER_INVALID_PIXEL: - case STATE_SHADER_INVALID_PIXEL_TODO: - todo_if (state == STATE_SHADER_INVALID_PIXEL_TODO) - compile_shader(runner, shader_source, shader_source_len, "ps", true); - shader_source_len = 0; - break; - case STATE_PREPROC_INVALID: { ID3D10Blob *blob = NULL, *errors = NULL; @@ -872,18 +852,22 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const if (!strcmp(line, "[compute shader]\n")) { state = STATE_SHADER_COMPUTE; + expect_hr = S_OK; } else if (!strcmp(line, "[compute shader todo]\n")) { state = STATE_SHADER_COMPUTE_TODO; + expect_hr = S_OK; } else if (!strcmp(line, "[compute shader fail]\n")) { - state = STATE_SHADER_INVALID_COMPUTE; + state = STATE_SHADER_COMPUTE; + expect_hr = E_FAIL; } else if (!strcmp(line, "[compute shader fail todo]\n")) { - state = STATE_SHADER_INVALID_COMPUTE_TODO; + state = STATE_SHADER_COMPUTE_TODO; + expect_hr = E_FAIL; } else if (!strcmp(line, "[require]\n")) { @@ -892,18 +876,22 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const else if (!strcmp(line, "[pixel shader]\n")) { state = STATE_SHADER_PIXEL; + expect_hr = S_OK; } else if (!strcmp(line, "[pixel shader todo]\n")) { state = STATE_SHADER_PIXEL_TODO; + expect_hr = S_OK; } else if (!strcmp(line, "[pixel shader fail]\n")) { - state = STATE_SHADER_INVALID_PIXEL; + state = STATE_SHADER_PIXEL; + expect_hr = E_FAIL; } else if (!strcmp(line, "[pixel shader fail todo]\n")) { - state = STATE_SHADER_INVALID_PIXEL_TODO; + state = STATE_SHADER_PIXEL_TODO; + expect_hr = E_FAIL; } else if (sscanf(line, "[sampler %u]\n", &index)) { @@ -1012,10 +1000,6 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const case STATE_PREPROC_INVALID: case STATE_SHADER_COMPUTE: case STATE_SHADER_COMPUTE_TODO: - case STATE_SHADER_INVALID_COMPUTE: - case STATE_SHADER_INVALID_COMPUTE_TODO: - case STATE_SHADER_INVALID_PIXEL: - case STATE_SHADER_INVALID_PIXEL_TODO: case STATE_SHADER_PIXEL: case STATE_SHADER_PIXEL_TODO: case STATE_SHADER_VERTEX:

1 0

Zebediah Figura : vkd3d-shader/hlsl: Store a non-constant hlsl_ir_function_decl pointer in struct hlsl_ir_call.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: vkd3d Branch: master Commit: 521f22e57a5274c52e086f524d85e29cabf530dc URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/521f22e57a5274c52e086f524d85e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jan 16 13:14:09 2023 -0600 vkd3d-shader/hlsl: Store a non-constant hlsl_ir_function_decl pointer in struct hlsl_ir_call. --- libs/vkd3d-shader/hlsl.c | 2 +- libs/vkd3d-shader/hlsl.h | 4 ++-- libs/vkd3d-shader/hlsl.y | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 8cca8d47..13aac3d4 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -931,7 +931,7 @@ struct hlsl_ir_store *hlsl_new_store_component(struct hlsl_ctx *ctx, struct hlsl return store; } -struct hlsl_ir_node *hlsl_new_call(struct hlsl_ctx *ctx, const struct hlsl_ir_function_decl *decl, +struct hlsl_ir_node *hlsl_new_call(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *decl, const struct vkd3d_shader_location *loc) { struct hlsl_ir_call *call; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 50e244e3..059abe18 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -420,7 +420,7 @@ struct hlsl_ir_function_decl struct hlsl_ir_call { struct hlsl_ir_node node; - const struct hlsl_ir_function_decl *decl; + struct hlsl_ir_function_decl *decl; }; struct hlsl_ir_if @@ -983,7 +983,7 @@ struct hlsl_ir_node *hlsl_new_binary_expr(struct hlsl_ctx *ctx, enum hlsl_ir_exp struct hlsl_ir_constant *hlsl_new_bool_constant(struct hlsl_ctx *ctx, bool b, const struct vkd3d_shader_location *loc); struct hlsl_buffer *hlsl_new_buffer(struct hlsl_ctx *ctx, enum hlsl_buffer_type type, const char *name, const struct hlsl_reg_reservation *reservation, struct vkd3d_shader_location loc); -struct hlsl_ir_node *hlsl_new_call(struct hlsl_ctx *ctx, const struct hlsl_ir_function_decl *decl, +struct hlsl_ir_node *hlsl_new_call(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *decl, const struct vkd3d_shader_location *loc); struct hlsl_ir_expr *hlsl_new_cast(struct hlsl_ctx *ctx, struct hlsl_ir_node *node, struct hlsl_type *type, const struct vkd3d_shader_location *loc); diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index fe54b1f0..b3e38d1f 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2217,12 +2217,12 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t struct find_function_call_args { const struct parse_initializer *params; - const struct hlsl_ir_function_decl *decl; + struct hlsl_ir_function_decl *decl; }; static void find_function_call_exact(struct rb_entry *entry, void *context) { - const struct hlsl_ir_function_decl *decl = RB_ENTRY_VALUE(entry, const struct hlsl_ir_function_decl, entry); + struct hlsl_ir_function_decl *decl = RB_ENTRY_VALUE(entry, struct hlsl_ir_function_decl, entry); struct find_function_call_args *args = context; const struct hlsl_ir_var *param; unsigned int i = 0; @@ -2237,7 +2237,7 @@ static void find_function_call_exact(struct rb_entry *entry, void *context) args->decl = decl; } -static const struct hlsl_ir_function_decl *find_function_call(struct hlsl_ctx *ctx, +static struct hlsl_ir_function_decl *find_function_call(struct hlsl_ctx *ctx, const char *name, const struct parse_initializer *params) { struct find_function_call_args args = {.params = params}; @@ -2949,8 +2949,8 @@ static int intrinsic_function_name_compare(const void *a, const void *b) static struct list *add_call(struct hlsl_ctx *ctx, const char *name, struct parse_initializer *args, const struct vkd3d_shader_location *loc) { - const struct hlsl_ir_function_decl *decl; struct intrinsic_function *intrinsic; + struct hlsl_ir_function_decl *decl; if ((decl = find_function_call(ctx, name, args))) {

1 0