wine-commits October 2022

wine-commits@winehq.org

1 participants
537 discussions

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

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

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

Francisco Casas : tests: Test explicit casts between types that are component-wise compatible.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: vkd3d Branch: master Commit: 09d7442cb18340ee2e8f85aa67882abaf1528e1e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/09d7442cb18340ee2e8f85aa67882… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Oct 12 17:01:26 2022 -0300 tests: Test explicit casts between types that are component-wise compatible. --- Makefile.am | 1 + tests/cast-componentwise-compatible.shader_test | 185 ++++++++++++++++++++++++ 2 files changed, 186 insertions(+) diff --git a/Makefile.am b/Makefile.am index 83f75d64..b9068728 100644 --- a/Makefile.am +++ b/Makefile.am @@ -59,6 +59,7 @@ vkd3d_shader_tests = \ tests/bitwise.shader_test \ tests/cast-broadcast.shader_test \ tests/cast-componentwise-equal.shader_test \ + tests/cast-componentwise-compatible.shader_test \ tests/cast-to-float.shader_test \ tests/cast-to-half.shader_test \ tests/cast-to-int.shader_test \ diff --git a/tests/cast-componentwise-compatible.shader_test b/tests/cast-componentwise-compatible.shader_test new file mode 100644 index 00000000..c6402cf5 --- /dev/null +++ b/tests/cast-componentwise-compatible.shader_test @@ -0,0 +1,185 @@ +[pixel shader] +struct apple +{ + float3 aa; + int bb; +}; + +float4 main() : sv_target +{ + float f[4] = {1, 2, 3, 4}; + struct apple a; + + a = (struct apple) f; + return a.aa.xyzx; +} + + +[test] +todo draw quad +todo probe all rgba (1.0, 2.0, 3.0, 1.0) + + +[pixel shader] +struct apple +{ + float3 aa; + int bb; + float cc; +}; + +float4 main() : sv_target +{ + struct apple a = {5, 6, 7, 8.8, 9.0}; + float f[4]; + + f = (float[4]) a; + return float4(f); +} + + +[test] +todo draw quad +todo probe all rgba (5.0, 6.0, 7.0, 8.0) + + +[pixel shader] +float4 main() : sv_target +{ + float f[6] = {1, 2, 3, 4, 5, 6}; + int i[4]; + + i = (int[4]) f; + return float4(i[0], i[1], i[2], i[3]); +} + + +[test] +todo draw quad +todo probe all rgba (1.0, 2.0, 3.0, 4.0) + + +[pixel shader] +Texture2D tex; + +struct apple +{ + int2 aa; + Texture2D bb; + float cc; +}; + +struct banana +{ + float aa[2]; + Texture2D bb; + int cc; +}; + +float4 main() : sv_target +{ + struct apple a = {1, 2, tex, 7.2}; + struct banana b; + + b = (struct banana) a; + return b.cc; +} + +[test] +todo draw quad +todo probe all rgba (7.0, 7.0, 7.0, 7.0) + + +[pixel shader] +Texture2D tex; + +struct apple +{ + int2 aa; + Texture2D bb; + float cc; + float4 dd; + Texture2D ee; +}; + +struct banana +{ + float aa[2]; + Texture2D bb; + int cc; +}; + +float4 main() : sv_target +{ + struct apple a = {1, 2, tex, 3, 4, 5, 6, 7, tex}; + struct banana b; + + b = (struct banana) a; + return b.cc; +} + +[test] +todo draw quad +todo probe all rgba (3.0, 3.0, 3.0, 3.0) + + +[pixel shader fail] +struct apple +{ + int2 aa; + float bb; +}; + +struct banana +{ + int2 aa; + float bb; + float cc; +}; + +float4 main() : sv_target +{ + struct apple a = {1, 2, 3}; + struct banana b; + + b = (struct banana) a; + return b.bb; +} + + +[pixel shader] +float4 main() : sv_target +{ + float4 v = float4(10.1, 20.2, 30.3, 40.4); + int i[3]; + + i = (int[3]) v; + return float4(i[0], i[1], i[2], i[2]); +} + + +[test] +todo draw quad +todo probe all rgba (10.0, 20.0, 30.0, 30.0) + + +[pixel shader] +struct apple +{ + int aa; + float bb[2]; +}; + +float4 main() : sv_target +{ + float4 f = {10.4, 11.4, 12.4, 13.4}; + struct apple a; + + a = (struct apple) f; + return float4(a.aa, a.aa, a.bb[0], a.bb[1]); +} + + +[test] +todo draw quad +todo probe all rgba (10.0, 10.0, 11.4, 12.4)

1 0

Francisco Casas : tests: Test implicit casts between types that are equal component-wise.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: vkd3d Branch: master Commit: 653b109d8f44dfc7287b5389d95a04c9bc732e21 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/653b109d8f44dfc7287b5389d95a0… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Oct 12 12:39:06 2022 -0300 tests: Test implicit casts between types that are equal component-wise. --- Makefile.am | 1 + tests/cast-componentwise-equal.shader_test | 226 +++++++++++++++++++++++++++++ 2 files changed, 227 insertions(+) diff --git a/Makefile.am b/Makefile.am index a0cd584f..83f75d64 100644 --- a/Makefile.am +++ b/Makefile.am @@ -58,6 +58,7 @@ vkd3d_shader_tests = \ tests/arithmetic-uint.shader_test \ tests/bitwise.shader_test \ tests/cast-broadcast.shader_test \ + tests/cast-componentwise-equal.shader_test \ tests/cast-to-float.shader_test \ tests/cast-to-half.shader_test \ tests/cast-to-int.shader_test \ diff --git a/tests/cast-componentwise-equal.shader_test b/tests/cast-componentwise-equal.shader_test new file mode 100644 index 00000000..ac329112 --- /dev/null +++ b/tests/cast-componentwise-equal.shader_test @@ -0,0 +1,226 @@ +[pixel shader fail] +struct apple +{ + float3 aa; + float bb; +}; + +float4 main() : sv_target +{ + float4 f = {1, 2, 3, 4}; + struct apple a; + + a = f; + return a.aa.xyzx; +} + + +[pixel shader fail] +struct apple +{ + float aa; + float bb; +}; + +float4 main() : sv_target +{ + struct apple a = {1, 2}; + float2 f; + + f = a; + return f.xyxy; +} + + +[pixel shader] +struct apple +{ + float3 aa; + float bb; +}; + +float4 main() : sv_target +{ + float f[4] = {1, 2, 3, 4}; + struct apple a; + + a = f; + return a.aa.xyzx; +} + + +[test] +todo draw quad +todo probe all rgba (1.0, 2.0, 3.0, 1.0) + + +[pixel shader fail] +struct apple +{ + float3 aa; + int bb; +}; + +float4 main() : sv_target +{ + float f[4] = {1, 2, 3, 4}; + struct apple a; + + a = f; + return a.aa.xyzx; +} + + +[pixel shader] +struct apple +{ + float3 aa; + float bb; +}; + +float4 main() : sv_target +{ + struct apple a = {5, 6, 7, 8}; + float f[4]; + + f = a; + return float4(f); +} + + +[test] +todo draw quad +todo probe all rgba (5.0, 6.0, 7.0, 8.0) + + +[pixel shader] +Texture2D tex; + +struct apple +{ + int2 aa; + Texture2D bb; + float cc; +}; + +struct banana +{ + int aa[2]; + Texture2D bb; + float cc; +}; + +float4 main() : sv_target +{ + struct apple a = {1, 2, tex, 4}; + struct banana b; + + b = a; + return b.cc; +} + +[test] +todo draw quad +todo probe all rgba (4.0, 4.0, 4.0, 4.0) + + +[pixel shader] +Texture2D tex; + +struct apple +{ + int2 aa; + Texture2D bb; + float cc; +}; + +struct banana +{ + int aa[2]; + Texture2D bb; + float cc; +}; + +float4 fun(struct banana b) +{ + return b.cc; +} + +float4 main() : sv_target +{ + struct apple a = {1, 2, tex, 5}; + + return fun(a); +} + +[test] +todo draw quad +todo probe all rgba (5.0, 5.0, 5.0, 5.0) + + +[pixel shader] +struct apple +{ + float3 xx[2]; + int4 yy; +}; + +struct banana +{ + struct apple apples[2]; + int3 bb[2]; + int4 cc[3]; +}; + +struct cherry +{ + int2 xx; + int yy[3]; +}; + +struct donut +{ + float4 aa; + float2 bb; + int cc[4]; + float dd[6]; + struct cherry cherries[4]; + int2 ee; +}; + +float4 main() : sv_target +{ + struct banana b = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, + 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37}; + struct donut d; + + d = b; + return d.aa + d.cherries[3].yy[2] + d.ee.xyxx; +} + +[test] +todo draw quad +todo probe all rgba (71.0, 73.0, 73.0, 74.0) + + +[pixel shader fail] +struct apple +{ + float3 aa; + int bb; +}; + +struct banana +{ + float3 aa; + float bb; +}; + +float4 main() : sv_target +{ + struct apple a = {1, 2, 3, 4}; + struct banana b; + + b = a; + return b.bb; +}

1 0

Francisco Casas : vkd3d-shader/hlsl: Always go through implicit conversion in assignments.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: vkd3d Branch: master Commit: 5a1b0dbf44dea826a3f95d2c1cad023207c491a5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5a1b0dbf44dea826a3f95d2c1cad0… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Oct 12 14:43:26 2022 -0300 vkd3d-shader/hlsl: Always go through implicit conversion in assignments. Otherwise we silently skip some type checks. --- libs/vkd3d-shader/hlsl.y | 6 ++---- tests/cast-broadcast.shader_test | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index b804b45c..03004c60 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1636,12 +1636,10 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct list *in } if (lhs_type->type <= HLSL_CLASS_LAST_NUMERIC) - { writemask = (1 << lhs_type->dimx) - 1; - if (!(rhs = add_implicit_conversion(ctx, instrs, rhs, lhs_type, &rhs->loc))) - return NULL; - } + if (!(rhs = add_implicit_conversion(ctx, instrs, rhs, lhs_type, &rhs->loc))) + return NULL; while (lhs->type != HLSL_IR_LOAD) { diff --git a/tests/cast-broadcast.shader_test b/tests/cast-broadcast.shader_test index f60eb758..e21e65b0 100644 --- a/tests/cast-broadcast.shader_test +++ b/tests/cast-broadcast.shader_test @@ -23,7 +23,7 @@ todo draw quad todo probe all rgba (84.0, 84.0, 84.0, 84.0) -[pixel shader fail todo] +[pixel shader fail] struct apple { float3 aa;

1 0

Francisco Casas : tests: Test for invalid complex broadcasts.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: vkd3d Branch: master Commit: e56db9bda5d11acd746449552da3aae9f5feb81b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e56db9bda5d11acd746449552da3a… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Oct 10 19:23:00 2022 -0300 tests: Test for invalid complex broadcasts. --- tests/cast-broadcast.shader_test | 47 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/tests/cast-broadcast.shader_test b/tests/cast-broadcast.shader_test index 26ae7997..f60eb758 100644 --- a/tests/cast-broadcast.shader_test +++ b/tests/cast-broadcast.shader_test @@ -21,3 +21,50 @@ float4 main() : SV_TARGET [test] todo draw quad todo probe all rgba (84.0, 84.0, 84.0, 84.0) + + +[pixel shader fail todo] +struct apple +{ + float3 aa; + float4 bb; +}; + +float4 main() : SV_TARGET +{ + struct apple f = 31; + return f.bb; +} + + +[pixel shader fail] +struct apple +{ + float3 aa; + float4 bb; +}; + +float4 fun(struct apple f) +{ + return f.bb; +} + +float4 main() : SV_TARGET +{ + return fun(31); +} + + +[pixel shader fail] +struct apple +{ + float4 foo; + Texture2D tex; +}; + +float4 PSMain() : SV_TARGET +{ + struct apple a1; + a1 = (struct apple)1; + return a1.foo; +}

1 0

Francisco Casas : tests: Rename structs for readability in broadcast test.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: vkd3d Branch: master Commit: 791f8a8faa6c2c3fa9bda293f4982bef407bdc6e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/791f8a8faa6c2c3fa9bda293f4982… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Oct 14 11:09:36 2022 -0300 tests: Rename structs for readability in broadcast test. --- tests/cast-broadcast.shader_test | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/cast-broadcast.shader_test b/tests/cast-broadcast.shader_test index 02d14c0b..26ae7997 100644 --- a/tests/cast-broadcast.shader_test +++ b/tests/cast-broadcast.shader_test @@ -1,21 +1,20 @@ [pixel shader] - -struct foo +struct apple { float3 aa; float4 bb; }; -struct bar +struct banana { - struct foo aa; + struct apple aa; int2 bb; int4 cc[8]; }; float4 main() : SV_TARGET { - struct bar p = (struct bar)42; + struct banana p = (struct banana)42; return p.aa.bb + p.cc[5]; }

1 0

Francisco Casas : tests: Set ULPs to 2 in normalize() test.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: vkd3d Branch: master Commit: 3bae0c92c7e6eeb21acebd60e9229bb23dc8998d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3bae0c92c7e6eeb21acebd60e9229… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Oct 10 20:55:15 2022 -0300 tests: Set ULPs to 2 in normalize() test. Otherwise the test fails on a NVIDIA GeForce GTX 1050 Ti GPU. The error being: shader_runner:535:Section [test], line 9: Test failed: Got {2.72165507e-01, 4.08248246e-01, 5.44331014e-01, 6.80413783e-01}, expected {2.72165537e-01, 4.08248305e-01, 5.44331074e-01, 6.80413842e-01} at (0, 0). --- tests/hlsl-normalize.shader_test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/hlsl-normalize.shader_test b/tests/hlsl-normalize.shader_test index 71b900e8..359a7590 100644 --- a/tests/hlsl-normalize.shader_test +++ b/tests/hlsl-normalize.shader_test @@ -9,7 +9,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 3.0 4.0 5.0 draw quad -probe all rgba (0.272165537, 0.408248305, 0.544331074, 0.680413842) 1 +probe all rgba (0.272165537, 0.408248305, 0.544331074, 0.680413842) 2 [pixel shader] uniform float3 x;

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

← Newer
1
...
30
31
32
33
34
35
36
...
54
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2022