October 2022 - Wine-commits

Fabian Maurer : ntdll: Prevent double free (Coverity).
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: wine Branch: master Commit: 173ffe5011d91e945d4e9ee8ed9619d7982a957c URL: https://gitlab.winehq.org/wine/wine/-/commit/173ffe5011d91e945d4e9ee8ed9619… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon May 16 18:39:35 2022 +0200 ntdll: Prevent double free (Coverity). The fd gets overwritten, therefore we need to close it before doing so. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/ntdll/unix/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index e203ff6c41d..c7ba12a5c13 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4417,12 +4417,12 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, if (size > 0x10000) size = 0x10000; if ((tmpbuf = malloc( size ))) { + if (needs_close) close( fd ); if (!server_get_unix_fd( handle, FILE_READ_DATA, &fd, &needs_close, NULL, NULL )) { int res = recv( fd, tmpbuf, size, MSG_PEEK ); info->MessagesAvailable = (res > 0); info->NextMessageSize = (res >= 0) ? res : MAILSLOT_NO_MESSAGE; - if (needs_close) close( fd ); } free( tmpbuf ); }

1 0

Hugh McMaster : kernelbase: Add stubs for GetConsoleOriginalTitleA/W().
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: wine Branch: master Commit: 4951ab64365aa701a8177c2e75fd532311427625 URL: https://gitlab.winehq.org/wine/wine/-/commit/4951ab64365aa701a8177c2e75fd53… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Oct 11 23:20:41 2022 +1100 kernelbase: Add stubs for GetConsoleOriginalTitleA/W(). --- dlls/kernel32/kernel32.spec | 4 ++-- dlls/kernelbase/console.c | 22 ++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 2 ++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 7c5fb8ed74f..a4bba1c6848 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -610,8 +610,8 @@ @ stdcall GetConsoleKeyboardLayoutNameW(ptr) @ stdcall -import GetConsoleMode(long ptr) @ stub GetConsoleNlsMode -# @ stub GetConsoleOriginalTitleA -# @ stub GetConsoleOriginalTitleW +@ stdcall -import GetConsoleOriginalTitleA(ptr long) +@ stdcall -import GetConsoleOriginalTitleW(ptr long) @ stdcall -import GetConsoleOutputCP() @ stdcall -import GetConsoleProcessList(ptr long) @ stdcall -import GetConsoleScreenBufferInfo(long ptr) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 434399b073a..e3b0ebead9e 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -886,6 +886,28 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetConsoleMode( HANDLE handle, DWORD *mode ) } +/*********************************************************************** + * GetConsoleOriginalTitleA (kernelbase.@) + */ +DWORD WINAPI DECLSPEC_HOTPATCH GetConsoleOriginalTitleA( LPSTR title, DWORD size ) +{ + FIXME( ": (%p, %lu) stub!\n", title, size ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return 0; +} + + +/*********************************************************************** + * GetConsoleOriginalTitleW (kernelbase.@) + */ +DWORD WINAPI DECLSPEC_HOTPATCH GetConsoleOriginalTitleW( LPWSTR title, DWORD size ) +{ + FIXME( ": (%p, %lu) stub!\n", title, size ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return 0; +} + + /*********************************************************************** * GetConsoleOutputCP (kernelbase.@) */ diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index c9b8649c800..cbce448d3e9 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -466,6 +466,8 @@ @ stdcall GetConsoleInputExeNameA(long ptr) @ stdcall GetConsoleInputExeNameW(long ptr) @ stdcall GetConsoleMode(long ptr) +@ stdcall GetConsoleOriginalTitleA(ptr long) +@ stdcall GetConsoleOriginalTitleW(ptr long) @ stdcall GetConsoleOutputCP() @ stdcall GetConsoleProcessList(ptr long) @ stdcall GetConsoleScreenBufferInfo(long ptr)

1 0

Hugh McMaster : kernel32/tests: Add tests for GetConsoleOriginalTitleA/W().
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: wine Branch: master Commit: 03f5f72c13aea7f677d1a2bb7f96f00eb4490d26 URL: https://gitlab.winehq.org/wine/wine/-/commit/03f5f72c13aea7f677d1a2bb7f96f0… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Oct 17 23:43:06 2022 +1100 kernel32/tests: Add tests for GetConsoleOriginalTitleA/W(). --- dlls/kernel32/tests/console.c | 79 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 9eabd887f2c..c2b7eb63a1e 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -4194,6 +4194,77 @@ static void test_SetConsoleScreenBufferInfoEx(HANDLE std_output) CloseHandle(std_input); } +static void test_GetConsoleOriginalTitleA(void) +{ + char buf[64]; + DWORD ret; + char title[] = "Original Console Title"; + + ret = GetConsoleOriginalTitleA(NULL, 0); + ok(!ret, "Unexpected string length; error %lu\n", GetLastError()); + + ret = GetConsoleOriginalTitleA(buf, 0); + ok(!ret, "Unexpected string length; error %lu\n", GetLastError()); + + ret = GetConsoleOriginalTitleA(buf, ARRAY_SIZE(buf)); + todo_wine ok(ret, "GetConsoleOriginalTitleA failed: %lu\n", GetLastError()); + todo_wine ok(!strcmp(buf, title), "got %s, expected %s\n", wine_dbgstr_a(buf), wine_dbgstr_a(title)); + + ret = SetConsoleTitleA("test"); + ok(ret, "SetConsoleTitleA failed: %lu\n", GetLastError()); + + ret = GetConsoleOriginalTitleA(buf, ARRAY_SIZE(buf)); + todo_wine ok(ret, "GetConsoleOriginalTitleA failed: %lu\n", GetLastError()); + todo_wine ok(!strcmp(buf, title), "got %s, expected %s\n", wine_dbgstr_a(buf), wine_dbgstr_a(title)); +} + +static void test_GetConsoleOriginalTitleW(void) +{ + WCHAR buf[64]; + DWORD ret; + WCHAR title[] = L"Original Console Title"; + + ret = GetConsoleOriginalTitleW(NULL, 0); + ok(!ret, "Unexpected string length; error %lu\n", GetLastError()); + + ret = GetConsoleOriginalTitleW(buf, 0); + ok(!ret, "Unexpected string length; error %lu\n", GetLastError()); + + ret = GetConsoleOriginalTitleW(buf, ARRAY_SIZE(buf)); + todo_wine ok(ret, "GetConsoleOriginalTitleW failed: %lu\n", GetLastError()); + buf[ret] = 0; + todo_wine ok(!wcscmp(buf, title), "got %s, expected %s\n", wine_dbgstr_w(buf), wine_dbgstr_w(title)); + + ret = SetConsoleTitleW(L"test"); + ok(ret, "SetConsoleTitleW failed: %lu\n", GetLastError()); + + ret = GetConsoleOriginalTitleW(buf, ARRAY_SIZE(buf)); + todo_wine ok(ret, "GetConsoleOriginalTitleW failed: %lu\n", GetLastError()); + todo_wine ok(!wcscmp(buf, title), "got %s, expected %s\n", wine_dbgstr_w(buf), wine_dbgstr_w(title)); + + ret = GetConsoleOriginalTitleW(buf, 5); + todo_wine ok(ret, "GetConsoleOriginalTitleW failed: %lu\n", GetLastError()); + todo_wine ok(!wcscmp(buf, L"Orig"), "got %s, expected 'Orig'\n", wine_dbgstr_w(buf)); +} + +static void test_GetConsoleOriginalTitle(void) +{ + STARTUPINFOA si = { sizeof(si) }; + PROCESS_INFORMATION info; + char **argv, buf[MAX_PATH]; + char title[] = "Original Console Title"; + BOOL ret; + + winetest_get_mainargs(&argv); + sprintf(buf, "\"%s\" console title_test", argv[0]); + si.lpTitle = title; + ret = CreateProcessA(NULL, buf, NULL, NULL, TRUE, CREATE_NEW_CONSOLE, NULL, NULL, &si, &info); + ok(ret, "CreateProcess failed: %lu\n", GetLastError()); + CloseHandle(info.hThread); + wait_child_process(info.hProcess); + CloseHandle(info.hProcess); +} + static void test_GetConsoleTitleA(void) { char buf[64], str[] = "test"; @@ -4837,6 +4908,13 @@ START_TEST(console) ExitProcess(exit_code); } + if (argc == 3 && !strcmp(argv[2], "title_test")) + { + test_GetConsoleOriginalTitleA(); + test_GetConsoleOriginalTitleW(); + return; + } + test_current = argc >= 3 && !strcmp(argv[2], "--current"); using_pseudo_console = argc >= 3 && !strcmp(argv[2], "--pseudo-console"); @@ -5020,6 +5098,7 @@ START_TEST(console) test_GetConsoleScreenBufferInfoEx(hConOut); test_SetConsoleScreenBufferInfoEx(hConOut); test_file_info(hConIn, hConOut); + test_GetConsoleOriginalTitle(); test_GetConsoleTitleA(); test_GetConsoleTitleW(); if (!test_current)

1 0

Giovanni Mascellani : tests: Test length() intrinsic.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: vkd3d Branch: master Commit: a43242a3e6fb73090d7bb0a9cf66d55be029445e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a43242a3e6fb73090d7bb0a9cf66d… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Oct 4 23:31:42 2022 +0200 tests: Test length() intrinsic. --- Makefile.am | 1 + tests/hlsl-length.shader_test | 80 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+) diff --git a/Makefile.am b/Makefile.am index 110b66f6..24602862 100644 --- a/Makefile.am +++ b/Makefile.am @@ -90,6 +90,7 @@ vkd3d_shader_tests = \ tests/hlsl-intrinsic-override.shader_test \ tests/hlsl-invalid.shader_test \ tests/hlsl-ldexp.shader_test \ + tests/hlsl-length.shader_test \ tests/hlsl-lerp.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ diff --git a/tests/hlsl-length.shader_test b/tests/hlsl-length.shader_test new file mode 100644 index 00000000..e9f7c8ae --- /dev/null +++ b/tests/hlsl-length.shader_test @@ -0,0 +1,80 @@ +[pixel shader] +uniform float4 x; + +float4 main() : SV_TARGET +{ + return length(x); +} + +[test] +uniform 0 float4 2.0 3.0 4.0 5.0 +todo draw quad +probe all rgba (7.34846926, 7.34846926, 7.34846926, 7.34846926) 1 + +[pixel shader] +uniform float3 x; + +float4 main() : SV_TARGET +{ + return length(x); +} + +[test] +uniform 0 float4 2.0 3.0 4.0 0.0 +todo draw quad +probe all rgba (5.38516474, 5.38516474, 5.38516474, 5.38516474) 1 + +[pixel shader] +uniform float2 x; + +float4 main() : SV_TARGET +{ + return length(x); +} + +[test] +uniform 0 float4 2.0 3.0 0.0 0.0 +todo draw quad +probe all rgba (3.60555124, 3.60555124, 3.60555124, 3.60555124) 1 + +[pixel shader] +uniform float1 x; + +float4 main() : SV_TARGET +{ + return length(x); +} + +[test] +uniform 0 float4 2.0 0.0 0.0 0.0 +todo draw quad +probe all rgba (2.0, 2.0, 2.0, 2.0) + +[pixel shader] +uniform float x; + +float4 main() : SV_TARGET +{ + return length(x); +} + +[test] +uniform 0 float4 2.0 0.0 0.0 0.0 +todo draw quad +probe all rgba (2.0, 2.0, 2.0, 2.0) + +[pixel shader fail] +uniform float1x3 x; + +float4 main() : SV_TARGET +{ + return length(x); +} + +[pixel shader fail] +uniform float4x1 x; + +float4 main() : SV_TARGET +{ + return length(x); +}

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Parse length() intrinsic.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: vkd3d Branch: master Commit: 8e5aefb30989a22a2472a9dfb82ec1706d1e3d98 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8e5aefb30989a22a2472a9dfb82ec… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Oct 1 10:54:03 2021 +0200 vkd3d-shader/hlsl: Parse length() intrinsic. --- libs/vkd3d-shader/hlsl.y | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 60ca09ce..b804b45c 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2188,6 +2188,31 @@ static bool intrinsic_ldexp(struct hlsl_ctx *ctx, return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, params->args[0], arg, loc); } +static bool intrinsic_length(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + struct hlsl_type *type = params->args[0]->data_type; + struct hlsl_ir_node *arg, *dot; + + if (type->type == HLSL_CLASS_MATRIX) + { + struct vkd3d_string_buffer *string; + + if ((string = hlsl_type_to_string(ctx, type))) + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "Invalid type %s.", string->buffer); + hlsl_release_string_buffer(ctx, string); + } + + if (!(arg = intrinsic_float_convert_arg(ctx, params, params->args[0], loc))) + return false; + + if (!(dot = add_binary_dot_expr(ctx, params->instrs, arg, arg, loc))) + return false; + + return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_SQRT, dot, loc); +} + static bool intrinsic_lerp(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -2407,6 +2432,7 @@ intrinsic_functions[] = {"dot", 2, true, intrinsic_dot}, {"floor", 1, true, intrinsic_floor}, {"ldexp", 2, true, intrinsic_ldexp}, + {"length", 1, true, intrinsic_length}, {"lerp", 3, true, intrinsic_lerp}, {"max", 2, true, intrinsic_max}, {"min", 2, true, intrinsic_min},

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Write SM4 square root instructions.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: vkd3d Branch: master Commit: 5442f4236c0387765b9346de7275f99de709ce86 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5442f4236c0387765b9346de7275f… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Oct 4 23:40:30 2022 +0200 vkd3d-shader/hlsl: Write SM4 square root instructions. --- libs/vkd3d-shader/hlsl_sm4.c | 5 +++++ tests/hlsl-length.shader_test | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index b6d5e92c..aa89b6a0 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1685,6 +1685,11 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, &expr->node, arg1, 0); break; + case HLSL_OP1_SQRT: + assert(type_is_float(dst_type)); + write_sm4_unary_op(buffer, VKD3D_SM4_OP_SQRT, &expr->node, arg1, 0); + break; + case HLSL_OP2_ADD: switch (dst_type->base_type) { diff --git a/tests/hlsl-length.shader_test b/tests/hlsl-length.shader_test index e9f7c8ae..d5a708e2 100644 --- a/tests/hlsl-length.shader_test +++ b/tests/hlsl-length.shader_test @@ -8,7 +8,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 3.0 4.0 5.0 -todo draw quad +draw quad probe all rgba (7.34846926, 7.34846926, 7.34846926, 7.34846926) 1 [pixel shader] @@ -21,7 +21,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 3.0 4.0 0.0 -todo draw quad +draw quad probe all rgba (5.38516474, 5.38516474, 5.38516474, 5.38516474) 1 [pixel shader] @@ -34,7 +34,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 3.0 0.0 0.0 -todo draw quad +draw quad probe all rgba (3.60555124, 3.60555124, 3.60555124, 3.60555124) 1 [pixel shader] @@ -47,7 +47,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 0.0 0.0 0.0 -todo draw quad +draw quad probe all rgba (2.0, 2.0, 2.0, 2.0) [pixel shader] @@ -60,7 +60,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 0.0 0.0 0.0 -todo draw quad +draw quad probe all rgba (2.0, 2.0, 2.0, 2.0) [pixel shader fail]

1 0

Giovanni Mascellani : tests: Test int absolute value.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: vkd3d Branch: master Commit: ef4990d9966df3aeb17a517582d97b0f770e9b9b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ef4990d9966df3aeb17a517582d97… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Oct 5 13:59:43 2022 +0200 tests: Test int absolute value. --- tests/arithmetic-int-uniform.shader_test | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/tests/arithmetic-int-uniform.shader_test b/tests/arithmetic-int-uniform.shader_test index ff80a9b0..643c910b 100644 --- a/tests/arithmetic-int-uniform.shader_test +++ b/tests/arithmetic-int-uniform.shader_test @@ -27,3 +27,16 @@ float4 main() : SV_TARGET uniform 0 float4 5.0 16.0 0.0 0.0 todo draw quad probe all rgba (5.0, 5.0, -5.0, 3.0) + +[pixel shader] +uniform float4 a; + +float4 main() : SV_TARGET +{ + return abs(int4(a)); +} + +[test] +uniform 0 float4 5.0 -7.0 0.0 -10.0 +todo draw quad +probe all rgba (5.0, 7.0, 0.0, 10.0)

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Lower int absolute value.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: vkd3d Branch: master Commit: 4c13ae576403b9e6f516eefa3a93ba25fe221779 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4c13ae576403b9e6f516eefa3a93b… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Sep 21 17:21:44 2021 +0200 vkd3d-shader/hlsl: Lower int absolute value. --- libs/vkd3d-shader/hlsl_codegen.c | 30 ++++++++++++++++++++++++++++++ tests/arithmetic-int-uniform.shader_test | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 289c5a11..ef67e39b 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1284,6 +1284,35 @@ static bool lower_casts_to_bool(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr return true; } +static bool lower_int_abs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +{ + struct hlsl_type *type = instr->data_type; + struct hlsl_ir_node *arg, *neg; + struct hlsl_ir_expr *expr; + + if (instr->type != HLSL_IR_EXPR) + return false; + expr = hlsl_ir_expr(instr); + + if (expr->op != HLSL_OP1_ABS) + return false; + if (type->type != HLSL_CLASS_SCALAR && type->type != HLSL_CLASS_VECTOR) + return false; + if (type->base_type != HLSL_TYPE_INT) + return false; + + arg = expr->operands[0].node; + + if (!(neg = hlsl_new_unary_expr(ctx, HLSL_OP1_NEG, arg, instr->loc))) + return false; + list_add_before(&instr->entry, &neg->entry); + + expr->op = HLSL_OP2_MAX; + hlsl_src_from_node(&expr->operands[1], neg); + + return true; +} + static bool dce(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { switch (instr->type) @@ -2268,6 +2297,7 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry transform_ir(ctx, lower_narrowing_casts, body, NULL); transform_ir(ctx, lower_casts_to_bool, body, NULL); + transform_ir(ctx, lower_int_abs, body, NULL); do { progress = transform_ir(ctx, hlsl_fold_constant_exprs, body, NULL); diff --git a/tests/arithmetic-int-uniform.shader_test b/tests/arithmetic-int-uniform.shader_test index 643c910b..f7fe8291 100644 --- a/tests/arithmetic-int-uniform.shader_test +++ b/tests/arithmetic-int-uniform.shader_test @@ -38,5 +38,5 @@ float4 main() : SV_TARGET [test] uniform 0 float4 5.0 -7.0 0.0 -10.0 -todo draw quad +draw quad probe all rgba (5.0, 7.0, 0.0, 10.0)

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Lower int division.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: vkd3d Branch: master Commit: eb7b594002df9f403aa0a15dc1682a340a4146a0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/eb7b594002df9f403aa0a15dc1682… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Sep 21 17:12:31 2021 +0200 vkd3d-shader/hlsl: Lower int division. --- libs/vkd3d-shader/hlsl_codegen.c | 105 +++++++++++++++++++++++++++++++ tests/arithmetic-int-uniform.shader_test | 2 +- 2 files changed, 106 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index ef67e39b..656e2e93 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1284,6 +1284,110 @@ static bool lower_casts_to_bool(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr return true; } +static struct hlsl_ir_load *add_conditional(struct hlsl_ctx *ctx, struct list *instrs, + struct hlsl_ir_node *condition, struct hlsl_ir_node *if_true, struct hlsl_ir_node *if_false) +{ + struct hlsl_ir_store *store; + struct hlsl_ir_load *load; + struct hlsl_ir_var *var; + struct hlsl_ir_if *iff; + + assert(hlsl_types_are_equal(if_true->data_type, if_false->data_type)); + + if (!(var = hlsl_new_synthetic_var(ctx, "conditional", if_true->data_type, &condition->loc))) + return NULL; + + if (!(iff = hlsl_new_if(ctx, condition, condition->loc))) + return NULL; + list_add_tail(instrs, &iff->node.entry); + + if (!(store = hlsl_new_simple_store(ctx, var, if_true))) + return NULL; + list_add_tail(&iff->then_instrs.instrs, &store->node.entry); + + if (!(store = hlsl_new_simple_store(ctx, var, if_false))) + return NULL; + list_add_tail(&iff->else_instrs.instrs, &store->node.entry); + + if (!(load = hlsl_new_var_load(ctx, var, condition->loc))) + return NULL; + list_add_tail(instrs, &load->node.entry); + + return load; +} + +static bool lower_int_division(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +{ + struct hlsl_ir_node *arg1, *arg2, *xor, *and, *abs1, *abs2, *div, *neg; + struct hlsl_type *type = instr->data_type, *utype; + struct hlsl_ir_expr *cast1, *cast2, *cast3; + struct hlsl_ir_constant *high_bit; + struct hlsl_ir_expr *expr; + struct hlsl_ir_load *cond; + unsigned int i; + + if (instr->type != HLSL_IR_EXPR) + return false; + expr = hlsl_ir_expr(instr); + arg1 = expr->operands[0].node; + arg2 = expr->operands[1].node; + if (expr->op != HLSL_OP2_DIV) + return false; + if (type->type != HLSL_CLASS_SCALAR && type->type != HLSL_CLASS_VECTOR) + return false; + if (type->base_type != HLSL_TYPE_INT) + return false; + utype = hlsl_get_numeric_type(ctx, type->type, HLSL_TYPE_UINT, type->dimx, type->dimy); + + if (!(xor = hlsl_new_binary_expr(ctx, HLSL_OP2_BIT_XOR, arg1, arg2))) + return false; + list_add_before(&instr->entry, &xor->entry); + + if (!(high_bit = hlsl_new_constant(ctx, type, &instr->loc))) + return false; + for (i = 0; i < type->dimx; ++i) + high_bit->value[i].u = 0x80000000; + list_add_before(&instr->entry, &high_bit->node.entry); + + if (!(and = hlsl_new_binary_expr(ctx, HLSL_OP2_BIT_AND, xor, &high_bit->node))) + return false; + list_add_before(&instr->entry, &and->entry); + + if (!(abs1 = hlsl_new_unary_expr(ctx, HLSL_OP1_ABS, arg1, instr->loc))) + return false; + list_add_before(&instr->entry, &abs1->entry); + + if (!(cast1 = hlsl_new_cast(ctx, abs1, utype, &instr->loc))) + return false; + list_add_before(&instr->entry, &cast1->node.entry); + + if (!(abs2 = hlsl_new_unary_expr(ctx, HLSL_OP1_ABS, arg2, instr->loc))) + return false; + list_add_before(&instr->entry, &abs2->entry); + + if (!(cast2 = hlsl_new_cast(ctx, abs2, utype, &instr->loc))) + return false; + list_add_before(&instr->entry, &cast2->node.entry); + + if (!(div = hlsl_new_binary_expr(ctx, HLSL_OP2_DIV, &cast1->node, &cast2->node))) + return false; + list_add_before(&instr->entry, &div->entry); + + if (!(cast3 = hlsl_new_cast(ctx, div, type, &instr->loc))) + return false; + list_add_before(&instr->entry, &cast3->node.entry); + + if (!(neg = hlsl_new_unary_expr(ctx, HLSL_OP1_NEG, &cast3->node, instr->loc))) + return false; + list_add_before(&instr->entry, &neg->entry); + + if (!(cond = add_conditional(ctx, &instr->entry, and, neg, &cast3->node))) + return false; + hlsl_replace_node(instr, &cond->node); + + return true; +} + static bool lower_int_abs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { struct hlsl_type *type = instr->data_type; @@ -2297,6 +2401,7 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry transform_ir(ctx, lower_narrowing_casts, body, NULL); transform_ir(ctx, lower_casts_to_bool, body, NULL); + transform_ir(ctx, lower_int_division, body, NULL); transform_ir(ctx, lower_int_abs, body, NULL); do { diff --git a/tests/arithmetic-int-uniform.shader_test b/tests/arithmetic-int-uniform.shader_test index f7fe8291..3190be00 100644 --- a/tests/arithmetic-int-uniform.shader_test +++ b/tests/arithmetic-int-uniform.shader_test @@ -10,7 +10,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 5.0 16.0 0.0 0.0 -todo draw quad +draw quad probe all rgba (21.0, -11.0, 80.0, 0.0) [pixel shader]

1 0

Francisco Casas : tests: Add missing backslash to restore skipped tests.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: vkd3d Branch: master Commit: ab8f418207c30c5e4d2f04faeff086af62e374c5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ab8f418207c30c5e4d2f04faeff08… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Oct 14 10:09:21 2022 -0300 tests: Add missing backslash to restore skipped tests. Tests after this missing backslash are not being executed since e9829fdc6524e455f85893445ad8a2d703f02a2e. --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 24602862..a0cd584f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -117,7 +117,7 @@ vkd3d_shader_tests = \ tests/matrix-semantics.shader_test \ tests/multiple-rt.shader_test \ tests/nointerpolation.shader_test \ - tests/object-references.shader_test + tests/object-references.shader_test \ tests/pow.shader_test \ tests/preproc-if.shader_test \ tests/preproc-ifdef.shader_test \

1 0