- Wine-Commits - list.winehq.org

Hans Leidekker : ws2_32/tests: Fix test failures on Windows 11.
by Alexandre Julliard Jan. 11, 2023

Jan. 11, 2023

Module: wine Branch: master Commit: a0985cbff5fecf41f67902c786e4975f823f4f1d URL: https://gitlab.winehq.org/wine/wine/-/commit/a0985cbff5fecf41f67902c786e497… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 11 12:21:00 2023 +0100 ws2_32/tests: Fix test failures on Windows 11. --- dlls/ws2_32/tests/protocol.c | 76 ++++++++++++++++++++++++++++++++------------ 1 file changed, 55 insertions(+), 21 deletions(-) diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index fac3cf57077..01b4c2ba71e 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -406,7 +406,8 @@ static void test_WSALookupService(void) ret = WSALookupServiceBeginW(qs, 0, &handle); ok(ret == SOCKET_ERROR, "WSALookupServiceBeginW should have failed\n"); - todo_wine ok(WSAGetLastError() == ERROR_INVALID_PARAMETER + todo_wine ok(WSAGetLastError() == WSAEINVAL + || broken(WSAGetLastError() == ERROR_INVALID_PARAMETER) || broken(WSAGetLastError() == WSASERVICE_NOT_FOUND) /* win10 1809 */, "got error %u\n", WSAGetLastError()); @@ -821,6 +822,8 @@ static void test_inet_pton(void) char input[64]; int ret; unsigned short addr[8]; + int broken; + int broken_ret; } ipv6_tests[] = { @@ -906,10 +909,8 @@ static void test_inet_pton(void) {"::0:0:0:0", 1, {0, 0, 0, 0, 0, 0, 0, 0}}, {"::0:0:0:0:0", 1, {0, 0, 0, 0, 0, 0, 0, 0}}, {"::0:0:0:0:0:0", 1, {0, 0, 0, 0, 0, 0, 0, 0}}, - /* this one and the next one are incorrectly parsed by windows, - it adds one zero too many in front, cutting off the last digit. */ - {"::0:0:0:0:0:0:0", 0, {0, 0, 0, 0, 0, 0, 0, 0}}, - {"::0:a:b:c:d:e:f", 0, {0, 0, 0, 0xa00, 0xb00, 0xc00, 0xd00, 0xe00}}, + {"::0:0:0:0:0:0:0", 1, {0, 0, 0, 0, 0, 0, 0, 0}, 1}, + {"::0:a:b:c:d:e:f", 1, {0, 0, 0xa00, 0xb00, 0xc00, 0xd00, 0xe00, 0xf00}, 1}, {"::123.123.123.123", 1, {0, 0, 0, 0, 0, 0, 0x7b7b, 0x7b7b}}, {"ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", 1, {0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff}}, {"':10.0.0.1", 0, {0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, @@ -1076,17 +1077,31 @@ static void test_inet_pton(void) WSASetLastError(0xdeadbeef); memset(addr, 0xab, sizeof(addr)); ret = p_inet_pton(AF_INET6, ipv6_tests[i].input, addr); - ok(ret == ipv6_tests[i].ret, "got %d\n", ret); + if (ipv6_tests[i].broken) + todo_wine_if (i == 82 || i == 83) ok(ret == ipv6_tests[i].ret || broken(ret == ipv6_tests[i].broken_ret), "got %d\n", ret); + else + ok(ret == ipv6_tests[i].ret, "got %d\n", ret); ok(WSAGetLastError() == 0xdeadbeef, "got error %u\n", WSAGetLastError()); - ok(!memcmp(addr, ipv6_tests[i].addr, sizeof(addr)), "address didn't match\n"); + if (ipv6_tests[i].broken) + todo_wine_if (i == 83) ok(!memcmp(addr, ipv6_tests[i].addr, sizeof(addr)) || broken(memcmp(addr, ipv6_tests[i].addr, sizeof(addr))), + "address didn't match\n"); + else + ok(!memcmp(addr, ipv6_tests[i].addr, sizeof(addr)), "address didn't match\n"); MultiByteToWideChar(CP_ACP, 0, ipv6_tests[i].input, -1, inputW, ARRAY_SIZE(inputW)); WSASetLastError(0xdeadbeef); memset(addr, 0xab, sizeof(addr)); ret = pInetPtonW(AF_INET6, inputW, addr); - ok(ret == ipv6_tests[i].ret, "got %d\n", ret); + if (ipv6_tests[i].broken) + todo_wine ok(ret == ipv6_tests[i].ret || broken(ret == ipv6_tests[i].broken_ret), "got %d\n", ret); + else + ok(ret == ipv6_tests[i].ret, "got %d\n", ret); ok(WSAGetLastError() == (ret ? 0xdeadbeef : WSAEINVAL), "got error %u\n", WSAGetLastError()); - ok(!memcmp(addr, ipv6_tests[i].addr, sizeof(addr)), "address didn't match\n"); + if (ipv6_tests[i].broken) + todo_wine_if (i == 83) ok(!memcmp(addr, ipv6_tests[i].addr, sizeof(addr)) || broken(memcmp(addr, ipv6_tests[i].addr, sizeof(addr))), + "address didn't match\n"); + else + ok(!memcmp(addr, ipv6_tests[i].addr, sizeof(addr)), "address didn't match\n"); winetest_pop_context(); } @@ -1455,6 +1470,8 @@ static void test_WSAStringToAddress(void) USHORT address[8]; USHORT port; int error; + int broken; + int broken_error; } ipv6_tests[] = { @@ -1464,7 +1481,7 @@ static void test_WSAStringToAddress(void) { "2001::1", { 0x120, 0, 0, 0, 0, 0, 0, 0x100 } }, { "::1]:65535", { 0, 0, 0, 0, 0, 0, 0, 0x100 }, 0, WSAEINVAL }, { "001::1", { 0x100, 0, 0, 0, 0, 0, 0, 0x100 } }, - { "::1:2:3:4:5:6:7", { 0, 0, 0x100, 0x200, 0x300, 0x400, 0x500, 0x600 }, 0, WSAEINVAL }, /* Windows bug */ + { "::1:2:3:4:5:6:7", { 0, 0x100, 0x200, 0x300, 0x400, 0x500, 0x600, 0x700 }, 0, 0, 1, WSAEINVAL }, { "1.2.3.4", { 0x201, 0x3, 0, 0, 0, 0, 0, 0 }, 0, WSAEINVAL }, { "1:2:3:", { 0x100, 0x200, 0x300, 0, 0, 0, 0 }, 0, WSAEINVAL }, { "", { 0, 0, 0, 0, 0, 0, 0, 0 }, 0, WSAEINVAL }, @@ -1542,20 +1559,37 @@ static void test_WSAStringToAddress(void) winetest_push_context( "addr %s", debugstr_a(ipv6_tests[j].input) ); - ok( ret == (ipv6_tests[j].error ? SOCKET_ERROR : 0), "got %d\n", ret ); - ok( WSAGetLastError() == ipv6_tests[j].error, "got error %d\n", WSAGetLastError() ); - ok( sockaddr6.sin6_family == (ipv6_tests[j].error ? 0 : AF_INET6), - "got family %#x\n", sockaddr6.sin6_family ); - ok( !memcmp( &sockaddr6.sin6_addr, ipv6_tests[j].address, sizeof(sockaddr6.sin6_addr) ), - "got addr %x:%x:%x:%x:%x:%x:%x:%x\n", - sockaddr6.sin6_addr.s6_words[0], sockaddr6.sin6_addr.s6_words[1], - sockaddr6.sin6_addr.s6_words[2], sockaddr6.sin6_addr.s6_words[3], - sockaddr6.sin6_addr.s6_words[4], sockaddr6.sin6_addr.s6_words[5], - sockaddr6.sin6_addr.s6_words[6], sockaddr6.sin6_addr.s6_words[7] ); + if (ipv6_tests[j].broken) + { + todo_wine ok( ret == (ipv6_tests[j].error ? SOCKET_ERROR : 0) || + broken(ret == (ipv6_tests[j].broken_error ? SOCKET_ERROR : 0)), "got %d\n", ret ); + todo_wine ok( WSAGetLastError() == ipv6_tests[j].error || + broken(WSAGetLastError() == ipv6_tests[j].broken_error), "got error %d\n", WSAGetLastError() ); + todo_wine ok( !memcmp( &sockaddr6.sin6_addr, ipv6_tests[j].address, sizeof(sockaddr6.sin6_addr) ) || + broken(memcmp( &sockaddr6.sin6_addr, ipv6_tests[j].address, sizeof(sockaddr6.sin6_addr) )), + "got addr %x:%x:%x:%x:%x:%x:%x:%x\n", + sockaddr6.sin6_addr.s6_words[0], sockaddr6.sin6_addr.s6_words[1], + sockaddr6.sin6_addr.s6_words[2], sockaddr6.sin6_addr.s6_words[3], + sockaddr6.sin6_addr.s6_words[4], sockaddr6.sin6_addr.s6_words[5], + sockaddr6.sin6_addr.s6_words[6], sockaddr6.sin6_addr.s6_words[7] ); + } + else + { + ok( ret == (ipv6_tests[j].error ? SOCKET_ERROR : 0), "got %d\n", ret ); + ok( WSAGetLastError() == ipv6_tests[j].error, "got error %d\n", WSAGetLastError() ); + ok( !memcmp( &sockaddr6.sin6_addr, ipv6_tests[j].address, sizeof(sockaddr6.sin6_addr) ), + "got addr %x:%x:%x:%x:%x:%x:%x:%x\n", + sockaddr6.sin6_addr.s6_words[0], sockaddr6.sin6_addr.s6_words[1], + sockaddr6.sin6_addr.s6_words[2], sockaddr6.sin6_addr.s6_words[3], + sockaddr6.sin6_addr.s6_words[4], sockaddr6.sin6_addr.s6_words[5], + sockaddr6.sin6_addr.s6_words[6], sockaddr6.sin6_addr.s6_words[7] ); + ok( sockaddr6.sin6_family == (ipv6_tests[j].error ? 0 : AF_INET6), + "got family %#x\n", sockaddr6.sin6_family ); + ok( len == expected_len, "got len %d\n", len ); + } ok( !sockaddr6.sin6_scope_id, "got scope id %lu\n", sockaddr6.sin6_scope_id ); ok( sockaddr6.sin6_port == ipv6_tests[j].port, "got port %u\n", sockaddr6.sin6_port ); ok( !sockaddr6.sin6_flowinfo, "got flowinfo %lu\n", sockaddr6.sin6_flowinfo ); - ok( len == expected_len, "got len %d\n", len ); winetest_pop_context(); }

1 0

Hans Leidekker : wininet/tests: Pass INTERNET_FLAG_RELOAD in secure connection tests.
by Alexandre Julliard Jan. 11, 2023

Jan. 11, 2023

Module: wine Branch: master Commit: 3c060b0ac0df12eb774c9a8ac929ed93a70c8600 URL: https://gitlab.winehq.org/wine/wine/-/commit/3c060b0ac0df12eb774c9a8ac929ed… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 10 20:16:53 2023 +0100 wininet/tests: Pass INTERNET_FLAG_RELOAD in secure connection tests. Avoids test failures when the URL is cached by other tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51227 --- dlls/wininet/tests/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 8fcb9df293a..efa3e5928b6 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -6897,7 +6897,7 @@ static void test_secure_connection(void) ok(con != NULL, "InternetConnect failed\n"); req = HttpOpenRequestA(con, "GET", "/tests/hello.html", NULL, NULL, NULL, - INTERNET_FLAG_SECURE, 0); + INTERNET_FLAG_SECURE | INTERNET_FLAG_RELOAD, 0); ok(req != NULL, "HttpOpenRequest failed\n"); ret = HttpSendRequestA(req, NULL, 0, NULL, 0);

1 0

Hans Leidekker : shell32/tests: Fix a test failure on Windows 11.
by Alexandre Julliard Jan. 11, 2023

Jan. 11, 2023

Module: wine Branch: master Commit: a5cc9c9d44e7979bd9170fbdece4fa787a0365be URL: https://gitlab.winehq.org/wine/wine/-/commit/a5cc9c9d44e7979bd9170fbdece4fa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 11 16:26:02 2023 +0100 shell32/tests: Fix a test failure on Windows 11. --- dlls/shell32/tests/shelllink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index e7cc3c51aba..f13155ade2f 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -1140,7 +1140,7 @@ static void test_SHExtractIcons(void) ok(ret == ~0u, "got %u\n", ret); ret = pSHExtractIconsW(notepadW, 0, 16, 16, NULL, NULL, 1, 0); - ok(ret == 1 || broken(ret == 2) /* win2k */, "got %u\n", ret); + ok(ret == 1 || ret == 4 /* win11 */, "got %u\n", ret); icons[0] = (HICON)0xdeadbeef; ret = pSHExtractIconsW(notepadW, 0, 16, 16, icons, NULL, 1, 0);

1 0

Alexandre Julliard : winecrt0: Check for RTLD_SELF support to enable ELF constructors.
by Alexandre Julliard Jan. 11, 2023

Jan. 11, 2023

Module: wine Branch: master Commit: e25d83dc903412bf70a82ed419e8c9e470addff2 URL: https://gitlab.winehq.org/wine/wine/-/commit/e25d83dc903412bf70a82ed419e8c9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 11 15:14:04 2023 +0100 winecrt0: Check for RTLD_SELF support to enable ELF constructors. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54218 --- dlls/winecrt0/dll_soinit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winecrt0/dll_soinit.c b/dlls/winecrt0/dll_soinit.c index f76c2993304..77f5db3d284 100644 --- a/dlls/winecrt0/dll_soinit.c +++ b/dlls/winecrt0/dll_soinit.c @@ -77,7 +77,7 @@ static BOOL get_relocbase(caddr_t mapbase, caddr_t *relocbase) */ void __wine_init_so_dll(void) { -#if defined(HAVE_DLADDR1) || defined(HAVE_DLINFO) +#if defined(HAVE_DLADDR1) || (defined(HAVE_DLINFO) && defined(RTLD_SELF)) struct link_map *map; void (*init_func)(int, char **, char **) = NULL; void (**init_array)(int, char **, char **) = NULL;

1 0

Eric Pouech : po: Update French translations.
by Alexandre Julliard Jan. 11, 2023

Jan. 11, 2023

Module: wine Branch: master Commit: d5e8d3a15cfe225fb8f82a8b6f094272838837d2 URL: https://gitlab.winehq.org/wine/wine/-/commit/d5e8d3a15cfe225fb8f82a8b6f0942… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Jan 11 13:14:54 2023 +0100 po: Update French translations. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- po/fr.po | 248 +++++++++++++++------------------------------------------------ 1 file changed, 59 insertions(+), 189 deletions(-)

1 0

Eric Pouech : conhost: Initialize color_map when creating an alternate screen buffer.
by Alexandre Julliard Jan. 11, 2023

Jan. 11, 2023

Module: wine Branch: master Commit: ec05c03463368ed0f5309def116c88a4376d8db6 URL: https://gitlab.winehq.org/wine/wine/-/commit/ec05c03463368ed0f5309def116c88… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Jan 11 14:07:17 2023 +0100 conhost: Initialize color_map when creating an alternate screen buffer. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54287 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/conhost/conhost.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index bf46e6b1c18..800e8bab822 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -96,6 +96,7 @@ static struct screen_buffer *create_screen_buffer( struct console *console, int screen_buffer->attr = console->active->attr; screen_buffer->popup_attr = console->active->attr; screen_buffer->font = console->active->font; + memcpy( screen_buffer->color_map, console->active->color_map, sizeof(console->active->color_map) ); if (screen_buffer->font.face_len) {

1 0

Eric Pouech : conhost: Reset console attribute upon exit in unix mode.
by Alexandre Julliard Jan. 11, 2023

Jan. 11, 2023

Module: wine Branch: master Commit: 8993f5720a453aecb9ead2cd7531f6513340de97 URL: https://gitlab.winehq.org/wine/wine/-/commit/8993f5720a453aecb9ead2cd7531f6… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Jan 11 10:34:03 2023 +0100 conhost: Reset console attribute upon exit in unix mode. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/conhost/conhost.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 769f998f404..bf46e6b1c18 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2859,9 +2859,18 @@ static int main_loop( struct console *console, HANDLE signal ) return 0; } +static void teardown( struct console *console ) +{ + if (console->is_unix) + { + set_tty_attr( console, empty_char_info.attr ); + tty_flush( console ); + } +} + int __cdecl wmain(int argc, WCHAR *argv[]) { - int headless = 0, i, width = 0, height = 0; + int headless = 0, i, width = 0, height = 0, ret; HANDLE signal = NULL; WCHAR *end; @@ -2954,5 +2963,8 @@ int __cdecl wmain(int argc, WCHAR *argv[]) ShowWindow( console.win, (si.dwFlags & STARTF_USESHOWWINDOW) ? si.wShowWindow : SW_SHOW ); } - return main_loop( &console, signal ); + ret = main_loop( &console, signal ); + teardown( &console ); + + return ret; }

1 0

Hugh McMaster : conhost: Migrate from FontPitchFamily to FontFamily.
by Alexandre Julliard Jan. 11, 2023

Jan. 11, 2023

Module: wine Branch: master Commit: 0e6b21ef1d775c34fa14d8f527468b1a65df3eda URL: https://gitlab.winehq.org/wine/wine/-/commit/0e6b21ef1d775c34fa14d8f527468b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Dec 23 22:09:49 2022 +1100 conhost: Migrate from FontPitchFamily to FontFamily. To ensure a seamless transition between value names, we try loading the registry value from FontFamily first and FontPitchFamily second. Any changes to the console font family are saved to the new value name. --- programs/conhost/window.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 3db4b159696..0a44186beb1 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -166,7 +166,8 @@ static void load_registry_key( HKEY key, struct console_config *config ) RegQueryValueExW( key, L"FaceName", 0, &type, (BYTE *)&config->face_name, &count ); count = sizeof(val); - if (!RegQueryValueExW( key, L"FontPitchFamily", 0, &type, (BYTE *)&val, &count )) + if (!RegQueryValueExW( key, L"FontFamily", 0, &type, (BYTE *)&val, &count ) || + !RegQueryValueExW( key, L"FontPitchFamily", 0, &type, (BYTE *)&val, &count )) config->font_pitch_family = val; count = sizeof(val); @@ -330,7 +331,7 @@ static void save_registry_key( HKEY key, const struct console_config *config, BO if (save_all || config->font_pitch_family != default_config.font_pitch_family) { val = config->font_pitch_family; - RegSetValueExW( key, L"FontPitchFamily", 0, REG_DWORD, (BYTE *)&val, sizeof(val) ); + RegSetValueExW( key, L"FontFamily", 0, REG_DWORD, (BYTE *)&val, sizeof(val) ); } if (save_all || config->cell_height != default_config.cell_height ||

1 0

Francisco Casas : vkd3d-shader/hlsl: Use add_unary_arithmetic_expr() in intrinsic_pow().
by Alexandre Julliard Jan. 11, 2023

Jan. 11, 2023

Module: vkd3d Branch: master Commit: 5b1030e0cb216c9a3985561511736fc427b76be5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5b1030e0cb216c9a3985561511736… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Nov 7 19:20:01 2022 -0300 vkd3d-shader/hlsl: Use add_unary_arithmetic_expr() in intrinsic_pow(). Using add_unary_arithmetic_expr() instead of hlsl_new_unary_expr() allows the intrinsic to work with matrices. Otherwise we get: E5017: Aborting due to not yet implemented feature: Copying from unsupported node type. because an HLSL_IR_EXPR reaches split_matrix_copies(). --- libs/vkd3d-shader/hlsl.y | 7 +++---- tests/pow.shader_test | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index cbc59bc5..f67b5118 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2661,16 +2661,15 @@ static bool intrinsic_pow(struct hlsl_ctx *ctx, if (!elementwise_intrinsic_float_convert_args(ctx, params, loc)) return false; - if (!(log = hlsl_new_unary_expr(ctx, HLSL_OP1_LOG2, params->args[0], *loc))) + if (!(log = add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_LOG2, params->args[0], loc))) return false; - list_add_tail(params->instrs, &log->entry); if (!(mul = add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, params->args[1], log, loc))) return false; - if (!(exp = hlsl_new_unary_expr(ctx, HLSL_OP1_EXP2, mul, *loc))) + if (!(exp = add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_EXP2, mul, loc))) return false; - list_add_tail(params->instrs, &exp->entry); + return true; } diff --git a/tests/pow.shader_test b/tests/pow.shader_test index 0c1d7de3..1bb3bd94 100644 --- a/tests/pow.shader_test +++ b/tests/pow.shader_test @@ -10,7 +10,7 @@ draw quad probe all rgba (0.512, 0.101192884, 0.64, 0.25) 4 -[pixel shader todo] +[pixel shader] float4 main() : sv_target { float2x3 a = {1, 2, 3, 4, 5, 6}; @@ -21,8 +21,8 @@ float4 main() : sv_target } [test] -todo draw quad -todo probe all rgba (1.0, 32.0, 256.0, 125.0) +draw quad +probe all rgba (1.0, 32.0, 256.0, 125.0) 2 [pixel shader fail]

1 0

Francisco Casas : tests: Test for common type conversion for element-wise intrinsics.
by Alexandre Julliard Jan. 11, 2023

Jan. 11, 2023

Module: vkd3d Branch: master Commit: 86c35fc79da7c5206ed095c47ab7e3479a3a95e9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/86c35fc79da7c5206ed095c47ab7e… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Nov 7 11:54:11 2022 -0300 tests: Test for common type conversion for element-wise intrinsics. Some intrinsics have different rules for the allowed data types than expressions: - Vectors and matrices at the same time are not allowed, regardless of their dimensions. Even if they have the same number of components. - Any combination of matrices is always allowed, even those when no matrix fits inside another, e.g.: float2x3 is compatible with float3x2, resulting in float 2x2. The common data type is the min on each dimension. This is the case for max, pow, ldexp, clamp and smoothstep; which suggest that it is the case for all intrinsics where the operation is applied element-wise. Tests for mul() are also added as a counter-example where the operation is not element-wise. --- tests/hlsl-clamp.shader_test | 28 ++++++++++++++++++++++++++++ tests/hlsl-ldexp.shader_test | 26 ++++++++++++++++++++++++++ tests/hlsl-lerp.shader_test | 28 ++++++++++++++++++++++++++++ tests/hlsl-mul.shader_test | 30 ++++++++++++++++++++++++++++++ tests/max.shader_test | 27 +++++++++++++++++++++++++++ tests/pow.shader_test | 26 ++++++++++++++++++++++++++ 6 files changed, 165 insertions(+) diff --git a/tests/hlsl-clamp.shader_test b/tests/hlsl-clamp.shader_test index 8e26270c..cc198735 100644 --- a/tests/hlsl-clamp.shader_test +++ b/tests/hlsl-clamp.shader_test @@ -8,3 +8,31 @@ float4 main(uniform float3 u) : sv_target uniform 0 float4 -0.3 -0.1 0.7 0.0 draw quad probe all rgba (-0.1, 0.7, -0.3, 0.3) + + +[pixel shader todo] +float4 main() : sv_target +{ + float3x2 a = {6, 5, 4, 3, 2, 1}; + float2x3 b = {1, 2, 3, 4.2, 5.2, 6.2}; + float3x4 c = 5.5; + + float2x2 r = clamp(a, b, c); + return float4(r); +} + +[test] +todo draw quad +todo probe all rgba (5.5, 5.0, 4.2, 5.2) + + +[pixel shader fail todo] +float4 main() : sv_target +{ + float2x2 a = {3.1, 3.1, 3.1, 3.1}; + float2x2 b = {1, 2, 3, 4}; + float4 c = {5.5, 4.5, 3.5, 2.5}; + + clamp(a, b, c); + return 0; +} diff --git a/tests/hlsl-ldexp.shader_test b/tests/hlsl-ldexp.shader_test index 0873fc9e..bea97953 100644 --- a/tests/hlsl-ldexp.shader_test +++ b/tests/hlsl-ldexp.shader_test @@ -30,3 +30,29 @@ uniform 0 int4 2 3 4 5 uniform 4 int4 0 -10 10 100 draw quad probe all rgba (2.0, 0.00292968750, 4096.0, 6.33825300e+030) + + +[pixel shader todo] +float4 main() : sv_target +{ + float2x3 a = {1, 2, 3, 4, 5, 6}; + float3x2 b = {6, 5, 4, 3, 2, 1}; + + float2x2 r = ldexp(a, b); + return float4(r); +} + +[test] +todo draw quad +todo probe all rgba (64.0, 64.0, 64.0, 40.0) + + +[pixel shader fail todo] +float4 main() : sv_target +{ + float2x2 a = {1, 2, 3, 4}; + float1 b = {2}; + + ldexp(a, b); + return 0; +} diff --git a/tests/hlsl-lerp.shader_test b/tests/hlsl-lerp.shader_test index 3f93b02d..3cd10ec1 100644 --- a/tests/hlsl-lerp.shader_test +++ b/tests/hlsl-lerp.shader_test @@ -34,3 +34,31 @@ uniform 4 int4 0 -10 10 1000000 uniform 8 int4 0 1 -1 1000000 draw quad probe all rgba (2.0, -10.0, -2.0, 1e12) + + +[pixel shader todo] +float4 main() : sv_target +{ + float3x2 a = {6, 5, 4, 3, 2, 1}; + float2x3 b = {1, 2, 3, 4.2, 5.2, 6.2}; + float3x4 c = 2.4; + + float2x2 r = lerp(a, b, c); + return float4(r); +} + +[test] +todo draw quad +todo probe all rgba (-6.0, -2.2, 4.48, 8.28) + + +[pixel shader fail todo] +float4 main() : sv_target +{ + float2x2 a = {0, 1, 2, 3}; + float2x2 b = {1, 2, 3, 4}; + float4 c = {0.5, 0.5, 0.5, 0.5}; + + lerp(a, b, c); + return 0; +} diff --git a/tests/hlsl-mul.shader_test b/tests/hlsl-mul.shader_test index 7b453187..cb104a9e 100644 --- a/tests/hlsl-mul.shader_test +++ b/tests/hlsl-mul.shader_test @@ -288,3 +288,33 @@ float4 main(float4 pos : sv_position) : sv_target [test] draw quad probe all rgba (78.0, 96.0, 114.0, 0.0) + + +[pixel shader] +float4 main() : sv_target +{ + float2x3 a = float2x3(1, 2, 3, 4, 5, 6); + float3x2 b = float3x2(6, 5, 4, 3, 2, 1); + + float2x2 r = mul(a, b); + return float4(r); +} + +[test] +draw quad +probe all rgba (20.0, 14.0, 56.0, 41.0) + + +[pixel shader] +float4 main() : sv_target +{ + float2x2 a = float2x2(1, 2, 3, 4); + float2 b = float2(1, 2); + + float2 r = mul(a, b); + return float4(r, 0, 0); +} + +[test] +draw quad +probe all rgba (5.0, 11.0, 0.0, 0.0) diff --git a/tests/max.shader_test b/tests/max.shader_test index 50083f33..7a917ec5 100644 --- a/tests/max.shader_test +++ b/tests/max.shader_test @@ -9,6 +9,7 @@ uniform 0 float4 0.7 -0.1 0.0 0.0 draw quad probe all rgba (0.7, 2.1, 2.0, -1.0) + [pixel shader] float4 main(uniform float4 u) : sv_target { @@ -21,3 +22,29 @@ float4 main(uniform float4 u) : sv_target uniform 0 float4 0.7 -0.1 0.4 0.8 draw quad probe all rgba (0.7, 0.8, 0.7, 0.2) + + +[pixel shader todo] +float4 main() : sv_target +{ + float2x3 a = {1, 2, 3, 4, 5, 6}; + float3x2 b = {6, 5, 4, 3, 2, 1}; + + float2x2 r = max(a, b); + return float4(r); +} + +[test] +todo draw quad +todo probe all rgba (6.0, 5.0, 4.0, 5.0) + + +[pixel shader fail todo] +float4 main() : sv_target +{ + float2x2 a = {1, 2, 3, 4}; + float4 b = {4, 3, 2, 1}; + + max(a, b); + return 0; +} diff --git a/tests/pow.shader_test b/tests/pow.shader_test index 6470494e..6f2b2741 100644 --- a/tests/pow.shader_test +++ b/tests/pow.shader_test @@ -8,3 +8,29 @@ float4 main(uniform float4 u) : sv_target uniform 0 float4 0.4 0.8 2.5 2.0 draw quad probe all rgba (0.512, 0.101192884, 0.64, 0.25) 4 + + +[pixel shader todo] +float4 main() : sv_target +{ + float2x3 a = {1, 2, 3, 4, 5, 6}; + float3x2 b = {6, 5, 4, 3, 2, 1}; + + float2x2 r = pow(a, b); + return float4(r); +} + +[test] +todo draw quad +todo probe all rgba (1.0, 32.0, 256.0, 125.0) + + +[pixel shader fail todo] +float4 main() : sv_target +{ + float2x2 a = {1, 2, 3, 4}; + float4 b = {1, 2, 3, 4}; + + pow(a, b); + return 0; +}

1 0