June 2022 - Wine-commits - list.winehq.org

Martin Storsjö : ntdll/tests: Fix printing of incorrect exception handler data.
by Alexandre Julliard 09 Jun '22

09 Jun '22

Module: wine Branch: master Commit: f1f7e096db99bcb280683767b5b5966ff1a85605 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1f7e096db99bcb280683767… Author: Martin Storsjö <martin(a)martin.st> Date: Thu Jun 9 10:57:22 2022 +0300 ntdll/tests: Fix printing of incorrect exception handler data. *(DWORD *)data is the value being compared; printing the 'data' pointer itself provides little value here. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- dlls/ntdll/tests/exception.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 3e76b001147..2089f3ed3d8 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -2123,7 +2123,7 @@ static void call_virtual_unwind( int testnum, const struct unwind_test *test ) ok( handler == expected_handler || broken( test->broken_results && handler == broken_handler ), "%u/%u: wrong handler %p/%p\n", testnum, i, handler, expected_handler ); if (handler) - ok( *(DWORD *)data == 0x08070605, "%u/%u: wrong handler data %p\n", testnum, i, data ); + ok( *(DWORD *)data == 0x08070605, "%u/%u: wrong handler data %lx\n", testnum, i, *(DWORD *)data ); else ok( data == (void *)0xdeadbeef, "%u/%u: handler data set to %p\n", testnum, i, data ); @@ -5144,7 +5144,7 @@ static void call_virtual_unwind( int testnum, const struct unwind_test *test ) ok( (char *)handler == (char *)code_mem + 0x200, "%u/%u: wrong handler %p/%p\n", testnum, i, handler, (char *)code_mem + 0x200 ); if (handler) ok( *(DWORD *)data == 0x08070605, - "%u/%u: wrong handler data %p\n", testnum, i, data ); + "%u/%u: wrong handler data %lx\n", testnum, i, *(DWORD *)data ); } else { @@ -6822,7 +6822,7 @@ static void call_virtual_unwind( int testnum, const struct unwind_test *test ) ok( (char *)handler == (char *)code_mem + 0x200, "%u/%u: wrong handler %p/%p\n", testnum, i, handler, (char *)code_mem + 0x200 ); if (handler) ok( *(DWORD *)data == 0x08070605, - "%u/%u: wrong handler data %p\n", testnum, i, data ); + "%u/%u: wrong handler data %lx\n", testnum, i, *(DWORD *)data ); } else {

1 0

Martin Storsjö : ntdll/tests: Test returning an exception handler on arm/arm64.
by Alexandre Julliard 09 Jun '22

09 Jun '22

Module: wine Branch: master Commit: 94dc5714ac19ab5d3347c55b8698823c5d62625b URL: https://source.winehq.org/git/wine.git/?a=commit;h=94dc5714ac19ab5d3347c55b… Author: Martin Storsjö <martin(a)martin.st> Date: Thu Jun 9 11:03:42 2022 +0300 ntdll/tests: Test returning an exception handler on arm/arm64. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- dlls/ntdll/tests/exception.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 2089f3ed3d8..820e435bc1b 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -5140,7 +5140,6 @@ static void call_virtual_unwind( int testnum, const struct unwind_test *test ) &runtime_func, &context, &data, &frame, &ctx_ptr ); if (test->results[i].handler > 0) { - /* Yet untested */ ok( (char *)handler == (char *)code_mem + 0x200, "%u/%u: wrong handler %p/%p\n", testnum, i, handler, (char *)code_mem + 0x200 ); if (handler) ok( *(DWORD *)data == 0x08070605, @@ -5278,7 +5277,7 @@ static void test_virtual_unwind(void) static const DWORD unwind_info_0_header = (sizeof(function_0)/2) | /* function length */ - (0 << 20) | /* X */ + (1 << 20) | /* X */ (0 << 21) | /* E */ (0 << 22) | /* F */ (1 << 23) | /* epilog */ @@ -5309,6 +5308,10 @@ static void test_virtual_unwind(void) UWOP_ALLOC_SMALL(32), /* add sp, sp, #32 */ UWOP_SAVE_RANGE_4_7_LR(6, 1), /* pop {r4-r6,pc} */ UWOP_END, + + 0, 0, /* align */ + 0x00, 0x02, 0x00, 0x00, /* handler */ + 0x05, 0x06, 0x07, 0x08, /* data */ }; static const struct results results_0[] = @@ -5323,7 +5326,7 @@ static void test_virtual_unwind(void) { 0x12, 0x10, 0, 0x5c, 0x060, TRUE, { {r4,0x50}, {r5,0x54}, {r6,0x58}, {lr,0x5c}, {d8, 0x1c00000018}, {d9, 0x2400000020}, {d10, 0x2c00000028}, {d3, 0x400000000}, {d4, 0xc00000008}, {d5, 0x1400000010}, {-1,-1} }}, { 0x16, 0x10, 0, 0x74, 0x078, TRUE, { {r4,0x68}, {r5,0x6c}, {r6,0x70}, {lr,0x74}, {d8, 0x3400000030}, {d9, 0x3c00000038}, {d10, 0x4400000040}, {d3, 0x1c00000018}, {d4, 0x2400000020}, {d5, 0x2c00000028}, {d17, 0x400000000}, {d18, 0xc00000008}, {d19, 0x1400000010}, {-1,-1} }}, { 0x1a, 0x10, 0, 0x80, 0x084, TRUE, { {r4,0x74}, {r5,0x78}, {r6,0x7c}, {lr,0x80}, {d8, 0x400000003c}, {d9, 0x4800000044}, {d10, 0x500000004c}, {d3, 0x2800000024}, {d4, 0x300000002c}, {d5, 0x3800000034}, {d17, 0x100000000c}, {d18, 0x1800000014}, {d19, 0x200000001c}, {r8,0x00}, {r10,0x04}, {r12,0x08}, {-1,-1} }}, - { 0x1c, 0x10, 0, 0x90, 0x094, TRUE, { {r4,0x84}, {r5,0x88}, {r6,0x8c}, {lr,0x90}, {d8, 0x500000004c}, {d9, 0x5800000054}, {d10, 0x600000005c}, {d3, 0x3800000034}, {d4, 0x400000003c}, {d5, 0x4800000044}, {d17, 0x200000001c}, {d18, 0x2800000024}, {d19, 0x300000002c}, {r8,0x10}, {r10,0x14}, {r12,0x18}, {-1,-1} }}, + { 0x1c, 0x10, 1, 0x90, 0x094, TRUE, { {r4,0x84}, {r5,0x88}, {r6,0x8c}, {lr,0x90}, {d8, 0x500000004c}, {d9, 0x5800000054}, {d10, 0x600000005c}, {d3, 0x3800000034}, {d4, 0x400000003c}, {d5, 0x4800000044}, {d17, 0x200000001c}, {d18, 0x2800000024}, {d19, 0x300000002c}, {r8,0x10}, {r10,0x14}, {r12,0x18}, {-1,-1} }}, { 0x1e, 0x10, 0, 0x3c, 0x040, TRUE, { {r4,0x30}, {r5,0x34}, {r6,0x38}, {lr,0x3c}, {d8, 0x400000000}, {d9, 0xc00000008}, {d10, 0x1400000010}, {-1,-1} }}, { 0x22, 0x10, 0, 0x3c, 0x040, TRUE, { {r4,0x30}, {r5,0x34}, {r6,0x38}, {lr,0x3c}, {-1,-1} }}, { 0x24, 0x10, 0, 0x2c, 0x030, TRUE, { {r4,0x20}, {r5,0x24}, {r6,0x28}, {lr,0x2c}, {-1,-1} }}, @@ -6818,7 +6821,6 @@ static void call_virtual_unwind( int testnum, const struct unwind_test *test ) &runtime_func, &context, &data, &frame, &ctx_ptr ); if (test->results[i].handler > 0) { - /* Yet untested */ ok( (char *)handler == (char *)code_mem + 0x200, "%u/%u: wrong handler %p/%p\n", testnum, i, handler, (char *)code_mem + 0x200 ); if (handler) ok( *(DWORD *)data == 0x08070605, @@ -6934,7 +6936,7 @@ static void test_virtual_unwind(void) static const DWORD unwind_info_0_header = (sizeof(function_0)/4) | /* function length */ - (0 << 20) | /* X */ + (1 << 20) | /* X */ (0 << 21) | /* E */ (1 << 22) | /* epilog */ (2 << 27); /* codes */ @@ -6954,6 +6956,9 @@ static void test_virtual_unwind(void) UWOP_SAVE_REGP(19, 16), /* stp x19, x20, [sp, #16] */ UWOP_ALLOC_SMALL(32), /* sub sp, sp, #32 */ UWOP_END, + + 0x00, 0x02, 0x00, 0x00, /* handler */ + 0x05, 0x06, 0x07, 0x08, /* data */ }; static const struct results results_0[] = @@ -6961,7 +6966,7 @@ static void test_virtual_unwind(void) /* offset fp handler pc frame offset registers */ { 0x00, 0x00, 0, ORIG_LR, 0x000, TRUE, { {-1,-1} }}, { 0x04, 0x00, 0, ORIG_LR, 0x020, TRUE, { {-1,-1} }}, - { 0x08, 0x00, 0, ORIG_LR, 0x020, TRUE, { {x19,0x10}, {x20,0x18}, {-1,-1} }}, + { 0x08, 0x00, 1, ORIG_LR, 0x020, TRUE, { {x19,0x10}, {x20,0x18}, {-1,-1} }}, { 0x0c, 0x00, 0, ORIG_LR, 0x020, TRUE, { {x19,0x10}, {x20,0x18}, {-1,-1} }}, { 0x10, 0x00, 0, ORIG_LR, 0x020, TRUE, { {-1,-1} }}, { 0x14, 0x00, 0, ORIG_LR, 0x000, TRUE, { {-1,-1} }},

1 0

Paul Gofman : ws2_32: Check for valid socket in WSAGetOverlappedResult().
by Alexandre Julliard 09 Jun '22

09 Jun '22

Module: wine Branch: master Commit: 5a8ccc15a2bc2b6e599e27356fba4b2a978fe75e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a8ccc15a2bc2b6e599e2735… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jun 7 14:06:54 2022 -0500 ws2_32: Check for valid socket in WSAGetOverlappedResult(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ws2_32/socket.c | 6 ++++++ dlls/ws2_32/tests/sock.c | 13 +++++++++++++ 2 files changed, 19 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 6a93d00730a..964724b36e7 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3626,6 +3626,12 @@ BOOL WINAPI WSAGetOverlappedResult( SOCKET s, LPWSAOVERLAPPED lpOverlapped, return FALSE; } + if (!socket_list_find( s )) + { + SetLastError( WSAENOTSOCK ); + return FALSE; + } + status = lpOverlapped->Internal; if (status == STATUS_PENDING) { diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 4a4a3a84e51..22e414e02ec 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -11848,6 +11848,7 @@ static void test_WSAGetOverlappedResult(void) NTSTATUS status; unsigned int i; SOCKET s; + HANDLE h; BOOL ret; static const NTSTATUS ranges[][2] = @@ -11862,8 +11863,20 @@ static void test_WSAGetOverlappedResult(void) {0xd0070000, 0xd0080000}, }; + WSASetLastError(0xdeadbeef); + ret = WSAGetOverlappedResult(0xdeadbeef, &overlapped, &size, FALSE, &flags); + ok(!ret, "got %d.\n", ret); + ok(WSAGetLastError() == WSAENOTSOCK, "got %u.\n", WSAGetLastError()); + s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ret = DuplicateHandle(GetCurrentProcess(), (HANDLE)s, GetCurrentProcess(), &h, 0, FALSE, DUPLICATE_SAME_ACCESS); + ok(ret, "got %d.\n", ret); + ret = WSAGetOverlappedResult((SOCKET)h, &overlapped, &size, FALSE, &flags); + ok(!ret, "got %d.\n", ret); + ok(WSAGetLastError() == WSAENOTSOCK, "got %u.\n", WSAGetLastError()); + CloseHandle(h); + for (i = 0; i < ARRAY_SIZE(ranges); ++i) { for (status = ranges[i][0]; status < ranges[i][1]; ++status)

1 0

Paul Gofman : ntdll: Cancel asyncs when thread is terminated.
by Alexandre Julliard 09 Jun '22

09 Jun '22

Module: wine Branch: master Commit: 7c597313f801c093dce2a16c3770c4f989c5209e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c597313f801c093dce2a16c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu May 26 13:41:47 2022 -0500 ntdll: Cancel asyncs when thread is terminated. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/unix/thread.c | 24 +++++++++++++----------- server/async.c | 16 ++++++++++++++++ server/file.h | 1 + server/thread.c | 1 + 4 files changed, 31 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 15bb3be34b2..ad47a5fce74 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1610,20 +1610,22 @@ NTSTATUS WINAPI NtAlertThread( HANDLE handle ) NTSTATUS WINAPI NtTerminateThread( HANDLE handle, LONG exit_code ) { NTSTATUS ret; - BOOL self = (handle == GetCurrentThread()); + BOOL self; - if (!self || exit_code) + SERVER_START_REQ( terminate_thread ) { - SERVER_START_REQ( terminate_thread ) - { - req->handle = wine_server_obj_handle( handle ); - req->exit_code = exit_code; - ret = wine_server_call( req ); - self = !ret && reply->self; - } - SERVER_END_REQ; + req->handle = wine_server_obj_handle( handle ); + req->exit_code = exit_code; + ret = wine_server_call( req ); + self = !ret && reply->self; + } + SERVER_END_REQ; + + if (self) + { + server_select( NULL, 0, SELECT_INTERRUPTIBLE, 0, NULL, NULL ); + exit_thread( exit_code ); } - if (self) exit_thread( exit_code ); return ret; } diff --git a/server/async.c b/server/async.c index a4fbeab555e..4832d69b7bf 100644 --- a/server/async.c +++ b/server/async.c @@ -593,6 +593,22 @@ void cancel_process_asyncs( struct process *process ) cancel_async( process, NULL, NULL, 0 ); } +void cancel_terminating_thread_asyncs( struct thread *thread ) +{ + struct async *async; + +restart: + LIST_FOR_EACH_ENTRY( async, &thread->process->asyncs, struct async, process_entry ) + { + if (async->thread != thread || async->terminated || async->canceled) continue; + if (async->completion && async->data.apc_context && !async->event) continue; + + async->canceled = 1; + fd_cancel_async( async->fd, async ); + goto restart; + } +} + /* wake up async operations on the queue */ void async_wake_up( struct async_queue *queue, unsigned int status ) { diff --git a/server/file.h b/server/file.h index 9f9d4cd4e1a..0ffe0e2c8dc 100644 --- a/server/file.h +++ b/server/file.h @@ -245,6 +245,7 @@ extern struct iosb *async_get_iosb( struct async *async ); extern struct thread *async_get_thread( struct async *async ); extern struct async *find_pending_async( struct async_queue *queue ); extern void cancel_process_asyncs( struct process *process ); +extern void cancel_terminating_thread_asyncs( struct thread *thread ); static inline void init_async_queue( struct async_queue *queue ) { diff --git a/server/thread.c b/server/thread.c index 467ccd1f0db..f49fbf40b78 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1462,6 +1462,7 @@ DECL_HANDLER(terminate_thread) thread->exit_code = req->exit_code; if (thread != current) kill_thread( thread, 1 ); else reply->self = 1; + cancel_terminating_thread_asyncs( thread ); release_object( thread ); } }

1 0

Paul Gofman : ws2_32/tests: Add tests for terminated thread asyncs completion.
by Alexandre Julliard 09 Jun '22

09 Jun '22

Module: wine Branch: master Commit: ab88f34de6a947b6e1e7d1b4045de1c5b582e433 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab88f34de6a947b6e1e7d1b4… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu May 26 14:48:17 2022 -0500 ws2_32/tests: Add tests for terminated thread asyncs completion. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ws2_32/tests/afd.c | 212 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 212 insertions(+) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index 5b64ccd7715..fe3c2ef2ff6 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -2355,6 +2355,217 @@ static void test_getsockname(void) CloseHandle(event); } +struct ioctl_params +{ + HANDLE handle, event; + PIO_APC_ROUTINE apc; + void *apc_context; + IO_STATUS_BLOCK *io; + ULONG code; + void *in_buffer; + ULONG in_size; + void *out_buffer; + ULONG out_size; + NTSTATUS ret; + HANDLE complete_event; + BOOL kill_thread; +}; + +static DWORD WINAPI async_ioctl_thread(void *params) +{ + struct ioctl_params *io = params; + + io->ret = NtDeviceIoControlFile(io->handle, io->event, io->apc, io->apc_context, io->io, + io->code, io->in_buffer, io->in_size, io->out_buffer, io->out_size); + SetEvent(io->complete_event); + if (io->kill_thread) + Sleep(3000); + return io->ret; +} + +static NTSTATUS WINAPI thread_NtDeviceIoControlFile(BOOL kill_thread, HANDLE handle, HANDLE event, + PIO_APC_ROUTINE apc, void *apc_context, IO_STATUS_BLOCK *io, ULONG code, void *in_buffer, ULONG in_size, + void *out_buffer, ULONG out_size) +{ + struct ioctl_params p; + HANDLE thread; + DWORD ret; + + p.handle = handle; + p.event = event; + p.apc = apc; + p.apc_context = apc_context; + p.io = io; + p.code = code; + p.in_buffer = in_buffer; + p.in_size = in_size; + p.out_buffer = out_buffer; + p.out_size = out_size; + p.complete_event = CreateEventW(NULL, FALSE, FALSE, NULL); + p.kill_thread = kill_thread; + + thread = CreateThread(NULL, 0, async_ioctl_thread, &p, 0, NULL); + ok(!!thread, "got NULL.\n"); + ret = WaitForSingleObject(p.complete_event, INFINITE); + ok(ret == WAIT_OBJECT_0, "got ret %#lx.\n", ret); + if (kill_thread) + TerminateThread(thread, -1); + CloseHandle(p.complete_event); + ret = WaitForSingleObject(thread, INFINITE); + ok(ret == WAIT_OBJECT_0, "got ret %#lx.\n", ret); + CloseHandle(thread); + SleepEx(0, TRUE); + return p.ret; +} + +static unsigned int test_async_thread_termination_apc_count; + +static void WINAPI test_async_thread_termination_apc( void *arg, IO_STATUS_BLOCK *iosb, ULONG reserved ) +{ + ++test_async_thread_termination_apc_count; +} + +static void test_async_thread_termination(void) +{ + static const struct + { + BOOL kill_thread; + BOOL event; + PIO_APC_ROUTINE apc; + void *apc_context; + } + tests[] = + { + {FALSE, TRUE, NULL, NULL}, + {TRUE, TRUE, NULL, NULL}, + {FALSE, FALSE, NULL, NULL}, + {TRUE, FALSE, NULL, NULL}, + {FALSE, TRUE, test_async_thread_termination_apc, NULL}, + {TRUE, TRUE, test_async_thread_termination_apc, NULL}, + {FALSE, FALSE, test_async_thread_termination_apc, NULL}, + {TRUE, FALSE, test_async_thread_termination_apc, NULL}, + {FALSE, TRUE, NULL, (void *)0xdeadbeef}, + {TRUE, TRUE, NULL, (void *)0xdeadbeef}, + {FALSE, FALSE, NULL, (void *)0xdeadbeef}, + {TRUE, FALSE, NULL, (void *)0xdeadbeef}, + {FALSE, TRUE, test_async_thread_termination_apc, (void *)0xdeadbeef}, + {TRUE, TRUE, test_async_thread_termination_apc, (void *)0xdeadbeef}, + {FALSE, FALSE, test_async_thread_termination_apc, (void *)0xdeadbeef}, + {TRUE, FALSE, test_async_thread_termination_apc, (void *)0xdeadbeef}, + }; + + const struct sockaddr_in bind_addr = {.sin_family = AF_INET, .sin_addr.s_addr = htonl(INADDR_LOOPBACK)}; + char in_buffer[offsetof(struct afd_poll_params, sockets[3])]; + char out_buffer[offsetof(struct afd_poll_params, sockets[3])]; + struct afd_poll_params *in_params = (struct afd_poll_params *)in_buffer; + struct afd_poll_params *out_params = (struct afd_poll_params *)out_buffer; + LARGE_INTEGER zero = {{0}}; + ULONG_PTR key, value; + IO_STATUS_BLOCK io; + HANDLE event, port; + ULONG params_size; + SOCKET listener; + unsigned int i; + int ret; + + event = CreateEventW(NULL, FALSE, FALSE, NULL); + + listener = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ret = bind(listener, (const struct sockaddr *)&bind_addr, sizeof(bind_addr)); + ok(!ret, "got error %u\n", WSAGetLastError()); + ret = listen(listener, 1); + ok(!ret, "got error %u\n", WSAGetLastError()); + + in_params->count = 1; + in_params->exclusive = FALSE; + in_params->sockets[0].socket = listener; + in_params->sockets[0].flags = ~0; + in_params->sockets[0].status = 0xdeadbeef; + params_size = offsetof(struct afd_poll_params, sockets[1]); + in_params->timeout = -10 * 1000 * 1000 * 5; + + /* asyncs without completion port are always cancelled on thread exit. */ + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + winetest_push_context("test %u", i); + memset(&io, 0xcc, sizeof(io)); + ResetEvent(event); + ret = thread_NtDeviceIoControlFile(tests[i].kill_thread, (HANDLE)listener, tests[i].event ? event : NULL, + tests[i].apc, tests[i].apc_context, &io, IOCTL_AFD_POLL, in_params, params_size, + out_params, params_size); + ok(ret == STATUS_PENDING, "got %#x\n", ret); + ok(io.Status == STATUS_CANCELLED, "got %#lx\n", io.Status); + if (tests[i].event) + { + ret = WaitForSingleObject(event, 1000); + ok(!ret, "got %#x\n", ret); + } + winetest_pop_context(); + } + + SleepEx(0, TRUE); + ok(!test_async_thread_termination_apc_count, "got APC.\n"); + + port = CreateIoCompletionPort((HANDLE)listener, NULL, 0, 0); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + winetest_push_context("test %u", i); + memset(&io, 0xcc, sizeof(io)); + ResetEvent(event); + ret = thread_NtDeviceIoControlFile(tests[i].kill_thread, (HANDLE)listener, tests[i].event ? event : NULL, + tests[i].apc, tests[i].apc_context, &io, IOCTL_AFD_POLL, in_params, params_size, + out_params, params_size); + if (tests[i].apc) + { + ok(ret == STATUS_INVALID_PARAMETER, "got %#x\n", ret); + winetest_pop_context(); + continue; + } + ok(ret == STATUS_PENDING, "got %#x\n", ret); + if (!tests[i].apc_context || tests[i].event) + { + ok(io.Status == STATUS_CANCELLED, "got %#lx\n", io.Status); + memset(&io, 0xcc, sizeof(io)); + key = 0xcc; + value = 0; + ret = NtRemoveIoCompletion(port, &key, &value, &io, &zero); + if (tests[i].apc_context) + { + ok(!ret, "got %#x\n", ret); + ok(!key, "got key %#Ix\n", key); + ok(value == 0xdeadbeef, "got value %#Ix\n", value); + ok(io.Status == STATUS_CANCELLED, "got %#lx\n", io.Status); + } + else + { + ok(ret == WAIT_TIMEOUT, "got %#x\n", ret); + } + winetest_pop_context(); + continue; + } + + /* async is not cancelled if there is a completion port, completion key and no event. */ + ok(io.Status == 0xcccccccc, "got %#lx\n", io.Status); + memset(&io, 0xcc, sizeof(io)); + key = 0xcc; + value = 0; + ret = NtRemoveIoCompletion(port, &key, &value, &io, &zero); + ok(ret == WAIT_TIMEOUT, "got %#x\n", ret); + CancelIoEx((HANDLE)listener, NULL); + ret = NtRemoveIoCompletion(port, &key, &value, &io, &zero); + ok(!ret, "got %#x\n", ret); + ok(!key, "got key %#Ix\n", key); + ok(value == 0xdeadbeef, "got value %#Ix\n", value); + ok(io.Status == STATUS_CANCELLED, "got %#lx\n", io.Status); + winetest_pop_context(); + } + + CloseHandle(port); + CloseHandle(event); + closesocket(listener); +} + START_TEST(afd) { WSADATA data; @@ -2372,6 +2583,7 @@ START_TEST(afd) test_get_events_reset(); test_bind(); test_getsockname(); + test_async_thread_termination(); WSACleanup(); }

1 0

Zebediah Figura : tests/shader_runner: Allow creating UAV resources.
by Alexandre Julliard 09 Jun '22

09 Jun '22

Module: vkd3d Branch: master Commit: ac404afe93aa97577e915c431c3dc8c59efc4e9a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ac404afe93aa97577e915c4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jun 8 18:18:35 2022 -0500 tests/shader_runner: Allow creating UAV resources. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/shader_runner.c | 38 +++++++++++++++++++++++++---------- tests/shader_runner.h | 2 ++ tests/shader_runner_d3d11.c | 31 ++++++++++++++++++++++------ tests/shader_runner_d3d12.c | 37 ++++++++++++++++++++++++++-------- tests/shader_runner_d3d9.c | 12 ++++++++--- tests/shader_runner_vulkan.c | 48 +++++++++++++++++++++++++++++++++++--------- 6 files changed, 130 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=ac404afe93aa97577e9…

1 0

Zebediah Figura : tests/shader_runner: Create the render pass and framebuffer in vulkan_runner_draw().
by Alexandre Julliard 09 Jun '22

09 Jun '22

Module: vkd3d Branch: master Commit: d2d29d1b880eabb15effd58f78872e5b77c3b696 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d2d29d1b880eabb15effd58… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jun 8 18:18:36 2022 -0500 tests/shader_runner: Create the render pass and framebuffer in vulkan_runner_draw(). Prepare to allow for dynamically changing the bound attachments in consecutive draw calls. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/shader_runner_vulkan.c | 99 ++++++++++++++++++++++++-------------------- 1 file changed, 53 insertions(+), 46 deletions(-) diff --git a/tests/shader_runner_vulkan.c b/tests/shader_runner_vulkan.c index f5a0e7ec..d62792d6 100644 --- a/tests/shader_runner_vulkan.c +++ b/tests/shader_runner_vulkan.c @@ -58,13 +58,11 @@ struct vulkan_shader_runner VkQueue queue; VkCommandPool command_pool; VkCommandBuffer cmd_buffer; - VkRenderPass render_pass; VkDescriptorPool descriptor_pool; VkImage render_target; VkDeviceMemory rt_memory; VkImageView rtv; - VkFramebuffer fb; struct vulkan_sampler { @@ -504,7 +502,7 @@ static VkPipelineLayout create_pipeline_layout(const struct vulkan_shader_runner return pipeline_layout; } -static VkPipeline create_pipeline(const struct vulkan_shader_runner *runner, +static VkPipeline create_pipeline(const struct vulkan_shader_runner *runner, VkRenderPass render_pass, VkPipelineLayout pipeline_layout, D3D_PRIMITIVE_TOPOLOGY primitive_topology) { VkPipelineInputAssemblyStateCreateInfo ia_desc = {.sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO}; @@ -620,7 +618,7 @@ static VkPipeline create_pipeline(const struct vulkan_shader_runner *runner, pipeline_desc.pMultisampleState = &ms_desc; pipeline_desc.pColorBlendState = &blend_desc; pipeline_desc.layout = pipeline_layout; - pipeline_desc.renderPass = runner->render_pass; + pipeline_desc.renderPass = render_pass; pipeline_desc.subpass = 0; VK_CALL(vkCreateGraphicsPipelines(runner->device, VK_NULL_HANDLE, 1, &pipeline_desc, NULL, &pipeline)); @@ -782,6 +780,48 @@ static void bind_resources(struct vulkan_shader_runner *runner, VkPipelineBindPo /* The descriptor set will be freed by resetting the descriptor pool. */ } +static void create_render_pass_and_framebuffer(struct vulkan_shader_runner *runner, + VkRenderPass *render_pass, VkFramebuffer *fb) +{ + VkRenderPassCreateInfo render_pass_desc = {.sType = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO}; + VkFramebufferCreateInfo fb_desc = {.sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO}; + VkAttachmentDescription attachment_desc = {0}; + VkSubpassDescription subpass_desc = {0}; + VkAttachmentReference color_ref = {0}; + + attachment_desc.format = VK_FORMAT_R32G32B32A32_SFLOAT; + attachment_desc.samples = VK_SAMPLE_COUNT_1_BIT; + attachment_desc.loadOp = VK_ATTACHMENT_LOAD_OP_LOAD; + attachment_desc.storeOp = VK_ATTACHMENT_STORE_OP_STORE; + attachment_desc.stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; + attachment_desc.stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; + attachment_desc.initialLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; + attachment_desc.finalLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; + + color_ref.attachment = 0; + color_ref.layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; + + subpass_desc.pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS; + subpass_desc.colorAttachmentCount = 1; + subpass_desc.pColorAttachments = &color_ref; + + render_pass_desc.attachmentCount = 1; + render_pass_desc.pAttachments = &attachment_desc; + render_pass_desc.subpassCount = 1; + render_pass_desc.pSubpasses = &subpass_desc; + + VK_CALL(vkCreateRenderPass(runner->device, &render_pass_desc, NULL, render_pass)); + + fb_desc.renderPass = *render_pass; + fb_desc.attachmentCount = 1; + fb_desc.pAttachments = &runner->rtv; + fb_desc.width = RENDER_TARGET_WIDTH; + fb_desc.height = RENDER_TARGET_HEIGHT; + fb_desc.layers = 1; + + VK_CALL(vkCreateFramebuffer(runner->device, &fb_desc, NULL, fb)); +} + static bool vulkan_runner_draw(struct shader_runner *r, D3D_PRIMITIVE_TOPOLOGY primitive_topology, unsigned int vertex_count) { @@ -794,16 +834,20 @@ static bool vulkan_runner_draw(struct shader_runner *r, VkDescriptorSetLayout set_layout; VkPipelineLayout pipeline_layout; VkDevice device = runner->device; + VkRenderPass render_pass; VkClearRect clear_rect; VkPipeline pipeline; + VkFramebuffer fb; bool ret = true; unsigned int i; + create_render_pass_and_framebuffer(runner, &render_pass, &fb); + /* Create this before compiling shaders, it will assign resource bindings. */ set_layout = create_descriptor_set_layout(runner); pipeline_layout = create_pipeline_layout(runner, set_layout); - if (!(pipeline = create_pipeline(runner, pipeline_layout, primitive_topology))) + if (!(pipeline = create_pipeline(runner, render_pass, pipeline_layout, primitive_topology))) { ret = false; goto out; @@ -811,8 +855,8 @@ static bool vulkan_runner_draw(struct shader_runner *r, begin_command_buffer(runner); - pass_begin_desc.renderPass = runner->render_pass; - pass_begin_desc.framebuffer = runner->fb; + pass_begin_desc.renderPass = render_pass; + pass_begin_desc.framebuffer = fb; pass_begin_desc.renderArea = rt_rect; VK_CALL(vkCmdBeginRenderPass(cmd_buffer, &pass_begin_desc, VK_SUBPASS_CONTENTS_INLINE)); @@ -845,6 +889,8 @@ out: VK_CALL(vkDestroyPipelineLayout(device, pipeline_layout, NULL)); VK_CALL(vkDestroyDescriptorSetLayout(device, set_layout, NULL)); + VK_CALL(vkDestroyRenderPass(device, render_pass, NULL)); + VK_CALL(vkDestroyFramebuffer(device, fb, NULL)); return ret; } @@ -985,17 +1031,12 @@ static bool init_vulkan_runner(struct vulkan_shader_runner *runner) VkDescriptorPoolCreateInfo descriptor_pool_desc = {.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO}; VkCommandBufferAllocateInfo cmd_buffer_desc = {.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO}; VkCommandPoolCreateInfo command_pool_desc = {.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO}; - VkRenderPassCreateInfo render_pass_desc = {.sType = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO}; VkDeviceQueueCreateInfo queue_desc = {.sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO}; - VkFramebufferCreateInfo fb_desc = {.sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO}; VkInstanceCreateInfo instance_desc = {.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO}; VkDeviceCreateInfo device_desc = {.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO}; VkPhysicalDeviceFeatures ret_features, features; VkDescriptorPoolSize descriptor_pool_sizes[3]; - VkAttachmentDescription attachment_desc = {0}; static const float queue_priority = 1.0f; - VkSubpassDescription subpass_desc = {0}; - VkAttachmentReference color_ref = {0}; VkFormatProperties format_props; uint32_t count, graphics_index; VkDevice device; @@ -1100,43 +1141,11 @@ static bool init_vulkan_runner(struct vulkan_shader_runner *runner) VK_CALL(vkAllocateCommandBuffers(device, &cmd_buffer_desc, &runner->cmd_buffer)); - attachment_desc.format = VK_FORMAT_R32G32B32A32_SFLOAT; - attachment_desc.samples = VK_SAMPLE_COUNT_1_BIT; - attachment_desc.loadOp = VK_ATTACHMENT_LOAD_OP_LOAD; - attachment_desc.storeOp = VK_ATTACHMENT_STORE_OP_STORE; - attachment_desc.stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; - attachment_desc.stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; - attachment_desc.initialLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - attachment_desc.finalLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - - color_ref.attachment = 0; - color_ref.layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - - subpass_desc.pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS; - subpass_desc.colorAttachmentCount = 1; - subpass_desc.pColorAttachments = &color_ref; - - render_pass_desc.attachmentCount = 1; - render_pass_desc.pAttachments = &attachment_desc; - render_pass_desc.subpassCount = 1; - render_pass_desc.pSubpasses = &subpass_desc; - - VK_CALL(vkCreateRenderPass(device, &render_pass_desc, NULL, &runner->render_pass)); - runner->render_target = create_2d_image(runner, RENDER_TARGET_WIDTH, RENDER_TARGET_HEIGHT, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT, VK_FORMAT_R32G32B32A32_SFLOAT, &runner->rt_memory); runner->rtv = create_2d_image_view(runner, runner->render_target, VK_FORMAT_R32G32B32A32_SFLOAT); - fb_desc.renderPass = runner->render_pass; - fb_desc.attachmentCount = 1; - fb_desc.pAttachments = &runner->rtv; - fb_desc.width = RENDER_TARGET_WIDTH; - fb_desc.height = RENDER_TARGET_HEIGHT; - fb_desc.layers = 1; - - VK_CALL(vkCreateFramebuffer(device, &fb_desc, NULL, &runner->fb)); - descriptor_pool_sizes[0].type = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE; descriptor_pool_sizes[0].descriptorCount = MAX_RESOURCES; descriptor_pool_sizes[1].type = VK_DESCRIPTOR_TYPE_SAMPLER; @@ -1169,12 +1178,10 @@ static void cleanup_vulkan_runner(struct vulkan_shader_runner *runner) VkDevice device = runner->device; VK_CALL(vkFreeMemory(device, runner->rt_memory, NULL)); - VK_CALL(vkDestroyFramebuffer(device, runner->fb, NULL)); VK_CALL(vkDestroyImageView(device, runner->rtv, NULL)); VK_CALL(vkDestroyImage(device, runner->render_target, NULL)); VK_CALL(vkDestroyDescriptorPool(device, runner->descriptor_pool, NULL)); - VK_CALL(vkDestroyRenderPass(device, runner->render_pass, NULL)); VK_CALL(vkFreeCommandBuffers(device, runner->command_pool, 1, &runner->cmd_buffer)); VK_CALL(vkDestroyCommandPool(device, runner->command_pool, NULL)); VK_CALL(vkDestroyDevice(device, NULL));

1 0

Zebediah Figura : tests/shader_runner: Make the render target into a resource.
by Alexandre Julliard 09 Jun '22

09 Jun '22

Module: vkd3d Branch: master Commit: 2b69ee67bda5435acfa6449ba4d2635f9ce20b30 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2b69ee67bda5435acfa6449… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jun 8 18:18:37 2022 -0500 tests/shader_runner: Make the render target into a resource. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/shader_runner.c | 57 ++++++++++++++++++- tests/shader_runner.h | 6 +- tests/shader_runner_d3d11.c | 70 +++++++++++------------ tests/shader_runner_d3d12.c | 86 ++++++++++++++++++++-------- tests/shader_runner_d3d9.c | 67 +++++++++++----------- tests/shader_runner_vulkan.c | 133 +++++++++++++++++++++++++------------------ 6 files changed, 269 insertions(+), 150 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=2b69ee67bda5435acfa…

1 0

Zebediah Figura : tests: Add a basic shader test for UAVs.
by Alexandre Julliard 09 Jun '22

09 Jun '22

Module: vkd3d Branch: master Commit: 08e2a8e9bbd11ef1af80accb094f7acac2a60e30 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=08e2a8e9bbd11ef1af80acc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jun 8 18:18:38 2022 -0500 tests: Add a basic shader test for UAVs. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 + tests/shader_runner.c | 22 ++++++++++++++--- tests/shader_runner_d3d12.c | 10 +++++--- tests/shader_runner_vulkan.c | 12 ++++++---- tests/uav.shader_test | 56 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 90 insertions(+), 11 deletions(-) diff --git a/Makefile.am b/Makefile.am index dd3ce1ff..400dc8aa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -132,6 +132,7 @@ vkd3d_shader_tests = \ tests/texture-load.shader_test \ tests/texture-load-typed.shader_test \ tests/trigonometry.shader_test \ + tests/uav.shader_test \ tests/writemask-assignop-0.shader_test \ tests/writemask-assignop-1.shader_test \ tests/writemask-assignop-2.shader_test \ diff --git a/tests/shader_runner.c b/tests/shader_runner.c index f367027f..e2dc2dda 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -370,6 +370,8 @@ static void set_uniforms(struct shader_runner *runner, size_t offset, size_t cou static void parse_test_directive(struct shader_runner *runner, const char *line) { + char *rest; + runner->is_todo = false; if (match_string(line, "todo", &line)) @@ -475,19 +477,33 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) if (runner->last_render_failed) return; - resource = get_resource(runner, RESOURCE_TYPE_RENDER_TARGET, 0); + if (match_string(line, "uav", &line)) + { + unsigned int slot = strtoul(line, &rest, 10); + + if (rest == line) + fatal_error("Malformed UAV index '%s'.\n", line); + line = rest; + + resource = get_resource(runner, RESOURCE_TYPE_UAV, slot); + } + else + { + resource = get_resource(runner, RESOURCE_TYPE_RENDER_TARGET, 0); + } + rb = runner->ops->get_resource_readback(runner, resource); if (match_string(line, "all", &line)) { set_rect(&rect, 0, 0, resource->width, resource->height); } - else if (sscanf(line, "( %d , %d , %d , %d )%n", &left, &top, &right, &bottom, &len) == 4) + else if (sscanf(line, " ( %d , %d , %d , %d )%n", &left, &top, &right, &bottom, &len) == 4) { set_rect(&rect, left, top, right, bottom); line += len; } - else if (sscanf(line, "( %u , %u )%n", &left, &top, &len) == 2) + else if (sscanf(line, " ( %u , %u )%n", &left, &top, &len) == 2) { set_rect(&rect, left, top, left + 1, top + 1); line += len; diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 79d5b8eb..871b5022 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -373,16 +373,20 @@ static struct resource_readback *d3d12_runner_get_resource_readback(struct shade struct test_context *test_context = &runner->test_context; struct d3d12_resource_readback *rb = malloc(sizeof(*rb)); struct d3d12_resource *resource = d3d12_resource(res); + D3D12_RESOURCE_STATES state; - assert(resource->r.type == RESOURCE_TYPE_RENDER_TARGET); + if (resource->r.type == RESOURCE_TYPE_RENDER_TARGET) + state = D3D12_RESOURCE_STATE_RENDER_TARGET; + else + state = D3D12_RESOURCE_STATE_UNORDERED_ACCESS; transition_resource_state(test_context->list, resource->resource, - D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + state, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(resource->resource, 0, rb, test_context->queue, test_context->list); reset_command_list(test_context->list, test_context->allocator); transition_resource_state(test_context->list, resource->resource, - D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + D3D12_RESOURCE_STATE_COPY_SOURCE, state); return &rb->rb; } diff --git a/tests/shader_runner_vulkan.c b/tests/shader_runner_vulkan.c index adb69a7c..19044126 100644 --- a/tests/shader_runner_vulkan.c +++ b/tests/shader_runner_vulkan.c @@ -943,8 +943,12 @@ static struct resource_readback *vulkan_runner_get_resource_readback(struct shad struct vulkan_resource *resource = vulkan_resource(res); VkDevice device = runner->device; VkBufferImageCopy region = {0}; + VkImageLayout layout; - assert(resource->r.type == RESOURCE_TYPE_RENDER_TARGET); + if (resource->r.type == RESOURCE_TYPE_RENDER_TARGET) + layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; + else + layout = VK_IMAGE_LAYOUT_GENERAL; rb->rb.width = resource->r.width; rb->rb.height = resource->r.height; @@ -957,8 +961,7 @@ static struct resource_readback *vulkan_runner_get_resource_readback(struct shad begin_command_buffer(runner); - transition_image_layout(runner, resource->image, - VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL); + transition_image_layout(runner, resource->image, layout, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL); region.imageSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; region.imageSubresource.layerCount = 1; @@ -969,8 +972,7 @@ static struct resource_readback *vulkan_runner_get_resource_readback(struct shad VK_CALL(vkCmdCopyImageToBuffer(runner->cmd_buffer, resource->image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, rb->buffer, 1, &region)); - transition_image_layout(runner, resource->image, - VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL); + transition_image_layout(runner, resource->image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, layout); end_command_buffer(runner); diff --git a/tests/uav.shader_test b/tests/uav.shader_test new file mode 100644 index 00000000..09ca05ec --- /dev/null +++ b/tests/uav.shader_test @@ -0,0 +1,56 @@ +[require] +shader model >= 5.0 + +[pixel shader fail] +RWTexture2D<float4> u; + +float4 main() : sv_target +{ + /* All four components must be written in a single statement. */ + u[uint2(0, 0)].xy = float4(1, 2); + u[uint2(0, 0)].zw = float4(3, 4); + return 0; +} + +[pixel shader fail] +Texture2D<float4> u; + +float4 main() : sv_target +{ + /* SRVs are not writable. */ + u[uint2(0, 0)].xyzw = float4(1, 2, 3, 4); + return 0; +} + +[uav 1] +format r32 float +size (2, 2) + +0.1 0.2 +0.3 0.4 + +[uav 2] +size (1, 1) + +0.5 0.6 0.7 0.8 + +[pixel shader] +RWTexture2D<float> u; +RWTexture2D<float4> v; + +float4 main() : sv_target +{ + u[uint2(0, 0)] = 0.5; + u[uint2(0, 1)].x = 0.6; + u[uint2(1, 1)] = 0.7; + v[uint2(0, 0)].yxwz = float4(1, 2, 3, 4); + return 0; +} + +[test] +todo draw quad +probe uav 1 (0, 0) r (0.5) +probe uav 1 (0, 1) r (0.6) +probe uav 1 (1, 0) r (0.2) +probe uav 1 (1, 1) r (0.7) +probe uav 2 (0, 0) rgba (2.0, 1.0, 4.0, 3.0)

1 0

Zebediah Figura : tests: Add a test for multiple render targets.
by Alexandre Julliard 09 Jun '22

09 Jun '22

Module: vkd3d Branch: master Commit: f821a1b29a1f07c4e82e7fbcbb40645b18f6ed31 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f821a1b29a1f07c4e82e7fb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jun 8 18:18:39 2022 -0500 tests: Add a test for multiple render targets. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 + tests/multiple-rt.shader_test | 19 +++++++++++++++++++ tests/shader_runner.c | 26 ++++++++++++++++++++++++-- 3 files changed, 44 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 400dc8aa..6e827175 100644 --- a/Makefile.am +++ b/Makefile.am @@ -108,6 +108,7 @@ vkd3d_shader_tests = \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/logic-operations.shader_test \ tests/math.shader_test \ + tests/multiple-rt.shader_test \ tests/nointerpolation.shader_test \ tests/pow.shader_test \ tests/preproc-if.shader_test \ diff --git a/tests/multiple-rt.shader_test b/tests/multiple-rt.shader_test new file mode 100644 index 00000000..59e4acbb --- /dev/null +++ b/tests/multiple-rt.shader_test @@ -0,0 +1,19 @@ +[render target 0] +format r32g32b32a32 float +size (640, 480) + +[render target 1] +format r32g32b32a32 float +size (640, 480) + +[pixel shader] +void main(out float4 o0 : sv_target0, out float4 o1 : sv_target1) +{ + o0 = float4(0.1, 0.2, 0.3, 0.4); + o1 = float4(0.5, 0.6, 0.7, 0.8); +} + +[test] +draw quad +probe render target 0 all rgba (0.1, 0.2, 0.3, 0.4) +probe render target 1 all rgba (0.5, 0.6, 0.7, 0.8) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index e2dc2dda..25986b31 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -468,7 +468,7 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) } else if (match_string(line, "probe", &line)) { - unsigned int left, top, right, bottom, ulps; + unsigned int left, top, right, bottom, ulps, slot; struct resource_readback *rb; struct resource *resource; int ret, len; @@ -479,7 +479,7 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) if (match_string(line, "uav", &line)) { - unsigned int slot = strtoul(line, &rest, 10); + slot = strtoul(line, &rest, 10); if (rest == line) fatal_error("Malformed UAV index '%s'.\n", line); @@ -487,6 +487,16 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) resource = get_resource(runner, RESOURCE_TYPE_UAV, slot); } + else if (match_string(line, "render target", &line)) + { + slot = strtoul(line, &rest, 10); + + if (rest == line) + fatal_error("Malformed render target index '%s'.\n", line); + line = rest; + + resource = get_resource(runner, RESOURCE_TYPE_RENDER_TARGET, slot); + } else { resource = get_resource(runner, RESOURCE_TYPE_RENDER_TARGET, 0); @@ -836,6 +846,18 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const current_sampler->v_address = D3D12_TEXTURE_ADDRESS_MODE_CLAMP; current_sampler->w_address = D3D12_TEXTURE_ADDRESS_MODE_CLAMP; } + else if (sscanf(line, "[render target %u]\n", &index)) + { + state = STATE_RESOURCE; + + memset(&current_resource, 0, sizeof(current_resource)); + + current_resource.slot = index; + current_resource.type = RESOURCE_TYPE_RENDER_TARGET; + current_resource.format = DXGI_FORMAT_R32G32B32A32_FLOAT; + current_resource.data_type = TEXTURE_DATA_FLOAT; + current_resource.texel_size = 16; + } else if (sscanf(line, "[texture %u]\n", &index)) { state = STATE_RESOURCE;

1 0