February 2022 - Wine-commits

Piotr Caban : msvcr120/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: 8116b4cc2f8bd41b3fd70d29a2fa6089c193342d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8116b4cc2f8bd41b3fd70d29… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 11 23:41:21 2022 +0100 msvcr120/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr120/tests/Makefile.in | 1 - dlls/msvcr120/tests/msvcr120.c | 22 +++++++++++----------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/msvcr120/tests/Makefile.in b/dlls/msvcr120/tests/Makefile.in index d68249f9f79..9898cbae117 100644 --- a/dlls/msvcr120/tests/Makefile.in +++ b/dlls/msvcr120/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = msvcr120.dll C_SRCS = \ diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index ecb26a3efd7..a3161266db4 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -540,7 +540,7 @@ static void test__GetConcurrency(void) GetSystemInfo(&si); c = (*p__GetConcurrency)(); - ok(c == si.dwNumberOfProcessors, "expected %u, got %u\n", si.dwNumberOfProcessors, c); + ok(c == si.dwNumberOfProcessors, "expected %lu, got %u\n", si.dwNumberOfProcessors, c); } static void test_gettnames(void* (CDECL *p_gettnames)(void)) @@ -587,7 +587,7 @@ static void test_gettnames(void* (CDECL *p_gettnames)(void)) ok(ret->str[42] + strlen(ret->str[42]) + 1 == (char*)ret->wstr[0] || ret->str[42] + strlen(ret->str[42]) + 2 == (char*)ret->wstr[0], - "ret->str[42] = %p len = %d, ret->wstr[0] = %p\n", + "ret->str[42] = %p len = %Id, ret->wstr[0] = %p\n", ret->str[42], strlen(ret->str[42]), ret->wstr[0]); p_free(ret); @@ -749,11 +749,11 @@ static void test_critical_section(void) thread = (HANDLE)_beginthreadex(NULL, 0, test_critical_section_lock, NULL, 0, NULL); ok(thread != INVALID_HANDLE_VALUE, "_beginthread failed (%d)\n", errno); ret = WaitForSingleObject(thread, 100); - ok(ret == WAIT_TIMEOUT, "WaitForSingleObject returned %d\n", ret); + ok(ret == WAIT_TIMEOUT, "WaitForSingleObject returned %ld\n", ret); enter_flag = 1; call_func1(p_critical_section_unlock, &cs); ret = WaitForSingleObject(thread, INFINITE); - ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %d\n", ret); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %ld\n", ret); ret = CloseHandle(thread); ok(ret, "CloseHandle failed\n"); @@ -762,7 +762,7 @@ static void test_critical_section(void) thread = (HANDLE)_beginthreadex(NULL, 0, test_critical_section_try_lock, NULL, 0, NULL); ok(thread != INVALID_HANDLE_VALUE, "_beginthread failed (%d)\n", errno); ret = WaitForSingleObject(thread, INFINITE); - ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %d\n", ret); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %ld\n", ret); ret = CloseHandle(thread); ok(ret, "CloseHandle failed\n"); call_func1(p_critical_section_unlock, &cs); @@ -773,7 +773,7 @@ static void test_critical_section(void) thread = (HANDLE)_beginthreadex(NULL, 0, test_critical_section_try_lock, NULL, 0, NULL); ok(thread != INVALID_HANDLE_VALUE, "_beginthread failed (%d)\n", errno); ret = WaitForSingleObject(thread, INFINITE); - ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %d\n", ret); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %ld\n", ret); ret = CloseHandle(thread); ok(ret, "CloseHandle failed\n"); thread = (HANDLE)_beginthreadex(NULL, 0, test_critical_section_try_lock_for, NULL, 0, NULL); @@ -782,7 +782,7 @@ static void test_critical_section(void) Sleep(10); call_func1(p_critical_section_unlock, &cs); ret = WaitForSingleObject(thread, INFINITE); - ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %d\n", ret); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %ld\n", ret); ret = CloseHandle(thread); ok(ret, "CloseHandle failed\n"); @@ -791,11 +791,11 @@ static void test_critical_section(void) thread = (HANDLE)_beginthreadex(NULL, 0, test_critical_section_scoped_lock, NULL, 0, NULL); ok(thread != INVALID_HANDLE_VALUE, "_beginthread failed (%d)\n", errno); ret = WaitForSingleObject(thread, 100); - ok(ret == WAIT_TIMEOUT, "WaitForSingleObject returned %d\n", ret); + ok(ret == WAIT_TIMEOUT, "WaitForSingleObject returned %ld\n", ret); enter_flag = 1; call_func1(p_critical_section_unlock, &cs); ret = WaitForSingleObject(thread, INFINITE); - ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %d\n", ret); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %ld\n", ret); ret = CloseHandle(thread); ok(ret, "CloseHandle failed\n"); call_func1(p_critical_section_dtor, &cs); @@ -1063,10 +1063,10 @@ static void test__Condition_variable(void) call_func1(p__Condition_variable_notify_one, &cv); ret = WaitForSingleObject(threads[1], 500); - ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %d\n", ret); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %ld\n", ret); call_func1(p__Condition_variable_notify_one, &cv); ret = WaitForSingleObject(threads[0], 500); - ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %d\n", ret); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %ld\n", ret); CloseHandle(threads[0]); CloseHandle(threads[1]);

1 0

Piotr Caban : msvcrtd/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: 2c8b49f41532e9be93a416847d01028b5a61fa86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c8b49f41532e9be93a41684… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 11 23:41:30 2022 +0100 msvcrtd/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrtd/tests/Makefile.in | 1 - dlls/msvcrtd/tests/debug.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/msvcrtd/tests/Makefile.in b/dlls/msvcrtd/tests/Makefile.in index e518e950905..d72b1d6a16d 100644 --- a/dlls/msvcrtd/tests/Makefile.in +++ b/dlls/msvcrtd/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = msvcrtd.dll C_SRCS = \ diff --git a/dlls/msvcrtd/tests/debug.c b/dlls/msvcrtd/tests/debug.c index 2a232de4a49..50059ce1cb2 100644 --- a/dlls/msvcrtd/tests/debug.c +++ b/dlls/msvcrtd/tests/debug.c @@ -42,7 +42,7 @@ static BOOL init_functions(void) HMODULE hModule = LoadLibraryA("msvcrtd.dll"); if (!hModule) { - win_skip("LoadLibraryA failed to load msvcrtd.dll with GLE=%d\n", GetLastError()); + win_skip("LoadLibraryA failed to load msvcrtd.dll with GLE=%ld\n", GetLastError()); return FALSE; }

1 0

Piotr Caban : msvcr90/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: 0fc71d4440fc75c886bfc9d84450e60ba5a6b9a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fc71d4440fc75c886bfc9d8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 11 23:41:38 2022 +0100 msvcr90/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr90/tests/Makefile.in | 1 - dlls/msvcr90/tests/msvcr90.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/msvcr90/tests/Makefile.in b/dlls/msvcr90/tests/Makefile.in index 9da4bd99c4f..9db8275e020 100644 --- a/dlls/msvcr90/tests/Makefile.in +++ b/dlls/msvcr90/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = msvcr90.dll C_SRCS = \ diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 99b0766acb7..63a2254d187 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -339,7 +339,7 @@ static void __cdecl test_invalid_parameter_handler(const wchar_t *expression, ok(function == NULL, "function is not NULL\n"); ok(file == NULL, "file is not NULL\n"); ok(line == 0, "line = %u\n", line); - ok(arg == 0, "arg = %lx\n", (UINT_PTR)arg); + ok(arg == 0, "arg = %Ix\n", arg); ok(errno != 0xdeadbeef, "errno not set\n"); } @@ -353,7 +353,7 @@ static BOOL init(void) SetLastError(0xdeadbeef); hcrt = LoadLibraryA("msvcr90.dll"); if (!hcrt) { - win_skip("msvcr90.dll not installed (got %d)\n", GetLastError()); + win_skip("msvcr90.dll not installed (got %ld)\n", GetLastError()); return FALSE; } @@ -1181,7 +1181,7 @@ static void test_getptd(void) int dec, sign; void *mbcinfo, *locinfo; - ok(ptd->tid == tid, "ptd->tid = %x, expected %x\n", ptd->tid, tid); + ok(ptd->tid == tid, "ptd->tid = %lx, expected %lx\n", ptd->tid, tid); ok(ptd->handle == INVALID_HANDLE_VALUE, "ptd->handle = %p\n", ptd->handle); ok(p_errno() == &ptd->thread_errno, "ptd->thread_errno is different then _errno()\n"); ok(p_doserrno() == &ptd->thread_doserrno, "ptd->thread_doserrno is different then __doserrno()\n"); @@ -1258,7 +1258,7 @@ struct block_file_arg FILE *write; HANDLE init; HANDLE finish; - int deadlock_test; + LONG deadlock_test; }; static DWORD WINAPI block_file(void *arg)

1 0

Piotr Caban : msvcrt/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: d81afa52ec121c999922683a3292aa10a72c50a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d81afa52ec121c999922683a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 11 23:41:50 2022 +0100 msvcrt/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/Makefile.in | 1 - dlls/msvcrt/tests/data.c | 10 +++++----- dlls/msvcrt/tests/file.c | 42 +++++++++++++++++++++--------------------- dlls/msvcrt/tests/locale.c | 6 +++--- dlls/msvcrt/tests/misc.c | 22 +++++++++++----------- dlls/msvcrt/tests/string.c | 26 +++++++++++++------------- dlls/msvcrt/tests/time.c | 14 +++++++------- 7 files changed, 60 insertions(+), 61 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d81afa52ec121c999922…

1 0

Piotr Caban : ucrtbase/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: 066dba13307d866ba45d9473dffd389e2d912a3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=066dba13307d866ba45d9473… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 11 23:47:45 2022 +0100 ucrtbase/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/Makefile.in | 2 +- dlls/ucrtbase/tests/misc.c | 20 ++++++++++---------- dlls/ucrtbase/tests/printf.c | 4 ++-- dlls/ucrtbase/tests/string.c | 2 +- dlls/ucrtbase/tests/thread.c | 36 ++++++++++++++++++------------------ 5 files changed, 32 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=066dba13307d866ba45d…

1 0

Nikolay Sivov : oleaut32: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: c0a131f9d9d0826e4a0aa06ff1cdea66b73e222f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0a131f9d9d0826e4a0aa06f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Feb 12 16:34:59 2022 +0300 oleaut32: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/Makefile.in | 2 +- dlls/oleaut32/connpt.c | 120 +++----------------- dlls/oleaut32/dispatch.c | 13 ++- dlls/oleaut32/hash.c | 4 +- dlls/oleaut32/oleaut.c | 10 +- dlls/oleaut32/olefont.c | 53 +++------ dlls/oleaut32/olepicture.c | 79 +++++--------- dlls/oleaut32/olepropframe.c | 10 +- dlls/oleaut32/recinfo.c | 23 ++-- dlls/oleaut32/safearray.c | 20 ++-- dlls/oleaut32/typelib.c | 254 +++++++++++++++++++------------------------ dlls/oleaut32/usrmarshal.c | 97 +++++++++-------- dlls/oleaut32/varformat.c | 36 +++--- dlls/oleaut32/variant.c | 40 +++---- dlls/oleaut32/vartype.c | 24 ++-- 15 files changed, 312 insertions(+), 473 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c0a131f9d9d0826e4a0a…

1 0

Conor McCarthy : vkd3d: Lock the heap mutex while binding heap memory.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: vkd3d Branch: master Commit: c9aea8993fc02a677cb8f2d30741d10f6e9c2b49 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c9aea8993fc02a677cb8f2d… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Feb 14 15:58:22 2022 +1000 vkd3d: Lock the heap mutex while binding heap memory. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 7b94ac9..4c48e22 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1941,11 +1941,17 @@ static HRESULT vkd3d_bind_heap_memory(struct d3d12_device *device, goto allocate_memory; } + /* Syncronisation is not required for binding, but vkMapMemory() may be called + * from another thread and it requires exclusive access. */ + vkd3d_mutex_lock(&heap->mutex); + if (d3d12_resource_is_buffer(resource)) vr = VK_CALL(vkBindBufferMemory(vk_device, resource->u.vk_buffer, heap->vk_memory, heap_offset)); else vr = VK_CALL(vkBindImageMemory(vk_device, resource->u.vk_image, heap->vk_memory, heap_offset)); + vkd3d_mutex_unlock(&heap->mutex); + if (vr == VK_SUCCESS) { resource->heap = heap;

1 0

Matteo Bruni : vkd3d-shader/sm4: Skip non-color outputs in shader output mapping.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: vkd3d Branch: master Commit: 02ac34d0a2cf3dd95bffa3837caceaa295016146 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=02ac34d0a2cf3dd95bffa38… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 11 21:04:03 2022 +0100 vkd3d-shader/sm4: Skip non-color outputs in shader output mapping. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index d28c303..27993c7 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1672,6 +1672,9 @@ static bool shader_sm4_init(struct vkd3d_shader_sm4_parser *sm4, const uint32_t { struct vkd3d_shader_signature_element *e = &output_signature->elements[i]; + if (version.type == VKD3D_SHADER_TYPE_PIXEL + && ascii_strcasecmp(e->semantic_name, "SV_Target")) + continue; if (e->register_index >= ARRAY_SIZE(sm4->output_map)) { WARN("Invalid output index %u.\n", e->register_index);

1 0

Giovanni Mascellani : tests: Test matrix multiplication.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: vkd3d Branch: master Commit: 6426161feac0e30b347a0d7e678df878b4a8bde7 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6426161feac0e30b347a0d7… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Feb 11 21:04:04 2022 +0100 tests: Test matrix multiplication. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 + tests/hlsl-mul.shader_test | 290 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 292 insertions(+) diff --git a/Makefile.am b/Makefile.am index 7a7bd6a..687b624 100644 --- a/Makefile.am +++ b/Makefile.am @@ -79,6 +79,7 @@ vkd3d_shader_tests = \ tests/hlsl-invalid.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ + tests/hlsl-mul.shader_test \ tests/hlsl-nested-arrays.shader_test \ tests/hlsl-numeric-constructor-truncation.shader_test \ tests/hlsl-numeric-types.shader_test \ @@ -319,6 +320,7 @@ XFAIL_TESTS = \ tests/hlsl-intrinsic-override.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ + tests/hlsl-mul.shader_test \ tests/hlsl-nested-arrays.shader_test \ tests/hlsl-numeric-constructor-truncation.shader_test \ tests/hlsl-numeric-types.shader_test \ diff --git a/tests/hlsl-mul.shader_test b/tests/hlsl-mul.shader_test new file mode 100644 index 0000000..7b45318 --- /dev/null +++ b/tests/hlsl-mul.shader_test @@ -0,0 +1,290 @@ + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float4x4 x = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + float4 y = float4(1.0, 2.0, 3.0, 4.0); + + return mul(x, y); +} + +[test] +draw quad +probe all rgba (30.0, 70.0, 110.0, 150.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float4 x = float4(1.0, 2.0, 3.0, 4.0); + float4x4 y = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + + return mul(x, y); +} + +[test] +draw quad +probe all rgba (90.0, 100.0, 110.0, 120.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float4x4 x = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + float3 y = float3(1.0, 2.0, 3.0); + + return mul(x, y); +} + +[test] +draw quad +probe all rgba (14.0, 38.0, 62.0, 86.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float3 x = float3(1.0, 2.0, 3.0); + float4x4 y = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + + return mul(x, y); +} + +[test] +draw quad +probe all rgba (38.0, 44.0, 50.0, 56.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float3x3 x = float3x3(1.0, 2.0, 3.0, + 4.0, 5.0, 6.0, + 7.0, 8.0, 9.0); + float4 y = float4(1.0, 2.0, 3.0, 4.0); + + return float4(mul(x, y), 0.0); +} + +[test] +draw quad +probe all rgba (14.0, 32.0, 50.0, 0.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float4 x = float4(1.0, 2.0, 3.0, 4.0); + float3x3 y = float3x3(1.0, 2.0, 3.0, + 4.0, 5.0, 6.0, + 7.0, 8.0, 9.0); + + return float4(mul(x, y), 0.0); +} + +[test] +draw quad +probe all rgba (30.0, 36.0, 42.0, 0.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float x = 10.0; + float4x4 y = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + + return mul(x, y)[1]; +} + +[test] +draw quad +probe all rgba (50.0, 60.0, 70.0, 80.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float4x4 x = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + float y = 10.0; + + return mul(x, y)[1]; +} + +[test] +draw quad +probe all rgba (50.0, 60.0, 70.0, 80.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float1 x = float1(10.0); + float4x4 y = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + + return mul(x, y); +} + +[test] +draw quad +probe all rgba (10.0, 20.0, 30.0, 40.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float4x4 x = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + float1 y = float1(10.0); + + return mul(x, y); +} + +[test] +draw quad +probe all rgba (10.0, 50.0, 90.0, 130.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float1x1 x = float1x1(10.0); + float4x4 y = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + + return mul(x, y); +} + +[test] +draw quad +probe all rgba (10.0, 20.0, 30.0, 40.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float4x4 x = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + float1x1 y = float1x1(10.0); + + return mul(x, y); +} + +[test] +draw quad +probe all rgba (10.0, 50.0, 90.0, 130.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float1x4 x = float1x4(1.0, 2.0, 3.0, 4.0); + float4x4 y = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + + return mul(x, y); +} + +[test] +draw quad +probe all rgba (90.0, 100.0, 110.0, 120.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float4x4 x = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + float1x4 y = float1x4(1.0, 2.0, 3.0, 4.0); + + return mul(x, y)[1]; +} + +[test] +draw quad +probe all rgba (5.0, 10.0, 15.0, 20.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float4x1 x = float4x1(1.0, 2.0, 3.0, 4.0); + float4x4 y = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + + return mul(x, y)[1]; +} + +[test] +draw quad +probe all rgba (2.0, 4.0, 6.0, 8.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float4x4 x = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + float4x1 y = float4x1(1.0, 2.0, 3.0, 4.0); + + return mul(x, y); +} + +[test] +draw quad +probe all rgba (30.0, 70.0, 110.0, 150.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float3x3 x = float3x3(1.0, 2.0, 3.0, + 4.0, 5.0, 6.0, + 7.0, 8.0, 9.0); + float4x4 y = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + + return mul(x, y)[1]; +} + +[test] +draw quad +probe all rgba (83.0, 98.0, 113.0, 128.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float4x4 x = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + float3x3 y = float3x3(1.0, 2.0, 3.0, + 4.0, 5.0, 6.0, + 7.0, 8.0, 9.0); + + return float4(mul(x, y)[1], 0.0); +} + +[test] +draw quad +probe all rgba (78.0, 96.0, 114.0, 0.0)

1 0

Giovanni Mascellani : tests: Test a number of simple HLSL operations.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: vkd3d Branch: master Commit: d49c84dc6f8ec534d61d08ea38bd3c0a32d38892 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d49c84dc6f8ec534d61d08e… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Feb 11 21:04:05 2022 +0100 tests: Test a number of simple HLSL operations. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 + tests/hlsl-operations.shader_test | 367 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 369 insertions(+) diff --git a/Makefile.am b/Makefile.am index 687b624..491537f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -83,6 +83,7 @@ vkd3d_shader_tests = \ tests/hlsl-nested-arrays.shader_test \ tests/hlsl-numeric-constructor-truncation.shader_test \ tests/hlsl-numeric-types.shader_test \ + tests/hlsl-operations.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ tests/hlsl-shape.shader_test \ @@ -324,6 +325,7 @@ XFAIL_TESTS = \ tests/hlsl-nested-arrays.shader_test \ tests/hlsl-numeric-constructor-truncation.shader_test \ tests/hlsl-numeric-types.shader_test \ + tests/hlsl-operations.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ tests/hlsl-shape.shader_test \ diff --git a/tests/hlsl-operations.shader_test b/tests/hlsl-operations.shader_test new file mode 100644 index 0000000..09846b1 --- /dev/null +++ b/tests/hlsl-operations.shader_test @@ -0,0 +1,367 @@ + +[pixel shader] +float4 main() : SV_TARGET +{ + float x = 5.0; + float y = 15.0; + + return float4(x + y, x - y, x * y, x / y); +} + +[test] +draw quad +probe all rgba (20.0, -10.0, 75.0, 0.33333333) + +[pixel shader] +float4 main() : SV_TARGET +{ + float x = 5.0; + float y = 15.0; + + return float4(x % y, +x, -x, y / x); +} + +[test] +draw quad +probe all rgba (5.0, 5.0, -5.0, 3.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + float x = 5.0; + float y = 15.0; + + return float4(x == y, x != y, x < y, x <= y); +} + +[test] +draw quad +probe all rgba (0.0, 1.0, 1.0, 1.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + float x = 5.0; + float y = 15.0; + float zero = 0.0; + + return float4(x > y, x >= y, !x, !zero); +} + +[test] +draw quad +probe all rgba (0.0, 0.0, 0.0, 1.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + float zero = 0.0; + float one = 1.0; + + return float4(zero && zero, zero && one, one && zero, one && one); +} + +[test] +draw quad +probe all rgba (0.0, 0.0, 0.0, 1.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + float zero = 0.0; + float one = 1.0; + + return float4(zero || zero, zero || one, one || zero, one || one); +} + +[test] +draw quad +probe all rgba (0.0, 1.0, 1.0, 1.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + int x = 5; + int y = 15; + + return float4(x + y, x - y, x * y, x / y); +} + +[test] +draw quad +probe all rgba (20.0, -10.0, 75.0, 0.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + int x = 5; + int y = 15; + + return float4(x % y, +x, -x, y / x); +} + +[test] +draw quad +probe all rgba (5.0, 5.0, -5.0, 3.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + int x = 5; + int y = 15; + + return float4(x == y, x != y, x < y, x <= y); +} + +[test] +draw quad +probe all rgba (0.0, 1.0, 1.0, 1.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + int x = 5; + int y = 15; + int zero = 0; + + return float4(x > y, x >= y, !x, !zero); +} + +[test] +draw quad +probe all rgba (0.0, 0.0, 0.0, 1.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + int x = 5; + int y = 15; + + return float4(x >> y, y >> x, x << y, y << x); +} + +[test] +draw quad +probe all rgba (0.0, 0.0, 163840.0, 480.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + int x = 5; + int y = 15; + + return float4(x & y, x | y, x ^ y, ~x); +} + +[test] +draw quad +probe all rgba (5.0, 15.0, 10.0, -6.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + int zero = 0; + int one = 1; + + return float4(zero && zero, zero && one, one && zero, one && one); +} + +[test] +draw quad +probe all rgba (0.0, 0.0, 0.0, 1.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + int zero = 0; + int one = 1; + + return float4(zero || zero, zero || one, one || zero, one || one); +} + +[test] +draw quad +probe all rgba (0.0, 1.0, 1.0, 1.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + int zero = 0; + int one = 1; + + return float4(zero & zero, zero & one, one & zero, one & one); +} + +[test] +draw quad +probe all rgba (0.0, 0.0, 0.0, 1.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + int zero = 0; + int one = 1; + + return float4(zero | zero, zero | one, one | zero, one | one); +} + +[test] +draw quad +probe all rgba (0.0, 1.0, 1.0, 1.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + int zero = 0; + int one = 1; + + return float4(zero ^ zero, zero ^ one, one ^ zero, one ^ one); +} + +[test] +draw quad +probe all rgba (0.0, 1.0, 1.0, 0.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + uint x = 5; + uint y = 15; + + return float4(x + y, x - y, x * y, x / y); +} + +[test] +draw quad +probe all rgba (20.0, 4294967296.0, 75.0, 0.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + uint x = 5; + uint y = 15; + + return float4(x % y, +x, -x, y / x); +} + +[test] +draw quad +probe all rgba (5.0, 5.0, 4294967296.0, 3.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + uint x = 5; + uint y = 15; + + return float4(x == y, x != y, x < y, x <= y); +} + +[test] +draw quad +probe all rgba (0.0, 1.0, 1.0, 1.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + uint x = 5; + uint y = 15; + uint zero = 0; + + return float4(x > y, x >= y, !x, !zero); +} + +[test] +draw quad +probe all rgba (0.0, 0.0, 0.0, 1.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + uint x = 5; + uint y = 15; + + return float4(x >> y, y >> x, x << y, y << x); +} + +[test] +draw quad +probe all rgba (0.0, 0.0, 163840.0, 480.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + uint x = 5; + uint y = 15; + + return float4(x & y, x | y, x ^ y, ~x); +} + +[test] +draw quad +probe all rgba (5.0, 15.0, 10.0, 4294967296.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + uint zero = 0; + uint one = 1; + + return float4(zero && zero, zero && one, one && zero, one && one); +} + +[test] +draw quad +probe all rgba (0.0, 0.0, 0.0, 1.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + uint zero = 0; + uint one = 1; + + return float4(zero || zero, zero || one, one || zero, one || one); +} + +[test] +draw quad +probe all rgba (0.0, 1.0, 1.0, 1.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + uint zero = 0; + uint one = 1; + + return float4(zero & zero, zero & one, one & zero, one & one); +} + +[test] +draw quad +probe all rgba (0.0, 0.0, 0.0, 1.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + uint zero = 0; + uint one = 1; + + return float4(zero | zero, zero | one, one | zero, one | one); +} + +[test] +draw quad +probe all rgba (0.0, 1.0, 1.0, 1.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + uint zero = 0; + uint one = 1; + + return float4(zero ^ zero, zero ^ one, one ^ zero, one ^ one); +} + +[test] +draw quad +probe all rgba (0.0, 1.0, 1.0, 0.0)

1 0