January 2022 - Wine-commits

Zebediah Figura : server: Set the event in IOCTL_AFD_EVENT_SELECT if the socket becomes signaled.
by Alexandre Julliard 07 Jan '22

07 Jan '22

Module: wine Branch: master Commit: 9632048c689801abb7482111773c7714e0f1581a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9632048c689801abb7482111… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 5 19:03:04 2022 -0600 server: Set the event in IOCTL_AFD_EVENT_SELECT if the socket becomes signaled. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52335 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 5 ++--- server/sock.c | 5 +++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index aa95e2a3dfa..782b1e59729 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5159,9 +5159,8 @@ static void test_accept_events(struct event_test_ctx *ctx) select_events(ctx, listener, FD_CONNECT | FD_READ | FD_OOB | FD_ACCEPT); ret = WaitForSingleObject(ctx->event, 0); - todo_wine ok(!ret, "wait timed out\n"); - if (!ret) - check_events(ctx, FD_ACCEPT, 0, 0); + ok(!ret, "wait timed out\n"); + check_events(ctx, FD_ACCEPT, 0, 0); server = accept(listener, NULL, NULL); ok(server != -1, "failed to accept, error %u\n", WSAGetLastError()); diff --git a/server/sock.c b/server/sock.c index 736f34feac5..c7378306511 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2543,6 +2543,11 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) sock->nonblocking = 1; sock_reselect( sock ); + /* Explicitly wake the socket up if the mask causes it to become + * signaled. Note that reselecting isn't enough, since we might already + * have had events recorded in sock->reported_events and we don't want + * to select for them again. */ + sock_wake_up( sock ); return; }

1 0

Zebediah Figura : ws2_32: Trace the address bound to in bind().
by Alexandre Julliard 07 Jan '22

07 Jan '22

Module: wine Branch: master Commit: 575e632d08a845629c477dbdc9d4332d24a2a19d URL: https://source.winehq.org/git/wine.git/?a=commit;h=575e632d08a845629c477dbd… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 5 19:03:23 2022 -0600 ws2_32: Trace the address bound to in bind(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 6bad74e3c8d..0f12a8b8d4a 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1143,6 +1143,8 @@ int WINAPI bind( SOCKET s, const struct sockaddr *addr, int len ) status = io.u.Status; } + if (!status) TRACE( "successfully bound to address %s\n", debugstr_sockaddr( ret_addr )); + free( params ); free( ret_addr );

1 0

Rémi Bernon : dinput: Wait for the internal thread with a timeout.
by Alexandre Julliard 07 Jan '22

07 Jan '22

Module: wine Branch: master Commit: 7e5eeecdfb5c90042945d9e84a3a9f8b2ed0036a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e5eeecdfb5c90042945d9e8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jan 6 10:51:47 2022 +0100 dinput: Wait for the internal thread with a timeout. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52263 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index a62d4d2ea3d..8347e3aa586 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1379,7 +1379,8 @@ static void dinput_thread_start(void) static void dinput_thread_stop(void) { PostThreadMessageW( dinput_thread_id, WM_USER + 0x10, 0, 0 ); - WaitForSingleObject( dinput_thread, INFINITE ); + if (WaitForSingleObject( dinput_thread, 500 ) == WAIT_TIMEOUT) + WARN("Timeout while waiting for internal thread\n"); CloseHandle( dinput_thread ); }

1 0

Zhiyi Zhang : user32/tests: Test selecting DDBs of different depth into display compatible DCs.
by Alexandre Julliard 07 Jan '22

07 Jan '22

Module: wine Branch: master Commit: bd0603b19d99e0a74517a97d9165ec4e1d06aca2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd0603b19d99e0a74517a97d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Dec 29 15:32:42 2021 +0800 user32/tests: Test selecting DDBs of different depth into display compatible DCs. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 110 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 107 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index bd348576726..e745fb9c7b3 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -2180,13 +2180,17 @@ static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_ static void test_display_dc(void) { + static const INT bpps[] = {1, 4, 8, 16, 24, 32}; + HBITMAP hbitmap, old_hbitmap; + INT count, old_count, i, bpp; DWORD device_idx, mode_idx; DEVMODEA dm, dm2, dm3; - INT count, old_count; DISPLAY_DEVICEA dd; + HDC hdc, mem_dc; + DIBSECTION dib; + BITMAP bitmap; BOOL ret; LONG res; - HDC hdc; /* Test DCs covering the entire virtual screen */ hdc = CreateDCA("DISPLAY", NULL, NULL, NULL); @@ -2199,6 +2203,51 @@ static void test_display_dc(void) check_display_dc(hdc, &dm, FALSE); + /* Test that CreateCompatibleBitmap() for display DCs creates DDBs */ + hbitmap = CreateCompatibleBitmap(hdc, dm.dmPelsWidth, dm.dmPelsHeight); + ok(!!hbitmap, "CreateCompatibleBitmap failed, error %d.\n", GetLastError()); + count = GetObjectW(hbitmap, sizeof(dib), &dib); + ok(count == sizeof(BITMAP), "GetObject failed, count %d.\n", count); + count = GetObjectW(hbitmap, sizeof(bitmap), &bitmap); + ok(count == sizeof(BITMAP), "GetObject failed, count %d.\n", count); + ok(bitmap.bmBitsPixel == dm.dmBitsPerPel, "Expected %d, got %d.\n", dm.dmBitsPerPel, + bitmap.bmBitsPixel); + DeleteObject(hbitmap); + + /* Test selecting a DDB of a different depth into a display compatible DC */ + for (i = 0; i < ARRAY_SIZE(bpps); ++i) + { + winetest_push_context("bpp %d", bpps[i]); + + mem_dc = CreateCompatibleDC(hdc); + hbitmap = CreateBitmap(dm.dmPelsWidth, dm.dmPelsHeight, 1, bpps[i], NULL); + ok(!!hbitmap, "CreateBitmap failed, error %d.\n", GetLastError()); + old_hbitmap = SelectObject(mem_dc, hbitmap); + if (bpps[i] != 1 && bpps[i] != 32) + ok(!old_hbitmap, "Selecting bitmap succeeded.\n"); + else + ok(!!old_hbitmap, "Failed to select bitmap.\n"); + + SelectObject(mem_dc, old_hbitmap); + DeleteObject(hbitmap); + DeleteDC(mem_dc); + + winetest_pop_context(); + } + + /* Test selecting a DDB of the same color depth into a display compatible DC */ + mem_dc = CreateCompatibleDC(hdc); + bpp = GetDeviceCaps(mem_dc, BITSPIXEL); + ok(bpp == dm.dmBitsPerPel, "Expected bpp %d, got %d.\n", dm.dmBitsPerPel, bpp); + hbitmap = CreateCompatibleBitmap(hdc, dm.dmPelsWidth, dm.dmPelsHeight); + count = GetObjectW(hbitmap, sizeof(bitmap), &bitmap); + ok(count == sizeof(BITMAP), "GetObject failed, count %d.\n", count); + ok(bitmap.bmBitsPixel == dm.dmBitsPerPel, "Expected %d, got %d.\n", dm.dmBitsPerPel, bitmap.bmBitsPixel); + old_hbitmap = SelectObject(mem_dc, hbitmap); + ok(!!old_hbitmap, "Failed to select bitmap.\n"); + SelectObject(mem_dc, old_hbitmap); + DeleteDC(mem_dc); + /* Tests after mode changes to a different resolution */ memset(&dm2, 0, sizeof(dm2)); dm2.dmSize = sizeof(dm2); @@ -2226,7 +2275,7 @@ static void test_display_dc(void) dm2.dmSize = sizeof(dm2); for (mode_idx = 0; EnumDisplaySettingsA(NULL, mode_idx, &dm2); ++mode_idx) { - if (dm2.dmBitsPerPel != dm.dmBitsPerPel) + if (dm2.dmBitsPerPel != dm.dmBitsPerPel && dm2.dmBitsPerPel != 1) break; } if (dm2.dmBitsPerPel && dm2.dmBitsPerPel != dm.dmBitsPerPel) @@ -2239,6 +2288,59 @@ static void test_display_dc(void) { check_display_dc(hdc, &dm2, FALSE); + /* Test selecting a compatible bitmap of a different color depth previously created for + * a display DC into a new compatible DC */ + count = GetObjectW(hbitmap, sizeof(bitmap), &bitmap); + ok(count == sizeof(BITMAP), "GetObject failed, count %d.\n", count); + ok(bitmap.bmBitsPixel == dm.dmBitsPerPel, "Expected %d, got %d.\n", dm.dmBitsPerPel, + bitmap.bmBitsPixel); + + /* Note that hbitmap is of a different color depth and it can be successfully selected + * into the new compatible DC */ + mem_dc = CreateCompatibleDC(hdc); + bpp = GetDeviceCaps(mem_dc, BITSPIXEL); + ok(bpp == dm2.dmBitsPerPel, "Expected bpp %d, got %d.\n", dm2.dmBitsPerPel, bpp); + old_hbitmap = SelectObject(mem_dc, hbitmap); + todo_wine + ok(!!old_hbitmap, "Failed to select bitmap.\n"); + bpp = GetDeviceCaps(mem_dc, BITSPIXEL); + ok(bpp == dm2.dmBitsPerPel, "Expected bpp %d, got %d.\n", dm2.dmBitsPerPel, bpp); + SelectObject(mem_dc, old_hbitmap); + DeleteDC(mem_dc); + DeleteObject(hbitmap); + + /* Test selecting a DDB of a different color depth into a display compatible DC */ + for (i = 0; i < ARRAY_SIZE(bpps); ++i) + { + winetest_push_context("bpp %d", bpps[i]); + + mem_dc = CreateCompatibleDC(hdc); + hbitmap = CreateBitmap(dm2.dmPelsWidth, dm2.dmPelsHeight, 1, bpps[i], NULL); + ok(!!hbitmap, "CreateBitmap failed, error %d.\n", GetLastError()); + old_hbitmap = SelectObject(mem_dc, hbitmap); + /* On Win7 dual-QXL test bot and XP, only 1-bit DDBs and DDBs with the same color + * depth can be selected to the compatible DC. On newer versions of Windows, only + * 1-bit and 32-bit DDBs can be selected into the compatible DC even if + * GetDeviceCaps(BITSPIXEL) reports a different color depth, for example, 16-bit. + * It's most likely due to the fact that lower color depth are emulated on newer + * versions of Windows as the real color depth is still 32-bit */ + if (bpps[i] != 1 && bpps[i] != 32) + todo_wine_if(bpps[i] == dm2.dmBitsPerPel) + ok(!old_hbitmap || broken(!!old_hbitmap) /* Win7 dual-QXL test bot and XP */, + "Selecting bitmap succeeded.\n"); + else + todo_wine_if(bpps[i] == 32) + ok(!!old_hbitmap || broken(!old_hbitmap) /* Win7 dual-QXL test bot and XP */, + "Failed to select bitmap.\n"); + + SelectObject(mem_dc, old_hbitmap); + DeleteObject(hbitmap); + DeleteDC(mem_dc); + + winetest_pop_context(); + } + hbitmap = NULL; + res = ChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA returned unexpected %d.\n", res); } @@ -2248,6 +2350,8 @@ static void test_display_dc(void) win_skip("Failed to find a different color depth other than %u.\n", dm.dmBitsPerPel); } + if (hbitmap) + DeleteObject(hbitmap); DeleteDC(hdc); /* Test DCs covering a specific monitor */

1 0

Zhiyi Zhang : win32u: Allow selecting 32-bit DDBs into display compatible DCs.
by Alexandre Julliard 07 Jan '22

07 Jan '22

Module: wine Branch: master Commit: 60faf44ed10afde29f0ccd085b89c52621e5256c URL: https://source.winehq.org/git/wine.git/?a=commit;h=60faf44ed10afde29f0ccd08… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Dec 29 15:32:52 2021 +0800 win32u: Allow selecting 32-bit DDBs into display compatible DCs. Device context bit depths other than 32-bit are emulated and the real bit depth for display DCs is still 32-bit. Thus, a 32-bit DDB should be allowed to be selected into a display compatible DC even if the DC reports a different bit depth. Fix a regression from d171d11. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51805 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 2 -- dlls/win32u/bitmap.c | 4 +++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index e745fb9c7b3..a857b295849 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -2301,7 +2301,6 @@ static void test_display_dc(void) bpp = GetDeviceCaps(mem_dc, BITSPIXEL); ok(bpp == dm2.dmBitsPerPel, "Expected bpp %d, got %d.\n", dm2.dmBitsPerPel, bpp); old_hbitmap = SelectObject(mem_dc, hbitmap); - todo_wine ok(!!old_hbitmap, "Failed to select bitmap.\n"); bpp = GetDeviceCaps(mem_dc, BITSPIXEL); ok(bpp == dm2.dmBitsPerPel, "Expected bpp %d, got %d.\n", dm2.dmBitsPerPel, bpp); @@ -2329,7 +2328,6 @@ static void test_display_dc(void) ok(!old_hbitmap || broken(!!old_hbitmap) /* Win7 dual-QXL test bot and XP */, "Selecting bitmap succeeded.\n"); else - todo_wine_if(bpps[i] == 32) ok(!!old_hbitmap || broken(!old_hbitmap) /* Win7 dual-QXL test bot and XP */, "Failed to select bitmap.\n"); diff --git a/dlls/win32u/bitmap.c b/dlls/win32u/bitmap.c index 00c8b347af5..2be88715948 100644 --- a/dlls/win32u/bitmap.c +++ b/dlls/win32u/bitmap.c @@ -401,7 +401,9 @@ HGDIOBJ WINAPI NtGdiSelectBitmap( HDC hdc, HGDIOBJ handle ) if (!is_bitmapobj_dib( bitmap ) && bitmap->dib.dsBm.bmBitsPixel != 1 && - bitmap->dib.dsBm.bmBitsPixel != NtGdiGetDeviceCaps( hdc, BITSPIXEL )) + bitmap->dib.dsBm.bmBitsPixel != NtGdiGetDeviceCaps( hdc, BITSPIXEL ) && + /* Display compatible DCs should accept 32-bit DDBs because other color depths are emulated */ + !(NtGdiGetDeviceCaps( hdc, TECHNOLOGY ) == DT_RASDISPLAY && bitmap->dib.dsBm.bmBitsPixel == 32)) { WARN( "Wrong format bitmap %u bpp\n", bitmap->dib.dsBm.bmBitsPixel ); GDI_ReleaseObj( handle );

1 0

Nikolay Sivov : tests: Fix shader tests crashes on WARP driver.
by Alexandre Julliard 07 Jan '22

07 Jan '22

Module: vkd3d Branch: master Commit: 3a480415c1dd863756dbd391ad3348bff34c771a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3a480415c1dd863756dbd39… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 19 15:41:06 2021 +0300 tests: Fix shader tests crashes on WARP driver. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12_test_utils.h | 13 +++++++++++++ tests/shader_runner_d3d12.c | 7 ++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index 5d900f8..f2ce922 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -956,6 +956,8 @@ struct test_context ID3D12CommandQueue *queue; ID3D12CommandAllocator *allocator; ID3D12GraphicsCommandList *list; + ID3D12PipelineState **pso; + size_t pso_count, pso_capacity; D3D12_RESOURCE_DESC render_target_desc; ID3D12Resource *render_target; @@ -1074,6 +1076,15 @@ static inline bool init_test_context_(unsigned int line, struct test_context *co return true; } +static inline void destroy_pipeline_state_objects(struct test_context *context) +{ + size_t i; + + for (i = 0; i < context->pso_count; ++i) + ID3D12PipelineState_Release(context->pso[i]); + context->pso_count = 0; +} + #define destroy_test_context(context) destroy_test_context_(__LINE__, context) static inline void destroy_test_context_(unsigned int line, struct test_context *context) { @@ -1092,6 +1103,8 @@ static inline void destroy_test_context_(unsigned int line, struct test_context ID3D12CommandAllocator_Release(context->allocator); ID3D12CommandQueue_Release(context->queue); ID3D12GraphicsCommandList_Release(context->list); + destroy_pipeline_state_objects(context); + free(context->pso); refcount = ID3D12Device_Release(context->device); ok_(line)(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index d404895..47f419b 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -419,10 +419,12 @@ static void parse_test_directive(struct shader_context *context, const char *lin hr = create_root_signature(context->c.device, &root_signature_desc, &context->c.root_signature); ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); - pso = create_pipeline_state(context->c.device, context->c.root_signature, - context->c.render_target_desc.Format, NULL, &ps, NULL); + pso = create_pipeline_state(context->c.device, context->c.root_signature, context->c.render_target_desc.Format, + NULL, &ps, NULL); if (!pso) return; + vkd3d_array_reserve((void **)&context->c.pso, &context->c.pso_capacity, context->c.pso_count + 1, sizeof(*context->c.pso)); + context->c.pso[context->c.pso_count++] = pso; ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context->c.root_signature); if (context->uniform_count) @@ -439,7 +441,6 @@ static void parse_test_directive(struct shader_context *context, const char *lin ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context->c.rtv, clear_color, 0, NULL); ID3D12GraphicsCommandList_SetPipelineState(command_list, pso); ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); - ID3D12PipelineState_Release(pso); transition_resource_state(command_list, context->c.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); }

1 0

Zebediah Figura : vkd3d-shader: Add tiled resource opcode definitions.
by Alexandre Julliard 07 Jan '22

07 Jan '22

Module: vkd3d Branch: master Commit: 6b34fc671afbcd9e896637a04945949103099efa URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6b34fc671afbcd9e896637a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Dec 25 16:41:24 2021 -0600 vkd3d-shader: Add tiled resource opcode definitions. 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> --- libs/vkd3d-shader/sm4.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/libs/vkd3d-shader/sm4.h b/libs/vkd3d-shader/sm4.h index f6b4b61..62bb4d1 100644 --- a/libs/vkd3d-shader/sm4.h +++ b/libs/vkd3d-shader/sm4.h @@ -354,6 +354,22 @@ enum vkd3d_sm4_opcode VKD3D_SM5_OP_DTOU = 0xd7, VKD3D_SM5_OP_ITOD = 0xd8, VKD3D_SM5_OP_UTOD = 0xd9, + VKD3D_SM5_OP_GATHER4_S = 0xdb, + VKD3D_SM5_OP_GATHER4_C_S = 0xdc, + VKD3D_SM5_OP_GATHER4_PO_S = 0xdd, + VKD3D_SM5_OP_GATHER4_PO_C_S = 0xde, + VKD3D_SM5_OP_LD_S = 0xdf, + VKD3D_SM5_OP_LD2DMS_S = 0xe0, + VKD3D_SM5_OP_LD_UAV_TYPED_S = 0xe1, + VKD3D_SM5_OP_LD_RAW_S = 0xe2, + VKD3D_SM5_OP_LD_STRUCTURED_S = 0xe3, + VKD3D_SM5_OP_SAMPLE_LOD_S = 0xe4, + VKD3D_SM5_OP_SAMPLE_C_LZ_S = 0xe5, + VKD3D_SM5_OP_SAMPLE_CL_S = 0xe6, + VKD3D_SM5_OP_SAMPLE_B_CL_S = 0xe7, + VKD3D_SM5_OP_SAMPLE_GRAD_CL_S = 0xe8, + VKD3D_SM5_OP_SAMPLE_C_CL_S = 0xe9, + VKD3D_SM5_OP_CHECK_ACCESS_FULLY_MAPPED = 0xea, }; enum vkd3d_sm4_instruction_modifier

1 0

Zebediah Figura : vkd3d-compiler: Print usage instructions only if --help is specified.
by Alexandre Julliard 07 Jan '22

07 Jan '22

Module: vkd3d Branch: master Commit: 1e2bcb04581506892f5b1c5c7687f1aac58b6467 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1e2bcb04581506892f5b1c5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Dec 25 22:43:12 2021 -0600 vkd3d-compiler: Print usage instructions only if --help is specified. vkd3d-compiler is hardly the only program to print usage instructions on all invalid invocations, but it's rather annoying to have one's whole screen wiped due to a typo. It also makes it hard to notice the actual error messages printed on e.g. `vkd3d-compiler -x`. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 4d7d628..4e56e8f 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -209,6 +209,7 @@ struct options enum vkd3d_shader_source_type source_type; enum vkd3d_shader_target_type target_type; bool preprocess_only; + bool print_help; bool print_version; bool print_source_types; bool print_target_types; @@ -446,6 +447,11 @@ static bool parse_command_line(int argc, char **argv, struct options *options) options->preprocess_only = true; break; + case 'h': + case OPTION_HELP: + options->print_help = true; + return true; + case OPTION_OUTPUT: case 'o': options->output_filename = optarg; @@ -623,9 +629,12 @@ int main(int argc, char **argv) int ret; if (!parse_command_line(argc, argv, &options)) + return 1; + + if (options.print_help) { print_usage(argv[0]); - return 1; + return 0; } if (options.print_version)

1 0

Zebediah Figura : vkd3d-compiler: Move some argument validation out of parse_command_line().
by Alexandre Julliard 07 Jan '22

07 Jan '22

Module: vkd3d Branch: master Commit: 47ea863535448fe23340a34f2563783a7cf405a7 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=47ea863535448fe23340a34… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Dec 25 22:43:13 2021 -0600 vkd3d-compiler: Move some argument validation out of parse_command_line(). 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> --- programs/vkd3d-compiler/main.c | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 4e56e8f..5607c29 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -502,23 +502,6 @@ static bool parse_command_line(int argc, char **argv, struct options *options) if (options->target_type == VKD3D_SHADER_TARGET_NONE && !options->preprocess_only) options->target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY; - if (options->print_target_types) - return true; - - if (!options->preprocess_only && !validate_target_type(options->source_type, options->target_type)) - { - fprintf(stderr, "Target type '%s' is invalid for source type '%s'.\n", - get_target_type_info(options->target_type)->name, - get_source_type_info(options->source_type)->name); - return false; - } - - if (!options->preprocess_only && options->source_type == VKD3D_SHADER_SOURCE_HLSL && !options->profile) - { - fprintf(stderr, "You need to specify a profile when compiling from HLSL source.\n"); - return false; - } - if (optind < argc) options->filename = argv[argc - 1]; @@ -657,6 +640,20 @@ int main(int argc, char **argv) return 0; } + if (!options.preprocess_only && !validate_target_type(options.source_type, options.target_type)) + { + fprintf(stderr, "Target type '%s' is invalid for source type '%s'.\n", + get_target_type_info(options.target_type)->name, + get_source_type_info(options.source_type)->name); + return 0; + } + + if (!options.preprocess_only && options.source_type == VKD3D_SHADER_SOURCE_HLSL && !options.profile) + { + fprintf(stderr, "You need to specify a profile when compiling from HLSL source.\n"); + return 0; + } + if (!(input = open_input(options.filename, &close_input))) goto done;

1 0

Zebediah Figura : vkd3d-compiler: Try to detect the source type by inspecting the file.
by Alexandre Julliard 07 Jan '22

07 Jan '22

Module: vkd3d Branch: master Commit: 9fef9fe2bccd79f4806f42442883df51bba4a0f3 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9fef9fe2bccd79f4806f424… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Dec 25 22:43:14 2021 -0600 vkd3d-compiler: Try to detect the source type by inspecting the file. 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> --- programs/vkd3d-compiler/main.c | 76 ++++++++++++++++++++++++++++++------------ 1 file changed, 54 insertions(+), 22 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 5607c29..8ea3c13 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -20,6 +20,7 @@ #ifndef _GNU_SOURCE #define _GNU_SOURCE #endif +#include <assert.h> #include <fcntl.h> #include <stdio.h> #include <stdlib.h> @@ -49,26 +50,32 @@ enum OPTION_TEXT_FORMATTING, }; +#define MAKE_TAG(ch0, ch1, ch2, ch3) \ + ((DWORD)(ch0) | ((DWORD)(ch1) << 8) | \ + ((DWORD)(ch2) << 16) | ((DWORD)(ch3) << 24 )) +#define TAG_DXBC MAKE_TAG('D', 'X', 'B', 'C') + static const struct source_type_info { enum vkd3d_shader_source_type type; const char *name; const char *description; bool is_binary; + enum vkd3d_shader_target_type default_target_type; } source_type_info[] = { {VKD3D_SHADER_SOURCE_DXBC_TPF, "dxbc-tpf", "A 'Tokenized Program Format' shader embedded in a DXBC container.\n" " This is the format used for Direct3D shader model 4 and 5 shaders.\n", - true}, + true, VKD3D_SHADER_TARGET_SPIRV_BINARY}, {VKD3D_SHADER_SOURCE_HLSL, "hlsl", "High Level Shader Language source code.\n", - false}, + false, VKD3D_SHADER_TARGET_DXBC_TPF}, {VKD3D_SHADER_SOURCE_D3D_BYTECODE, "d3dbc", "Legacy Direct3D byte-code.\n" " This is the format used for Direct3D shader model 1, 2, and 3 shaders.\n", - true}, + true, VKD3D_SHADER_TARGET_SPIRV_BINARY}, }; static const struct target_type_info @@ -166,8 +173,8 @@ static void print_usage(const char *program_name) "Options:\n" " -h, --help Display this information and exit.\n" " -b <type> Specify the target type. Use --print-target-types to\n" - " list valid target types for a given source type. The\n" - " default target type is 'spirv-binary'.\n" + " list the valid and default target types for a given\n" + " source type.\n" " --buffer-uav=<type> Specify the buffer type to use for buffer UAV bindings.\n" " Valid values are 'buffer-texture' (default) and\n" " 'storage-buffer'.\n" @@ -189,8 +196,7 @@ static void print_usage(const char *program_name) " -V, --version Display version information and exit.\n" " -x <type> Specify the type of the source. Use --print-source-types\n" " to list valid source types. The default source type is\n" - " 'dxbc-tpf' for compile operations, and 'hlsl' for\n" - " preprocess operations.\n" + " automatically detected from the input shader.\n" " -- Stop option processing. Any subsequent argument is\n" " interpreted as a filename.\n" "\n" @@ -497,11 +503,6 @@ static bool parse_command_line(int argc, char **argv, struct options *options) } } - if (options->source_type == VKD3D_SHADER_SOURCE_NONE) - options->source_type = options->preprocess_only ? VKD3D_SHADER_SOURCE_HLSL : VKD3D_SHADER_SOURCE_DXBC_TPF; - if (options->target_type == VKD3D_SHADER_TARGET_NONE && !options->preprocess_only) - options->target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY; - if (optind < argc) options->filename = argv[argc - 1]; @@ -526,8 +527,9 @@ static void print_source_types(void) static void print_target_types(enum vkd3d_shader_source_type source_type) { + const struct source_type_info *source_info = get_source_type_info(source_type); const enum vkd3d_shader_target_type *target_types; - const char *source_type_name = get_source_type_info(source_type)->name; + const char *source_type_name = source_info->name; unsigned int count, i; target_types = vkd3d_shader_get_supported_target_types(source_type, &count); @@ -538,6 +540,7 @@ static void print_target_types(enum vkd3d_shader_source_type source_type) if (type) fprintf(stdout, " %-12s %s", type->name, type->description); } + printf("The default target type is '%s'.\n", get_target_type_info(source_info->default_target_type)->name); } static FILE *open_input(const char *filename, bool *close) @@ -636,10 +639,48 @@ int main(int argc, char **argv) if (options.print_target_types) { + if (options.source_type == VKD3D_SHADER_SOURCE_NONE) + { + fprintf(stderr, "--print-target-types requires an explicitly specified source type.\n"); + return 1; + } + print_target_types(options.source_type); return 0; } + if (!(input = open_input(options.filename, &close_input))) + goto done; + + if (!read_shader(&info.source, input)) + { + fprintf(stderr, "Failed to read input shader.\n"); + goto done; + } + + if (options.source_type == VKD3D_SHADER_SOURCE_NONE) + { + uint32_t token; + + if (options.preprocess_only) + { + options.source_type = VKD3D_SHADER_SOURCE_HLSL; + } + else if (info.source.size >= sizeof(token)) + { + memcpy(&token, info.source.code, sizeof(token)); + if (token == TAG_DXBC) + options.source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; + else if ((token & 0xfffe0000) == 0xfffe0000) + options.source_type = VKD3D_SHADER_SOURCE_D3D_BYTECODE; + else + options.source_type = VKD3D_SHADER_SOURCE_HLSL; + } + } + + if (options.target_type == VKD3D_SHADER_TARGET_NONE && !options.preprocess_only) + options.target_type = get_source_type_info(options.source_type)->default_target_type; + if (!options.preprocess_only && !validate_target_type(options.source_type, options.target_type)) { fprintf(stderr, "Target type '%s' is invalid for source type '%s'.\n", @@ -654,9 +695,6 @@ int main(int argc, char **argv) return 0; } - if (!(input = open_input(options.filename, &close_input))) - goto done; - if (!options.filename && get_source_type_info(options.source_type)->is_binary && isatty(fileno(input))) { fprintf(stderr, "Input is a tty and input format is binary, exiting.\n" @@ -706,12 +744,6 @@ int main(int argc, char **argv) spirv_target_info.entry_point = options.entry_point; spirv_target_info.environment = VKD3D_SHADER_SPIRV_ENVIRONMENT_VULKAN_1_0; - if (!read_shader(&info.source, input)) - { - fprintf(stderr, "Failed to read input shader.\n"); - goto done; - } - if (options.preprocess_only) ret = vkd3d_shader_preprocess(&info, &output_code, &messages); else

1 0