November 2023 - Wine-commits

Alexandros Frantzis : winewayland.drv: Prepare to handle different coordinate spaces.
by Alexandre Julliard 14 Nov '23

14 Nov '23

Module: wine Branch: master Commit: 13578d60455b9200e9498172d96997cbd2ef2645 URL: https://gitlab.winehq.org/wine/wine/-/commit/13578d60455b9200e9498172d96997… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Tue Oct 24 15:40:00 2023 +0300 winewayland.drv: Prepare to handle different coordinate spaces. Introduce and use functions to convert between the window logical and Wayland surface coordinate spaces. At the moment the two are the same but this will change with the introduction of scaling support. --- dlls/winewayland.drv/wayland_pointer.c | 36 ++++++++++++++++-------- dlls/winewayland.drv/wayland_surface.c | 51 +++++++++++++++++++++++++++------- dlls/winewayland.drv/waylanddrv.h | 6 ++++ dlls/winewayland.drv/window.c | 22 ++++++++++----- 4 files changed, 86 insertions(+), 29 deletions(-)

1 0

Alexandros Frantzis : winewayland.drv: Present surfaces with the correct scale.
by Alexandre Julliard 14 Nov '23

14 Nov '23

Module: wine Branch: master Commit: 66ad0d0a45d3ac40235c009da76dc90c16eff2b8 URL: https://gitlab.winehq.org/wine/wine/-/commit/66ad0d0a45d3ac40235c009da76dc9… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Wed Sep 13 09:07:04 2023 +0300 winewayland.drv: Present surfaces with the correct scale. Take into account the window scale factor and use wp_viewport to instruct the compositor to present surfaces at that scale. --- dlls/winewayland.drv/Makefile.in | 1 + dlls/winewayland.drv/viewporter.xml | 180 +++++++++++++++++++++++++++++++++ dlls/winewayland.drv/wayland.c | 5 + dlls/winewayland.drv/wayland_surface.c | 43 +++++++- dlls/winewayland.drv/waylanddrv.h | 5 + dlls/winewayland.drv/window.c | 1 + 6 files changed, 231 insertions(+), 4 deletions(-)

1 0

Alexandros Frantzis : winewayland.drv: Refactor cursor code to prepare for scaling support.
by Alexandre Julliard 14 Nov '23

14 Nov '23

Module: wine Branch: master Commit: 80f3e7ecc0bf166c1bf68f8d7f39d890de08db4a URL: https://gitlab.winehq.org/wine/wine/-/commit/80f3e7ecc0bf166c1bf68f8d7f39d8… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Thu Oct 26 14:23:22 2023 +0300 winewayland.drv: Refactor cursor code to prepare for scaling support. --- dlls/winewayland.drv/wayland_pointer.c | 49 ++++++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 14 deletions(-) diff --git a/dlls/winewayland.drv/wayland_pointer.c b/dlls/winewayland.drv/wayland_pointer.c index 025793c15d6..0951c0952e7 100644 --- a/dlls/winewayland.drv/wayland_pointer.c +++ b/dlls/winewayland.drv/wayland_pointer.c @@ -90,6 +90,8 @@ static void pointer_handle_motion(void *data, struct wl_pointer *wl_pointer, __wine_send_input(hwnd, &input, NULL); } +static void wayland_set_cursor(HWND hwnd, HCURSOR hcursor, BOOL use_hcursor); + static void pointer_handle_enter(void *data, struct wl_pointer *wl_pointer, uint32_t serial, struct wl_surface *wl_surface, wl_fixed_t sx, wl_fixed_t sy) @@ -107,14 +109,11 @@ static void pointer_handle_enter(void *data, struct wl_pointer *wl_pointer, pthread_mutex_lock(&pointer->mutex); pointer->focused_hwnd = hwnd; pointer->enter_serial = serial; + pthread_mutex_unlock(&pointer->mutex); + /* The cursor is undefined at every enter, so we set it again with * the latest information we have. */ - wl_pointer_set_cursor(pointer->wl_pointer, - pointer->enter_serial, - pointer->cursor.wl_surface, - pointer->cursor.hotspot_x, - pointer->cursor.hotspot_y); - pthread_mutex_unlock(&pointer->mutex); + wayland_set_cursor(hwnd, NULL, FALSE); /* Handle the enter as a motion, to account for cases where the * window first appears beneath the pointer and won't get a separate @@ -418,7 +417,7 @@ static BOOL get_icon_info(HICON handle, ICONINFOEXW *ret) return TRUE; } -static void wayland_pointer_update_cursor(HCURSOR hcursor) +static void wayland_pointer_update_cursor_buffer(HCURSOR hcursor) { struct wayland_cursor *cursor = &process_wayland.pointer.cursor; ICONINFOEXW info = {0}; @@ -470,6 +469,22 @@ static void wayland_pointer_update_cursor(HCURSOR hcursor) cursor->hotspot_y = cursor->shm_buffer->height / 2; } + return; + +clear_cursor: + if (cursor->shm_buffer) + { + wayland_shm_buffer_unref(cursor->shm_buffer); + cursor->shm_buffer = NULL; + } +} + +static void wayland_pointer_update_cursor_surface(void) +{ + struct wayland_cursor *cursor = &process_wayland.pointer.cursor; + + if (!cursor->shm_buffer) goto clear_cursor; + if (!cursor->wl_surface) { cursor->wl_surface = @@ -504,19 +519,15 @@ clear_cursor: } } -/*********************************************************************** - * WAYLAND_SetCursor - */ -void WAYLAND_SetCursor(HWND hwnd, HCURSOR hcursor) +static void wayland_set_cursor(HWND hwnd, HCURSOR hcursor, BOOL use_hcursor) { struct wayland_pointer *pointer = &process_wayland.pointer; - TRACE("hwnd=%p hcursor=%p\n", hwnd, hcursor); - pthread_mutex_lock(&pointer->mutex); if (pointer->focused_hwnd == hwnd) { - wayland_pointer_update_cursor(hcursor); + if (use_hcursor) wayland_pointer_update_cursor_buffer(hcursor); + wayland_pointer_update_cursor_surface(); wl_pointer_set_cursor(pointer->wl_pointer, pointer->enter_serial, pointer->cursor.wl_surface, @@ -526,3 +537,13 @@ void WAYLAND_SetCursor(HWND hwnd, HCURSOR hcursor) } pthread_mutex_unlock(&pointer->mutex); } + +/*********************************************************************** + * WAYLAND_SetCursor + */ +void WAYLAND_SetCursor(HWND hwnd, HCURSOR hcursor) +{ + TRACE("hwnd=%p hcursor=%p\n", hwnd, hcursor); + + wayland_set_cursor(hwnd, hcursor, TRUE); +}

1 0

Alexandros Frantzis : winewayland.drv: Present cursors with the correct scale.
by Alexandre Julliard 14 Nov '23

14 Nov '23

Module: wine Branch: master Commit: 9ddd0a5cb6b4f8a6ac16ed9d2becd8de21d81161 URL: https://gitlab.winehq.org/wine/wine/-/commit/9ddd0a5cb6b4f8a6ac16ed9d2becd8… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Thu Oct 26 14:41:41 2023 +0300 winewayland.drv: Present cursors with the correct scale. Take into account the window scale factor and use wp_viewport to instruct the compositor to present cursors with that scale. --- dlls/winewayland.drv/wayland_pointer.c | 48 +++++++++++++++++++++++++++++++--- dlls/winewayland.drv/waylanddrv.h | 1 + 2 files changed, 45 insertions(+), 4 deletions(-) diff --git a/dlls/winewayland.drv/wayland_pointer.c b/dlls/winewayland.drv/wayland_pointer.c index 0951c0952e7..33fd14fa0c5 100644 --- a/dlls/winewayland.drv/wayland_pointer.c +++ b/dlls/winewayland.drv/wayland_pointer.c @@ -417,7 +417,7 @@ static BOOL get_icon_info(HICON handle, ICONINFOEXW *ret) return TRUE; } -static void wayland_pointer_update_cursor_buffer(HCURSOR hcursor) +static void wayland_pointer_update_cursor_buffer(HCURSOR hcursor, double scale) { struct wayland_cursor *cursor = &process_wayland.pointer.cursor; ICONINFOEXW info = {0}; @@ -469,6 +469,9 @@ static void wayland_pointer_update_cursor_buffer(HCURSOR hcursor) cursor->hotspot_y = cursor->shm_buffer->height / 2; } + cursor->hotspot_x = round(cursor->hotspot_x / scale); + cursor->hotspot_y = round(cursor->hotspot_y / scale); + return; clear_cursor: @@ -479,7 +482,7 @@ clear_cursor: } } -static void wayland_pointer_update_cursor_surface(void) +static void wayland_pointer_update_cursor_surface(double scale) { struct wayland_cursor *cursor = &process_wayland.pointer.cursor; @@ -496,12 +499,32 @@ static void wayland_pointer_update_cursor_surface(void) } } + if (!cursor->wp_viewport && process_wayland.wp_viewporter) + { + cursor->wp_viewport = + wp_viewporter_get_viewport(process_wayland.wp_viewporter, + cursor->wl_surface); + if (!cursor->wp_viewport) + WARN("Failed to create wp_viewport for cursor\n"); + } + /* Commit the cursor buffer to the cursor surface. */ wl_surface_attach(cursor->wl_surface, cursor->shm_buffer->wl_buffer, 0, 0); wl_surface_damage_buffer(cursor->wl_surface, 0, 0, cursor->shm_buffer->width, cursor->shm_buffer->height); + /* Setting only the viewport is enough, but some compositors don't + * support wp_viewport for cursor surfaces, so also set the buffer + * scale. Note that setting the viewport destination overrides + * the buffer scale, so it's fine to set both. */ + wl_surface_set_buffer_scale(cursor->wl_surface, round(scale)); + if (cursor->wp_viewport) + { + wp_viewport_set_destination(cursor->wp_viewport, + round(cursor->shm_buffer->width / scale), + round(cursor->shm_buffer->height / scale)); + } wl_surface_commit(cursor->wl_surface); return; @@ -512,6 +535,11 @@ clear_cursor: wayland_shm_buffer_unref(cursor->shm_buffer); cursor->shm_buffer = NULL; } + if (cursor->wp_viewport) + { + wp_viewport_destroy(cursor->wp_viewport); + cursor->wp_viewport = NULL; + } if (cursor->wl_surface) { wl_surface_destroy(cursor->wl_surface); @@ -522,12 +550,24 @@ clear_cursor: static void wayland_set_cursor(HWND hwnd, HCURSOR hcursor, BOOL use_hcursor) { struct wayland_pointer *pointer = &process_wayland.pointer; + struct wayland_surface *surface; + double scale; + + if ((surface = wayland_surface_lock_hwnd(hwnd))) + { + scale = surface->window.scale; + pthread_mutex_unlock(&surface->mutex); + } + else + { + scale = 1.0; + } pthread_mutex_lock(&pointer->mutex); if (pointer->focused_hwnd == hwnd) { - if (use_hcursor) wayland_pointer_update_cursor_buffer(hcursor); - wayland_pointer_update_cursor_surface(); + if (use_hcursor) wayland_pointer_update_cursor_buffer(hcursor, scale); + wayland_pointer_update_cursor_surface(scale); wl_pointer_set_cursor(pointer->wl_pointer, pointer->enter_serial, pointer->cursor.wl_surface, diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index dcc1ef3e57d..6bb30447f30 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -79,6 +79,7 @@ struct wayland_cursor { struct wayland_shm_buffer *shm_buffer; struct wl_surface *wl_surface; + struct wp_viewport *wp_viewport; int hotspot_x, hotspot_y; };

1 0

Alexandros Frantzis : winewayland.drv: Ignore spurious size hints.
by Alexandre Julliard 14 Nov '23

14 Nov '23

Module: wine Branch: master Commit: e0591fafae210c303ccecb9dd481946cf806a68c URL: https://gitlab.winehq.org/wine/wine/-/commit/e0591fafae210c303ccecb9dd48194… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Fri Oct 27 15:11:36 2023 +0300 winewayland.drv: Ignore spurious size hints. Due to the asynchronous nature of Wayland events, and the design of the xdg_toplevel protocol, an xdg configure event may be a reaction to a request in the application's configuration past, and the size hint may be out of date. For example: 1. The client commits a 100x100 buffer to a surface. 2.1 The compositor sends xdg configure(100x100, state=activated). 2.2 In the meantime, the client resizes and commits a 50x50 buffer. 3. The client receives the event from (2.1). If we respect the size hint, we will resize back to 100x100, although this was neither the client's nor the compositor's intention. To mitigate this we ignore size hints for states that do not require strict size adherence. --- dlls/winewayland.drv/window.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/winewayland.drv/window.c b/dlls/winewayland.drv/window.c index 8666a93f6c2..1423164834e 100644 --- a/dlls/winewayland.drv/window.c +++ b/dlls/winewayland.drv/window.c @@ -412,9 +412,18 @@ static void wayland_configure_window(HWND hwnd) surface->processing = surface->requested; memset(&surface->requested, 0, sizeof(surface->requested)); - width = surface->processing.width; - height = surface->processing.height; state = surface->processing.state; + /* Ignore size hints if we don't have a state that requires strict + * size adherence, in order to avoid spurious resizes. */ + if (state) + { + width = surface->processing.width; + height = surface->processing.height; + } + else + { + width = height = 0; + } if ((state & WAYLAND_SURFACE_CONFIG_STATE_RESIZING) && !surface->resizing) {

1 0

Daniel Lehman : msxml3/tests: Remove unused test field.
by Alexandre Julliard 14 Nov '23

14 Nov '23

Module: wine Branch: master Commit: 320f92759b169338e5efb7ea64564d2bd3a0a763 URL: https://gitlab.winehq.org/wine/wine/-/commit/320f92759b169338e5efb7ea64564d… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Sun Nov 12 23:04:19 2023 -0800 msxml3/tests: Remove unused test field. --- dlls/msxml3/tests/domdoc.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index d7de144c84c..f8d80abeba2 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -13653,14 +13653,13 @@ todo_wine { typedef struct _namespace_as_attribute_t { const GUID *guid; const char *clsid; - const char *xmlns_uri; } namespace_as_attribute_t; static const namespace_as_attribute_t namespace_as_attribute_test_data[] = { - { &CLSID_DOMDocument, "CLSID_DOMDocument", "" }, - { &CLSID_DOMDocument2, "CLSID_DOMDocument2", "" }, - { &CLSID_DOMDocument26, "CLSID_DOMDocument26", "" }, - { &CLSID_DOMDocument30, "CLSID_DOMDocument30", "" }, + { &CLSID_DOMDocument, "CLSID_DOMDocument" }, + { &CLSID_DOMDocument2, "CLSID_DOMDocument2" }, + { &CLSID_DOMDocument26, "CLSID_DOMDocument26" }, + { &CLSID_DOMDocument30, "CLSID_DOMDocument30" }, { 0 } }; @@ -13788,7 +13787,7 @@ static void test_namespaces_as_attributes(void) { ok(hr == S_OK, "Failed to get namespace URI, hr %#lx.\n", hr); if (test->prefixes[i] && !strcmp(test->prefixes[i], "xmlns")) - ok(!lstrcmpW(str, _bstr_(entry->xmlns_uri)), "got %s\n", wine_dbgstr_w(str)); + ok(!SysStringLen(str), "got %s\n", wine_dbgstr_w(str)); else ok(!lstrcmpW(str, _bstr_(test->uris[i])), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str);

1 0

Henri Verbeet : build: Make doxygen output slightly less verbose.
by Alexandre Julliard 14 Nov '23

14 Nov '23

Module: vkd3d Branch: master Commit: b7480911a88a4d25e4a4d391fb0c71f1065e5337 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b7480911a88a4d25e4a4d391fb0c7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 13 13:45:13 2023 +0100 build: Make doxygen output slightly less verbose. There is perhaps a bit of a trade-off involved here, but with the current state of things it's fairly hard to notice unexpected issues in the output. --- Doxyfile.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Doxyfile.in b/Doxyfile.in index a20e6f02..3ecad918 100644 --- a/Doxyfile.in +++ b/Doxyfile.in @@ -8,6 +8,9 @@ OUTPUT_DIRECTORY = doc JAVADOC_AUTOBRIEF = YES OPTIMIZE_OUTPUT_FOR_C = YES EXTRACT_STATIC = YES +QUIET = YES +WARN_IF_UNDOCUMENTED = NO +LATEX_BATCHMODE = YES INPUT = @srcdir@/include/vkd3d.h \ @srcdir@/include/vkd3d_shader.h \

1 0

Alex Henrie : gdi32/tests: Free what GdiConvertToDevmodeW returns with HeapFree.
by Alexandre Julliard 14 Nov '23

14 Nov '23

Module: wine Branch: master Commit: 2fcbfc4ca6bfb39e68cdad9c3c61bc567711ed59 URL: https://gitlab.winehq.org/wine/wine/-/commit/2fcbfc4ca6bfb39e68cdad9c3c61bc… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Nov 11 14:27:37 2023 -0700 gdi32/tests: Free what GdiConvertToDevmodeW returns with HeapFree. This partially reverts commit 0b7eed0310a2d1272a97d8a45ec37fa03a9c26c8. --- dlls/gdi32/tests/dc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 69cd44107a0..4d09de78d67 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -285,13 +285,13 @@ static void test_GdiConvertToDevmodeW(void) dmW = pGdiConvertToDevmodeW(&dmA); ok(dmW->dmSize >= FIELD_OFFSET(DEVMODEW, dmICMMethod), "dmSize is too small: %04x\n", dmW->dmSize); ok(dmW->dmSize <= sizeof(DEVMODEW), "dmSize is too large: %04x\n", dmW->dmSize); - free(dmW); + HeapFree(GetProcessHeap(), 0, dmW); dmA.dmSize = FIELD_OFFSET(DEVMODEA, dmFields) + sizeof(dmA.dmFields); dmW = pGdiConvertToDevmodeW(&dmA); ok(dmW->dmSize == FIELD_OFFSET(DEVMODEW, dmFields) + sizeof(dmW->dmFields), "wrong size %u\n", dmW->dmSize); - free(dmW); + HeapFree(GetProcessHeap(), 0, dmW); dmA.dmICMMethod = DMICMMETHOD_NONE; dmA.dmSize = FIELD_OFFSET(DEVMODEA, dmICMMethod) + sizeof(dmA.dmICMMethod); @@ -300,13 +300,13 @@ static void test_GdiConvertToDevmodeW(void) "wrong size %u\n", dmW->dmSize); ok(dmW->dmICMMethod == DMICMMETHOD_NONE, "expected DMICMMETHOD_NONE, got %lu\n", dmW->dmICMMethod); - free(dmW); + HeapFree(GetProcessHeap(), 0, dmW); dmA.dmSize = 1024; dmW = pGdiConvertToDevmodeW(&dmA); ok(dmW->dmSize == FIELD_OFFSET(DEVMODEW, dmPanningHeight) + sizeof(dmW->dmPanningHeight), "wrong size %u\n", dmW->dmSize); - free(dmW); + HeapFree(GetProcessHeap(), 0, dmW); SetLastError(0xdeadbeef); dmA.dmSize = 0; @@ -319,7 +319,7 @@ static void test_GdiConvertToDevmodeW(void) dmW = pGdiConvertToDevmodeW(&dmA); ok(dmW->dmSize == FIELD_OFFSET(DEVMODEW, dmFields), "expected %04lx, got %04x\n", FIELD_OFFSET(DEVMODEW, dmFields), dmW->dmSize); - free(dmW); + HeapFree(GetProcessHeap(), 0, dmW); } static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr, int scale )

1 0

Conor McCarthy : vkd3d-shader/dxil: Handle missing flags as zero for BINOP.
by Alexandre Julliard 14 Nov '23

14 Nov '23

Module: vkd3d Branch: master Commit: f1e9f400612d6b573ec927044fb295a5f5ea67f8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f1e9f400612d6b573ec927044fb29… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Nov 13 13:10:33 2023 +1000 vkd3d-shader/dxil: Handle missing flags as zero for BINOP. The flag operand is omitted if IEEE strictness is specified. --- libs/vkd3d-shader/dxil.c | 82 +++++++++++++++++++++++------------------------- 1 file changed, 40 insertions(+), 42 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 82308ff6..0297be37 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -2821,8 +2821,9 @@ static void sm6_parser_emit_binop(struct sm6_parser *sm6, const struct dxil_reco struct vkd3d_shader_src_param *src_params; enum vkd3d_shader_opcode handler_idx; const struct sm6_value *a, *b; + uint64_t code, flags; + bool silence_warning; unsigned int i = 0; - uint64_t code; a = sm6_parser_get_value_by_ref(sm6, record, NULL, &i); b = sm6_parser_get_value_by_ref(sm6, record, a->type, &i); @@ -2838,48 +2839,45 @@ static void sm6_parser_emit_binop(struct sm6_parser *sm6, const struct dxil_reco vsir_instruction_init(ins, &sm6->p.location, handler_idx); - if (record->operand_count > i && record->operands[i]) - { - uint64_t flags = record->operands[i]; - bool silence_warning = false; + flags = (record->operand_count > i) ? record->operands[i] : 0; + silence_warning = false; - switch (handler_idx) - { - case VKD3DSIH_ADD: - case VKD3DSIH_MUL: - case VKD3DSIH_DIV: - case VKD3DSIH_FREM: - if (!(flags & FP_ALLOW_UNSAFE_ALGEBRA)) - ins->flags |= VKD3DSI_PRECISE_X; - flags &= ~FP_ALLOW_UNSAFE_ALGEBRA; - /* SPIR-V FPFastMathMode is only available in the Kernel executon model. */ - silence_warning = !(flags & ~(FP_NO_NAN | FP_NO_INF | FP_NO_SIGNED_ZEROS | FP_ALLOW_RECIPROCAL)); - break; - case VKD3DSIH_IADD: - case VKD3DSIH_UMUL: - case VKD3DSIH_ISHL: - silence_warning = !(flags & ~(OB_NO_UNSIGNED_WRAP | OB_NO_SIGNED_WRAP)); - break; - case VKD3DSIH_ISHR: - case VKD3DSIH_USHR: - case VKD3DSIH_IDIV: - case VKD3DSIH_UDIV: - silence_warning = !(flags & ~PEB_EXACT); - break; - default: - break; - } - /* The above flags are very common and cause warning spam. */ - if (flags && silence_warning) - { - TRACE("Ignoring flags %#"PRIx64".\n", flags); - } - else if (flags) - { - WARN("Ignoring flags %#"PRIx64".\n", flags); - vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_IGNORING_OPERANDS, - "Ignoring flags %#"PRIx64" for a binary operation.", flags); - } + switch (handler_idx) + { + case VKD3DSIH_ADD: + case VKD3DSIH_MUL: + case VKD3DSIH_DIV: + case VKD3DSIH_FREM: + if (!(flags & FP_ALLOW_UNSAFE_ALGEBRA)) + ins->flags |= VKD3DSI_PRECISE_X; + flags &= ~FP_ALLOW_UNSAFE_ALGEBRA; + /* SPIR-V FPFastMathMode is only available in the Kernel executon model. */ + silence_warning = !(flags & ~(FP_NO_NAN | FP_NO_INF | FP_NO_SIGNED_ZEROS | FP_ALLOW_RECIPROCAL)); + break; + case VKD3DSIH_IADD: + case VKD3DSIH_UMUL: + case VKD3DSIH_ISHL: + silence_warning = !(flags & ~(OB_NO_UNSIGNED_WRAP | OB_NO_SIGNED_WRAP)); + break; + case VKD3DSIH_ISHR: + case VKD3DSIH_USHR: + case VKD3DSIH_IDIV: + case VKD3DSIH_UDIV: + silence_warning = !(flags & ~PEB_EXACT); + break; + default: + break; + } + /* The above flags are very common and cause warning spam. */ + if (flags && silence_warning) + { + TRACE("Ignoring flags %#"PRIx64".\n", flags); + } + else if (flags) + { + WARN("Ignoring flags %#"PRIx64".\n", flags); + vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_IGNORING_OPERANDS, + "Ignoring flags %#"PRIx64" for a binary operation.", flags); } src_params = instruction_src_params_alloc(ins, 2, sm6);

1 0

Conor McCarthy : vkd3d-shader/dxil: Handle missing flags as zero for CMP2.
by Alexandre Julliard 14 Nov '23

14 Nov '23

Module: vkd3d Branch: master Commit: 408f67c69c32744fcdb940957dbf077301e87703 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/408f67c69c32744fcdb940957dbf0… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Nov 13 13:13:53 2023 +1000 vkd3d-shader/dxil: Handle missing flags as zero for CMP2. The flag operand is omitted if IEEE strictness is specified. --- libs/vkd3d-shader/dxil.c | 45 +++++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 0297be37..04dfdf57 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -3494,11 +3494,11 @@ static void sm6_parser_emit_cmp2(struct sm6_parser *sm6, const struct dxil_recor { struct vkd3d_shader_src_param *src_params; const struct sm6_type *type_a, *type_b; + bool is_int, is_fp, silence_warning; const struct sm6_cmp_info *cmp; const struct sm6_value *a, *b; + uint64_t code, flags; unsigned int i = 0; - bool is_int, is_fp; - uint64_t code; if (!(dst->type = sm6->bool_type)) { @@ -3549,29 +3549,26 @@ static void sm6_parser_emit_cmp2(struct sm6_parser *sm6, const struct dxil_recor vsir_instruction_init(ins, &sm6->p.location, cmp->handler_idx); - if (record->operand_count > i) - { - uint64_t flags = record->operands[i]; - bool silence_warning = false; + flags = (record->operand_count > i) ? record->operands[i] : 0; + silence_warning = false; - if (is_fp) - { - if (!(flags & FP_ALLOW_UNSAFE_ALGEBRA)) - ins->flags |= VKD3DSI_PRECISE_X; - flags &= ~FP_ALLOW_UNSAFE_ALGEBRA; - /* SPIR-V FPFastMathMode is only available in the Kernel execution model. */ - silence_warning = !(flags & ~(FP_NO_NAN | FP_NO_INF | FP_NO_SIGNED_ZEROS | FP_ALLOW_RECIPROCAL)); - } - if (flags && silence_warning) - { - TRACE("Ignoring fast FP modifier %#"PRIx64".\n", flags); - } - else if (flags) - { - WARN("Ignoring flags %#"PRIx64".\n", flags); - vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_IGNORING_OPERANDS, - "Ignoring flags %#"PRIx64" for a comparison operation.", flags); - } + if (is_fp) + { + if (!(flags & FP_ALLOW_UNSAFE_ALGEBRA)) + ins->flags |= VKD3DSI_PRECISE_X; + flags &= ~FP_ALLOW_UNSAFE_ALGEBRA; + /* SPIR-V FPFastMathMode is only available in the Kernel execution model. */ + silence_warning = !(flags & ~(FP_NO_NAN | FP_NO_INF | FP_NO_SIGNED_ZEROS | FP_ALLOW_RECIPROCAL)); + } + if (flags && silence_warning) + { + TRACE("Ignoring fast FP modifier %#"PRIx64".\n", flags); + } + else if (flags) + { + WARN("Ignoring flags %#"PRIx64".\n", flags); + vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_IGNORING_OPERANDS, + "Ignoring flags %#"PRIx64" for a comparison operation.", flags); } src_params = instruction_src_params_alloc(ins, 2, sm6);

1 0