January 2024 - Wine-Commits

Alexandre Julliard : Release 9.0-rc5.
by Alexandre Julliard Jan. 12, 2024

Jan. 12, 2024

Module: wine Branch: master Commit: ff1642f32cfcd2efd8d60be1a8cb432d393587c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/ff1642f32cfcd2efd8d60be1a8cb43… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 12 21:59:55 2024 +0100 Release 9.0-rc5. --- ANNOUNCE.md | 160 ++++++++++++++++++++++++++++++------------------------------ VERSION | 2 +- configure | 18 +++---- 3 files changed, 91 insertions(+), 89 deletions(-)

1 0

Elizabeth Figura : wined3d: Only suballocate dynamic buffers.
by Alexandre Julliard Jan. 12, 2024

Jan. 12, 2024

Module: wine Branch: master Commit: bed2495e50a1aa8505663f64bd1ac27db67cbd4d URL: https://gitlab.winehq.org/wine/wine/-/commit/bed2495e50a1aa8505663f64bd1ac2… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Wed Jan 10 12:53:37 2024 -0600 wined3d: Only suballocate dynamic buffers. I don't know for sure that this is why iris (or nvidia) performs badly, but it seems perfectly plausible, and I don't think we lose anything by letting the driver allocate here. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54223 --- dlls/wined3d/device.c | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e529a8fd2d0..4aeade1d2de 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1126,16 +1126,34 @@ bool wined3d_device_gl_create_bo(struct wined3d_device_gl *device_gl, struct win if (gl_info->supported[ARB_BUFFER_STORAGE]) { - if (use_buffer_chunk_suballocation(device_gl, gl_info, binding)) + /* Only suballocate dynamic buffers. + * + * We only need suballocation so that we can allocate GL buffers from + * the client thread and thereby accelerate DISCARD maps. + * + * For other buffer types, suballocating means that a whole-buffer + * upload won't be replacing the whole buffer anymore. If the driver + * isn't smart enough to track individual buffer ranges then it'll + * force synchronizing that BO with the GPU. Even using ARB_sync + * ourselves won't help here, because glBufferSubData() is still + * implicitly synchronized. */ + if (flags & GL_CLIENT_STORAGE_BIT) { - if ((memory = wined3d_device_gl_allocate_memory(device_gl, context_gl, memory_type_idx, size, &id))) - buffer_offset = memory->offset; - else if (!context_gl) - WARN_(d3d_perf)("Failed to suballocate buffer from the client thread.\n"); + if (use_buffer_chunk_suballocation(device_gl, gl_info, binding)) + { + if ((memory = wined3d_device_gl_allocate_memory(device_gl, context_gl, memory_type_idx, size, &id))) + buffer_offset = memory->offset; + else if (!context_gl) + WARN_(d3d_perf)("Failed to suballocate buffer from the client thread.\n"); + } + else if (context_gl) + { + WARN_(d3d_perf)("Not allocating chunk memory for binding type %#x.\n", binding); + id = wined3d_context_gl_allocate_vram_chunk_buffer(context_gl, memory_type_idx, size); + } } - else if (context_gl) + else { - WARN_(d3d_perf)("Not allocating chunk memory for binding type %#x.\n", binding); id = wined3d_context_gl_allocate_vram_chunk_buffer(context_gl, memory_type_idx, size); }

1 0

Elizabeth Figura : wined3d: Avoid WARN() when failing to allocate a GL BO without a context.
by Alexandre Julliard Jan. 12, 2024

Jan. 12, 2024

Module: wine Branch: master Commit: 52a0e36aee9a5648fe5bbdf33ab2d251806f4803 URL: https://gitlab.winehq.org/wine/wine/-/commit/52a0e36aee9a5648fe5bbdf33ab2d2… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Fri Dec 29 19:09:15 2023 -0600 wined3d: Avoid WARN() when failing to allocate a GL BO without a context. This is normal and expected, and only a concern for performance. Avoid polluting warn+d3d logs. --- dlls/wined3d/adapter_gl.c | 1 - dlls/wined3d/device.c | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 1d622c298cb..de4729a56fc 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4657,7 +4657,6 @@ static bool adapter_gl_alloc_bo(struct wined3d_device *device, struct wined3d_re if (!(wined3d_device_gl_create_bo(device_gl, NULL, size, binding, usage, coherent, flags, bo_gl))) { - WARN("Failed to create OpenGL buffer.\n"); heap_free(bo_gl); return false; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 201b76eab28..e529a8fd2d0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1130,6 +1130,8 @@ bool wined3d_device_gl_create_bo(struct wined3d_device_gl *device_gl, struct win { if ((memory = wined3d_device_gl_allocate_memory(device_gl, context_gl, memory_type_idx, size, &id))) buffer_offset = memory->offset; + else if (!context_gl) + WARN_(d3d_perf)("Failed to suballocate buffer from the client thread.\n"); } else if (context_gl) { @@ -1139,7 +1141,8 @@ bool wined3d_device_gl_create_bo(struct wined3d_device_gl *device_gl, struct win if (!id) { - WARN("Failed to allocate buffer.\n"); + if (context_gl) + WARN("Failed to allocate buffer.\n"); return false; } }

1 0

Gabriel Ivăncescu : winex11: Move the update_desktop_fullscreen callsite to update_net_wm_states.
by Alexandre Julliard Jan. 11, 2024

Jan. 11, 2024

Module: wine Branch: master Commit: 44aa651dc540f2b2c6ef8b8c9966889c4438f3a7 URL: https://gitlab.winehq.org/wine/wine/-/commit/44aa651dc540f2b2c6ef8b8c996688… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jan 11 19:43:06 2024 +0200 winex11: Move the update_desktop_fullscreen callsite to update_net_wm_states. It's simpler to just use the same sequence as normal fullscreen windows and avoid headaches with virtual desktops. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56149 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/winex11.drv/desktop.c | 46 +++------------------------------------------- dlls/winex11.drv/window.c | 35 ++++++++++++++++++++++++++++++++++- 2 files changed, 37 insertions(+), 44 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 5867f9d16a4..d6fa078e8a9 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -99,39 +99,6 @@ BOOL is_desktop_fullscreen(void) primary_rect.bottom - primary_rect.top == host_primary_rect.bottom - host_primary_rect.top); } -static void update_desktop_fullscreen( unsigned int width, unsigned int height) -{ - Display *display = thread_display(); - XEvent xev; - - if (!display || !is_virtual_desktop()) return; - - xev.xclient.type = ClientMessage; - xev.xclient.window = root_window; - xev.xclient.message_type = x11drv_atom(_NET_WM_STATE); - xev.xclient.serial = 0; - xev.xclient.display = display; - xev.xclient.send_event = True; - xev.xclient.format = 32; - if (width == host_primary_rect.right - host_primary_rect.left && height == host_primary_rect.bottom - host_primary_rect.top) - xev.xclient.data.l[0] = _NET_WM_STATE_ADD; - else - xev.xclient.data.l[0] = _NET_WM_STATE_REMOVE; - xev.xclient.data.l[1] = x11drv_atom(_NET_WM_STATE_FULLSCREEN); - xev.xclient.data.l[2] = 0; - xev.xclient.data.l[3] = 1; - - TRACE("action=%li\n", xev.xclient.data.l[0]); - - XSendEvent( display, DefaultRootWindow(display), False, - SubstructureRedirectMask | SubstructureNotifyMask, &xev ); - - xev.xclient.data.l[1] = x11drv_atom(_NET_WM_STATE_MAXIMIZED_VERT); - xev.xclient.data.l[2] = x11drv_atom(_NET_WM_STATE_MAXIMIZED_HORZ); - XSendEvent( display, DefaultRootWindow(display), False, - SubstructureRedirectMask | SubstructureNotifyMask, &xev ); -} - /*********************************************************************** * X11DRV_resize_desktop */ @@ -139,20 +106,13 @@ void X11DRV_resize_desktop(void) { static RECT old_virtual_rect; - RECT primary_rect, virtual_rect; + RECT virtual_rect = NtUserGetVirtualScreenRect(); HWND hwnd = NtUserGetDesktopWindow(); - INT width, height; - - virtual_rect = NtUserGetVirtualScreenRect(); - primary_rect = NtUserGetPrimaryMonitorRect(); - width = primary_rect.right; - height = primary_rect.bottom; + INT width = virtual_rect.right - virtual_rect.left, height = virtual_rect.bottom - virtual_rect.top; TRACE( "desktop %p change to (%dx%d)\n", hwnd, width, height ); - NtUserSetWindowPos( hwnd, 0, virtual_rect.left, virtual_rect.top, - virtual_rect.right - virtual_rect.left, virtual_rect.bottom - virtual_rect.top, + NtUserSetWindowPos( hwnd, 0, virtual_rect.left, virtual_rect.top, width, height, SWP_NOZORDER | SWP_NOACTIVATE | SWP_DEFERERASE ); - update_desktop_fullscreen( width, height ); if (old_virtual_rect.left != virtual_rect.left || old_virtual_rect.top != virtual_rect.top) send_message_timeout( HWND_BROADCAST, WM_X11DRV_DESKTOP_RESIZED, old_virtual_rect.left, diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index f5f2dd03662..a9d6dbf1121 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -978,6 +978,35 @@ void update_user_time( Time time ) XUnlockDisplay( gdi_display ); } +static void update_desktop_fullscreen( Display *display ) +{ + XEvent xev; + + if (!is_virtual_desktop()) return; + + xev.xclient.type = ClientMessage; + xev.xclient.window = root_window; + xev.xclient.message_type = x11drv_atom(_NET_WM_STATE); + xev.xclient.serial = 0; + xev.xclient.display = display; + xev.xclient.send_event = True; + xev.xclient.format = 32; + xev.xclient.data.l[0] = is_desktop_fullscreen() ? _NET_WM_STATE_ADD : _NET_WM_STATE_REMOVE; + xev.xclient.data.l[1] = x11drv_atom(_NET_WM_STATE_FULLSCREEN); + xev.xclient.data.l[2] = 0; + xev.xclient.data.l[3] = 1; + + TRACE("action=%li\n", xev.xclient.data.l[0]); + + XSendEvent( display, DefaultRootWindow(display), False, + SubstructureRedirectMask | SubstructureNotifyMask, &xev ); + + xev.xclient.data.l[1] = x11drv_atom(_NET_WM_STATE_MAXIMIZED_VERT); + xev.xclient.data.l[2] = x11drv_atom(_NET_WM_STATE_MAXIMIZED_HORZ); + XSendEvent( display, DefaultRootWindow(display), False, + SubstructureRedirectMask | SubstructureNotifyMask, &xev ); +} + /* Update _NET_WM_FULLSCREEN_MONITORS when _NET_WM_STATE_FULLSCREEN is set to support fullscreen * windows spanning multiple monitors */ static void update_net_wm_fullscreen_monitors( struct x11drv_win_data *data ) @@ -1041,7 +1070,11 @@ void update_net_wm_states( struct x11drv_win_data *data ) UINT i, style, ex_style, new_state = 0; if (!data->managed) return; - if (data->whole_window == root_window) return; + if (data->whole_window == root_window) + { + update_desktop_fullscreen(data->display); + return; + } style = NtUserGetWindowLongW( data->hwnd, GWL_STYLE ); if (style & WS_MINIMIZE)

1 0

Rémi Bernon : winewayland: Add missing breaks in keyboard layout switch.
by Alexandre Julliard Jan. 11, 2024

Jan. 11, 2024

Module: wine Branch: master Commit: d0a317e98a6c110391e510665ba243c9a78e63ee URL: https://gitlab.winehq.org/wine/wine/-/commit/d0a317e98a6c110391e510665ba243… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jan 11 15:54:24 2024 +0100 winewayland: Add missing breaks in keyboard layout switch. --- dlls/winewayland.drv/wayland_keyboard.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winewayland.drv/wayland_keyboard.c b/dlls/winewayland.drv/wayland_keyboard.c index ba09aad4fc2..a5d01fe1f08 100644 --- a/dlls/winewayland.drv/wayland_keyboard.c +++ b/dlls/winewayland.drv/wayland_keyboard.c @@ -404,10 +404,10 @@ static void add_xkb_layout(const char *xkb_layout, struct xkb_keymap *xkb_keymap switch (lang) { - case MAKELANGID(LANG_FRENCH, SUBLANG_DEFAULT): scan2vk = scan2vk_azerty; - case MAKELANGID(LANG_GERMAN, SUBLANG_DEFAULT): scan2vk = scan2vk_qwertz; - case MAKELANGID(LANG_GERMAN, SUBLANG_GERMAN_SWISS): scan2vk = scan2vk_qwertz; - default: scan2vk = scan2vk_qwerty; + case MAKELANGID(LANG_FRENCH, SUBLANG_DEFAULT): scan2vk = scan2vk_azerty; break; + case MAKELANGID(LANG_GERMAN, SUBLANG_DEFAULT): scan2vk = scan2vk_qwertz; break; + case MAKELANGID(LANG_GERMAN, SUBLANG_GERMAN_SWISS): scan2vk = scan2vk_qwertz; break; + default: scan2vk = scan2vk_qwerty; break; } if (strstr(xkb_layout, "dvorak")) scan2vk = scan2vk_dvorak;

1 0

Hans Leidekker : wininet/tests: Update expected winehq.org certificate.
by Alexandre Julliard Jan. 11, 2024

Jan. 11, 2024

Module: wine Branch: master Commit: 60843dbb3e57a72c7a6a138b31f33a6a522e95c2 URL: https://gitlab.winehq.org/wine/wine/-/commit/60843dbb3e57a72c7a6a138b31f33a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 11 09:08:28 2024 +0100 wininet/tests: Update expected winehq.org certificate. --- dlls/wininet/tests/http.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 026672c6536..9405991c3b0 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -6716,16 +6716,11 @@ typedef struct { } cert_struct_test_t; static const cert_struct_test_t test_winehq_org_cert = { - "US\r\n" - "Minnesota\r\n" - "CodeWeavers\r\n" - "*.winehq.org", + "winehq.org", "US\r\n" - "VA\r\n" - "Herndon\r\n" - "Network Solutions L.L.C.\r\n" - "Network Solutions OV Server CA 2" + "Let's Encrypt\r\n" + "R3" }; static const cert_struct_test_t test_winehq_com_cert = {

1 0

Henri Verbeet : vkd3d: Trace GetLastError() results with %lu.
by Alexandre Julliard Jan. 11, 2024

Jan. 11, 2024

Module: vkd3d Branch: master Commit: bf0fda7812e51bf025d6076bbce53dc336375074 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/bf0fda7812e51bf025d6076bbce53… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 10 16:38:59 2024 +0100 vkd3d: Trace GetLastError() results with %lu. These are DWORDs, but this is all Windows code, so we can just use %lu. --- libs/vkd3d/device.c | 2 +- libs/vkd3d/vkd3d_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 39b284ee..ea243977 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -4551,7 +4551,7 @@ HRESULT vkd3d_create_thread(struct vkd3d_instance *instance, thread_data->data = data; if (!(thread->handle = CreateThread(NULL, 0, call_thread_main, thread_data, 0, NULL))) { - ERR("Failed to create thread, error %d.\n", GetLastError()); + ERR("Failed to create thread, error %lu.\n", GetLastError()); vkd3d_free(thread_data); hr = E_FAIL; } diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 2d27090b..71945ea1 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -249,7 +249,7 @@ static inline void vkd3d_cond_broadcast(struct vkd3d_cond *cond) static inline void vkd3d_cond_wait(struct vkd3d_cond *cond, struct vkd3d_mutex *lock) { if (!SleepConditionVariableCS(&cond->cond, &lock->lock, INFINITE)) - ERR("Could not sleep on the condition variable, error %u.\n", GetLastError()); + ERR("Could not sleep on the condition variable, error %lu.\n", GetLastError()); } static inline void vkd3d_cond_destroy(struct vkd3d_cond *cond)

1 0

Henri Verbeet : vkd3d-shader/spirv: Pass a uint32_t write mask to spirv_compiler_emit_abs().
by Alexandre Julliard Jan. 11, 2024

Jan. 11, 2024

Module: vkd3d Branch: master Commit: b4da553d28cfaa583f689a4c80ea773e10e20b1c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b4da553d28cfaa583f689a4c80ea7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 6 20:11:02 2023 +0100 vkd3d-shader/spirv: Pass a uint32_t write mask to spirv_compiler_emit_abs(). --- libs/vkd3d-shader/spirv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 331be90c..da20ba8a 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3997,7 +3997,7 @@ static void spirv_compiler_emit_execution_mode1(struct spirv_compiler *compiler, } static uint32_t spirv_compiler_emit_abs(struct spirv_compiler *compiler, - const struct vkd3d_shader_register *reg, DWORD write_mask, uint32_t val_id) + const struct vkd3d_shader_register *reg, uint32_t write_mask, uint32_t val_id) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t type_id; @@ -4027,7 +4027,7 @@ static uint32_t spirv_compiler_emit_neg(struct spirv_compiler *compiler, } static uint32_t spirv_compiler_emit_src_modifier(struct spirv_compiler *compiler, - const struct vkd3d_shader_register *reg, DWORD write_mask, + const struct vkd3d_shader_register *reg, uint32_t write_mask, enum vkd3d_shader_src_modifier modifier, uint32_t val_id) { switch (modifier)

1 0

Henri Verbeet : vkd3d-shader/dxbc: Use sizeof(uint32_t) instead of sizeof(DWORD) in calls to require_space().
by Alexandre Julliard Jan. 11, 2024

Jan. 11, 2024

Module: vkd3d Branch: master Commit: 3e2ace8d33a203bf0c8d6a7bf140ef9a9a08352d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3e2ace8d33a203bf0c8d6a7bf140e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 6 20:16:31 2023 +0100 vkd3d-shader/dxbc: Use sizeof(uint32_t) instead of sizeof(DWORD) in calls to require_space(). --- libs/vkd3d-shader/dxbc.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index e4353080..37ebc73c 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -230,7 +230,7 @@ static int parse_dxbc(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_ chunk_offset = read_u32(&ptr); TRACE("chunk %u at offset %#x\n", i, chunk_offset); - if (chunk_offset >= data_size || !require_space(chunk_offset, 2, sizeof(DWORD), data_size)) + if (chunk_offset >= data_size || !require_space(chunk_offset, 2, sizeof(uint32_t), data_size)) { WARN("Invalid chunk offset %#x (data size %zu).\n", chunk_offset, data_size); vkd3d_shader_error(message_context, &location, VKD3D_SHADER_ERROR_DXBC_INVALID_CHUNK_OFFSET, @@ -593,7 +593,7 @@ static int shader_parse_descriptor_ranges(struct root_signature_parser_context * const char *ptr; unsigned int i; - if (!require_space(offset, 5 * count, sizeof(DWORD), context->data_size)) + if (!require_space(offset, 5 * count, sizeof(uint32_t), context->data_size)) { WARN("Invalid data size %#x (offset %u, count %u).\n", context->data_size, offset, count); return VKD3D_ERROR_INVALID_ARGUMENT; @@ -672,7 +672,7 @@ static int shader_parse_descriptor_table(struct root_signature_parser_context *c unsigned int count; const char *ptr; - if (!require_space(offset, 2, sizeof(DWORD), context->data_size)) + if (!require_space(offset, 2, sizeof(uint32_t), context->data_size)) { WARN("Invalid data size %#x (offset %u).\n", context->data_size, offset); return VKD3D_ERROR_INVALID_ARGUMENT; @@ -699,7 +699,7 @@ static int shader_parse_descriptor_table1(struct root_signature_parser_context * unsigned int count; const char *ptr; - if (!require_space(offset, 2, sizeof(DWORD), context->data_size)) + if (!require_space(offset, 2, sizeof(uint32_t), context->data_size)) { WARN("Invalid data size %#x (offset %u).\n", context->data_size, offset); return VKD3D_ERROR_INVALID_ARGUMENT; @@ -724,7 +724,7 @@ static int shader_parse_root_constants(struct root_signature_parser_context *con { const char *ptr; - if (!require_space(offset, 3, sizeof(DWORD), context->data_size)) + if (!require_space(offset, 3, sizeof(uint32_t), context->data_size)) { WARN("Invalid data size %#x (offset %u).\n", context->data_size, offset); return VKD3D_ERROR_INVALID_ARGUMENT; @@ -746,7 +746,7 @@ static int shader_parse_root_descriptor(struct root_signature_parser_context *co { const char *ptr; - if (!require_space(offset, 2, sizeof(DWORD), context->data_size)) + if (!require_space(offset, 2, sizeof(uint32_t), context->data_size)) { WARN("Invalid data size %#x (offset %u).\n", context->data_size, offset); return VKD3D_ERROR_INVALID_ARGUMENT; @@ -778,7 +778,7 @@ static int shader_parse_root_descriptor1(struct root_signature_parser_context *c { const char *ptr; - if (!require_space(offset, 3, sizeof(DWORD), context->data_size)) + if (!require_space(offset, 3, sizeof(uint32_t), context->data_size)) { WARN("Invalid data size %#x (offset %u).\n", context->data_size, offset); return VKD3D_ERROR_INVALID_ARGUMENT; @@ -804,7 +804,7 @@ static int shader_parse_root_parameters(struct root_signature_parser_context *co unsigned int i; int ret; - if (!require_space(offset, 3 * count, sizeof(DWORD), context->data_size)) + if (!require_space(offset, 3 * count, sizeof(uint32_t), context->data_size)) { WARN("Invalid data size %#x (offset %u, count %u).\n", context->data_size, offset, count); return VKD3D_ERROR_INVALID_ARGUMENT; @@ -852,7 +852,7 @@ static int shader_parse_root_parameters1(struct root_signature_parser_context *c unsigned int i; int ret; - if (!require_space(offset, 3 * count, sizeof(DWORD), context->data_size)) + if (!require_space(offset, 3 * count, sizeof(uint32_t), context->data_size)) { WARN("Invalid data size %#x (offset %u, count %u).\n", context->data_size, offset, count); return VKD3D_ERROR_INVALID_ARGUMENT; @@ -899,7 +899,7 @@ static int shader_parse_static_samplers(struct root_signature_parser_context *co const char *ptr; unsigned int i; - if (!require_space(offset, 13 * count, sizeof(DWORD), context->data_size)) + if (!require_space(offset, 13 * count, sizeof(uint32_t), context->data_size)) { WARN("Invalid data size %#x (offset %u, count %u).\n", context->data_size, offset, count); return VKD3D_ERROR_INVALID_ARGUMENT;

1 0

Giovanni Mascellani : vkd3d-shader: Make *src and *dst mutable in vkd3d_shader_instruction.
by Alexandre Julliard Jan. 11, 2024

Jan. 11, 2024

Module: vkd3d Branch: master Commit: 78d95889bd49c6028f0c26aaec5589786381da4a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/78d95889bd49c6028f0c26aaec558… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Jan 11 11:19:39 2024 +0100 vkd3d-shader: Make *src and *dst mutable in vkd3d_shader_instruction. They were originally made const because no optimization/normalization pass existed. Now having to cast away const all the time is becoming more and more burdening. --- libs/vkd3d-shader/ir.c | 8 ++++---- libs/vkd3d-shader/tpf.c | 11 ++++------- libs/vkd3d-shader/vkd3d_shader_private.h | 4 ++-- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index bac42691..9fd60fa7 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -492,7 +492,7 @@ static enum vkd3d_result instruction_array_normalise_hull_shader_control_point_i if (shader_instruction_is_dcl(ins)) break; for (j = 0; j < ins->dst_count; ++j) - shader_dst_param_normalise_outpointid((struct vkd3d_shader_dst_param *)&ins->dst[j], &normaliser); + shader_dst_param_normalise_outpointid(&ins->dst[j], &normaliser); break; } } @@ -1116,9 +1116,9 @@ static void shader_instruction_normalise_io_params(struct vkd3d_shader_instructi if (shader_instruction_is_dcl(ins)) break; for (i = 0; i < ins->dst_count; ++i) - shader_dst_param_io_normalise((struct vkd3d_shader_dst_param *)&ins->dst[i], false, normaliser); + shader_dst_param_io_normalise(&ins->dst[i], false, normaliser); for (i = 0; i < ins->src_count; ++i) - shader_src_param_io_normalise((struct vkd3d_shader_src_param *)&ins->src[i], normaliser); + shader_src_param_io_normalise(&ins->src[i], normaliser); break; } } @@ -1310,7 +1310,7 @@ static enum vkd3d_result instruction_array_normalise_flat_constants(struct vkd3d else { for (j = 0; j < ins->src_count; ++j) - shader_register_normalise_flat_constants((struct vkd3d_shader_src_param *)&ins->src[j], &normaliser); + shader_register_normalise_flat_constants(&ins->src[j], &normaliser); } } diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 2cc56663..43b3525b 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -742,8 +742,7 @@ static bool shader_sm4_read_register_space(struct vkd3d_shader_sm4_parser *priv, static void shader_sm4_read_conditional_op(struct vkd3d_shader_instruction *ins, uint32_t opcode, uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { - shader_sm4_read_src_param(priv, &tokens, &tokens[token_count], VKD3D_DATA_UINT, - (struct vkd3d_shader_src_param *)&ins->src[0]); + shader_sm4_read_src_param(priv, &tokens, &tokens[token_count], VKD3D_DATA_UINT, &ins->src[0]); ins->flags = (opcode_token & VKD3D_SM4_CONDITIONAL_NZ) ? VKD3D_SHADER_CONDITIONAL_OP_NZ : VKD3D_SHADER_CONDITIONAL_OP_Z; } @@ -751,8 +750,7 @@ static void shader_sm4_read_conditional_op(struct vkd3d_shader_instruction *ins, static void shader_sm4_read_case_condition(struct vkd3d_shader_instruction *ins, uint32_t opcode, uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { - shader_sm4_read_src_param(priv, &tokens, &tokens[token_count], VKD3D_DATA_UINT, - (struct vkd3d_shader_src_param *)&ins->src[0]); + shader_sm4_read_src_param(priv, &tokens, &tokens[token_count], VKD3D_DATA_UINT, &ins->src[0]); if (ins->src[0].reg.type != VKD3DSPR_IMMCONST) { FIXME("Switch case value is not a 32-bit constant.\n"); @@ -1130,9 +1128,8 @@ static void shader_sm4_read_dcl_global_flags(struct vkd3d_shader_instruction *in static void shader_sm5_read_fcall(struct vkd3d_shader_instruction *ins, uint32_t opcode, uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { - struct vkd3d_shader_src_param *src_params = (struct vkd3d_shader_src_param *)ins->src; - src_params[0].reg.u.fp_body_idx = *tokens++; - shader_sm4_read_src_param(priv, &tokens, &tokens[token_count], VKD3D_DATA_OPAQUE, &src_params[0]); + ins->src[0].reg.u.fp_body_idx = *tokens++; + shader_sm4_read_src_param(priv, &tokens, &tokens[token_count], VKD3D_DATA_OPAQUE, &ins->src[0]); } static void shader_sm5_read_dcl_function_body(struct vkd3d_shader_instruction *ins, uint32_t opcode, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index ff02cdc3..36d3cd1c 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1126,8 +1126,8 @@ struct vkd3d_shader_instruction uint32_t flags; unsigned int dst_count; unsigned int src_count; - const struct vkd3d_shader_dst_param *dst; - const struct vkd3d_shader_src_param *src; + struct vkd3d_shader_dst_param *dst; + struct vkd3d_shader_src_param *src; struct vkd3d_shader_texel_offset texel_offset; enum vkd3d_shader_resource_type resource_type; unsigned int resource_stride;

1 0