November 2023 - Wine-commits

Giovanni Mascellani : vkd3d-shader/ir: Correctly compute the TEMP count after hull shader flattening.
by Alexandre Julliard 20 Nov '23

20 Nov '23

Module: vkd3d Branch: master Commit: b1123ed35f48017b18fdc27540bb681414fc472f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b1123ed35f48017b18fdc27540bb6… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Nov 16 23:07:27 2023 +0100 vkd3d-shader/ir: Correctly compute the TEMP count after hull shader flattening. The previous computation was incorrect because the count was taken after resetting it to zero (as part of setting the instruction to NOP). --- libs/vkd3d-shader/ir.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 5c88946b..833f5084 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -207,10 +207,15 @@ static void flattener_eliminate_phase_related_dcls(struct hull_flattener *normal { /* Leave only the first temp declaration and set it to the max count later. */ if (!normaliser->max_temp_count) + { + normaliser->max_temp_count = ins->declaration.count; normaliser->temp_dcl_idx = index; + } else + { + normaliser->max_temp_count = max(normaliser->max_temp_count, ins->declaration.count); vkd3d_shader_instruction_make_nop(ins); - normaliser->max_temp_count = max(normaliser->max_temp_count, ins->declaration.count); + } return; }

1 0

Jacek Caban : vkd3d-shader/dxbc: Use return type to return result from read_u32 and read_float.
by Alexandre Julliard 20 Nov '23

20 Nov '23

Module: vkd3d Branch: master Commit: 078cf6a240f0bfb740402b41cda43b35557f0d06 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/078cf6a240f0bfb740402b41cda43… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 17 12:52:19 2023 +0100 vkd3d-shader/dxbc: Use return type to return result from read_u32 and read_float. Avoid implicit casts from enum pointers. --- libs/vkd3d-shader/dxbc.c | 158 +++++++++++++++++++++++++---------------------- 1 file changed, 83 insertions(+), 75 deletions(-)

1 0

Jacek Caban : include: Use GCC-style attributes and builtins on Clang MSVC target.
by Alexandre Julliard 20 Nov '23

20 Nov '23

Module: vkd3d Branch: master Commit: 616bf939314e6c50a73932f742dfb779e807ef4c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/616bf939314e6c50a73932f742dfb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 17 17:52:53 2023 +0100 include: Use GCC-style attributes and builtins on Clang MSVC target. --- include/private/vkd3d_common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index 619665ad..5557df41 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -75,7 +75,7 @@ static inline size_t align(size_t addr, size_t alignment) return (addr + (alignment - 1)) & ~(alignment - 1); } -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__clang__) # define VKD3D_NORETURN __attribute__((noreturn)) # ifdef __MINGW_PRINTF_FORMAT # define VKD3D_PRINTF_FUNC(fmt, args) __attribute__((format(__MINGW_PRINTF_FORMAT, fmt, args)))

1 0

Akihiro Sagawa : vkd3d-shader/hlsl: Add radians() function.
by Alexandre Julliard 20 Nov '23

20 Nov '23

Module: vkd3d Branch: master Commit: e49362713042c458c520359094a1b774c56760d4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e49362713042c458c520359094a1b… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Nov 16 19:54:19 2023 +0900 vkd3d-shader/hlsl: Add radians() function. --- Makefile.am | 1 + libs/vkd3d-shader/hlsl.y | 17 +++++++++++++++++ tests/hlsl/angle-unit.shader_test | 12 ++++++++++++ 3 files changed, 30 insertions(+) diff --git a/Makefile.am b/Makefile.am index 2666194a..7d589819 100644 --- a/Makefile.am +++ b/Makefile.am @@ -46,6 +46,7 @@ vkd3d_cross_tests = \ vkd3d_shader_tests = \ tests/hlsl/abs.shader_test \ tests/hlsl/all.shader_test \ + tests/hlsl/angle-unit.shader_test \ tests/hlsl/any.shader_test \ tests/hlsl/arithmetic-float-uniform.shader_test \ tests/hlsl/arithmetic-float.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 5e0d48d3..a9ff41aa 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3341,6 +3341,22 @@ static bool intrinsic_pow(struct hlsl_ctx *ctx, return !!add_pow_expr(ctx, params->instrs, params->args[0], params->args[1], loc); } +static bool intrinsic_radians(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_node *arg, *rad; + + if (!(arg = intrinsic_float_convert_arg(ctx, params, params->args[0], loc))) + return false; + + /* 1 degree = pi/180 rad = 0.0174532925f rad */ + if (!(rad = hlsl_new_float_constant(ctx, 0.0174532925f, loc))) + return false; + hlsl_block_add_instr(params->instrs, rad); + + return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, arg, rad, loc); +} + static bool intrinsic_reflect(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -3869,6 +3885,7 @@ intrinsic_functions[] = {"mul", 2, true, intrinsic_mul}, {"normalize", 1, true, intrinsic_normalize}, {"pow", 2, true, intrinsic_pow}, + {"radians", 1, true, intrinsic_radians}, {"reflect", 2, true, intrinsic_reflect}, {"round", 1, true, intrinsic_round}, {"rsqrt", 1, true, intrinsic_rsqrt}, diff --git a/tests/hlsl/angle-unit.shader_test b/tests/hlsl/angle-unit.shader_test new file mode 100644 index 00000000..6e0538f9 --- /dev/null +++ b/tests/hlsl/angle-unit.shader_test @@ -0,0 +1,12 @@ +[pixel shader] +uniform float4 a; + +float4 main() : sv_target +{ + return radians(a); +} + +[test] +uniform 0 float4 0.0 30.0 150.0 180.0 +draw quad +probe all rgba (0.0, 0.52359877, 2.61799387, 3.14159265)

1 0

Akihiro Sagawa : vkd3d-shader/hlsl: Add degrees() function.
by Alexandre Julliard 20 Nov '23

20 Nov '23

Module: vkd3d Branch: master Commit: aed2d142cf345305bdf1b37679ce97a123f9b89f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/aed2d142cf345305bdf1b37679ce9… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Nov 16 20:22:37 2023 +0900 vkd3d-shader/hlsl: Add degrees() function. --- libs/vkd3d-shader/hlsl.y | 17 +++++++++++++++++ tests/hlsl/angle-unit.shader_test | 14 ++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index a9ff41aa..242e8307 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2878,6 +2878,22 @@ static bool intrinsic_ddy_coarse(struct hlsl_ctx *ctx, return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_DSY_COARSE, arg, loc); } +static bool intrinsic_degrees(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_node *arg, *deg; + + if (!(arg = intrinsic_float_convert_arg(ctx, params, params->args[0], loc))) + return false; + + /* 1 rad = 180/pi degree = 57.2957795 degree */ + if (!(deg = hlsl_new_float_constant(ctx, 57.2957795f, loc))) + return false; + hlsl_block_add_instr(params->instrs, deg); + + return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, arg, deg, loc); +} + static bool intrinsic_ddy_fine(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -3865,6 +3881,7 @@ intrinsic_functions[] = {"ddy", 1, true, intrinsic_ddy}, {"ddy_coarse", 1, true, intrinsic_ddy_coarse}, {"ddy_fine", 1, true, intrinsic_ddy_fine}, + {"degrees", 1, true, intrinsic_degrees}, {"distance", 2, true, intrinsic_distance}, {"dot", 2, true, intrinsic_dot}, {"exp", 1, true, intrinsic_exp}, diff --git a/tests/hlsl/angle-unit.shader_test b/tests/hlsl/angle-unit.shader_test index 6e0538f9..407d2413 100644 --- a/tests/hlsl/angle-unit.shader_test +++ b/tests/hlsl/angle-unit.shader_test @@ -10,3 +10,17 @@ float4 main() : sv_target uniform 0 float4 0.0 30.0 150.0 180.0 draw quad probe all rgba (0.0, 0.52359877, 2.61799387, 3.14159265) + + +[pixel shader] +uniform float4 a; + +float4 main() : sv_target +{ + return degrees(a); +} + +[test] +uniform 0 float4 0.0 0.78539816 1.57079632 2.35619449 +draw quad +probe all rgba (0.0, 45.0, 90.0, 135.0)

1 0

Alexandros Frantzis : winewayland.drv: Implement vkDestroySurfaceKHR.
by Alexandre Julliard 17 Nov '23

17 Nov '23

Module: wine Branch: master Commit: 51dbd708b08564f39fee902846a16918834af195 URL: https://gitlab.winehq.org/wine/wine/-/commit/51dbd708b08564f39fee902846a169… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Tue Nov 7 13:25:18 2023 +0200 winewayland.drv: Implement vkDestroySurfaceKHR. --- dlls/winewayland.drv/vulkan.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/winewayland.drv/vulkan.c b/dlls/winewayland.drv/vulkan.c index 15e5edf503b..da1b644f9e5 100644 --- a/dlls/winewayland.drv/vulkan.c +++ b/dlls/winewayland.drv/vulkan.c @@ -54,6 +54,7 @@ typedef struct VkWaylandSurfaceCreateInfoKHR static VkResult (*pvkCreateInstance)(const VkInstanceCreateInfo *, const VkAllocationCallbacks *, VkInstance *); static VkResult (*pvkCreateWaylandSurfaceKHR)(VkInstance, const VkWaylandSurfaceCreateInfoKHR *, const VkAllocationCallbacks *, VkSurfaceKHR *); static void (*pvkDestroyInstance)(VkInstance, const VkAllocationCallbacks *); +static void (*pvkDestroySurfaceKHR)(VkInstance, VkSurfaceKHR, const VkAllocationCallbacks *); static VkResult (*pvkEnumerateInstanceExtensionProperties)(const char *, uint32_t *, VkExtensionProperties *); static void * (*pvkGetDeviceProcAddr)(VkDevice, const char *); static void * (*pvkGetInstanceProcAddr)(VkInstance, const char *); @@ -224,6 +225,23 @@ static void wayland_vkDestroyInstance(VkInstance instance, pvkDestroyInstance(instance, NULL /* allocator */); } +static void wayland_vkDestroySurfaceKHR(VkInstance instance, VkSurfaceKHR surface, + const VkAllocationCallbacks *allocator) +{ + struct wine_vk_surface *wine_vk_surface = wine_vk_surface_from_handle(surface); + + TRACE("%p 0x%s %p\n", instance, wine_dbgstr_longlong(surface), allocator); + + if (allocator) + FIXME("Support for allocation callbacks not implemented yet\n"); + + /* vkDestroySurfaceKHR must handle VK_NULL_HANDLE (0) for surface. */ + if (!wine_vk_surface) return; + + pvkDestroySurfaceKHR(instance, wine_vk_surface->native, NULL /* allocator */); + wine_vk_surface_destroy(wine_vk_surface); +} + static VkResult wayland_vkEnumerateInstanceExtensionProperties(const char *layer_name, uint32_t *count, VkExtensionProperties* properties) @@ -317,6 +335,7 @@ static void wine_vk_init(void) LOAD_FUNCPTR(vkCreateInstance); LOAD_FUNCPTR(vkCreateWaylandSurfaceKHR); LOAD_FUNCPTR(vkDestroyInstance); + LOAD_FUNCPTR(vkDestroySurfaceKHR); LOAD_FUNCPTR(vkEnumerateInstanceExtensionProperties); LOAD_FUNCPTR(vkGetDeviceProcAddr); LOAD_FUNCPTR(vkGetInstanceProcAddr); @@ -334,6 +353,7 @@ static const struct vulkan_funcs vulkan_funcs = .p_vkCreateInstance = wayland_vkCreateInstance, .p_vkCreateWin32SurfaceKHR = wayland_vkCreateWin32SurfaceKHR, .p_vkDestroyInstance = wayland_vkDestroyInstance, + .p_vkDestroySurfaceKHR = wayland_vkDestroySurfaceKHR, .p_vkEnumerateInstanceExtensionProperties = wayland_vkEnumerateInstanceExtensionProperties, .p_vkGetDeviceProcAddr = wayland_vkGetDeviceProcAddr, .p_vkGetInstanceProcAddr = wayland_vkGetInstanceProcAddr,

1 0

Alexandros Frantzis : winewayland.drv: Use a client area subsurface as the Vulkan target.
by Alexandre Julliard 17 Nov '23

17 Nov '23

Module: wine Branch: master Commit: 9439b3c3ee695ca46ca99fa40f939137dec93514 URL: https://gitlab.winehq.org/wine/wine/-/commit/9439b3c3ee695ca46ca99fa40f9391… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Tue Nov 7 17:42:05 2023 +0200 winewayland.drv: Use a client area subsurface as the Vulkan target. Since we can't render to parts of surfaces, use a dedicated client area subsurface as the target of Vulkan rendering. --- dlls/winewayland.drv/vulkan.c | 33 +++++++++++++++-- dlls/winewayland.drv/wayland.c | 10 +++++ dlls/winewayland.drv/wayland_surface.c | 67 ++++++++++++++++++++++++++++++++++ dlls/winewayland.drv/waylanddrv.h | 11 ++++++ 4 files changed, 117 insertions(+), 4 deletions(-) diff --git a/dlls/winewayland.drv/vulkan.c b/dlls/winewayland.drv/vulkan.c index da1b644f9e5..be7f048f9d3 100644 --- a/dlls/winewayland.drv/vulkan.c +++ b/dlls/winewayland.drv/vulkan.c @@ -64,7 +64,7 @@ static const struct vulkan_funcs vulkan_funcs; struct wine_vk_surface { - struct wl_surface *client; + struct wayland_client_surface *client; VkSurfaceKHR native; }; @@ -75,7 +75,20 @@ static struct wine_vk_surface *wine_vk_surface_from_handle(VkSurfaceKHR handle) static void wine_vk_surface_destroy(struct wine_vk_surface *wine_vk_surface) { - if (wine_vk_surface->client) wl_surface_destroy(wine_vk_surface->client); + if (wine_vk_surface->client) + { + HWND hwnd = wl_surface_get_user_data(wine_vk_surface->client->wl_surface); + struct wayland_surface *wayland_surface = wayland_surface_lock_hwnd(hwnd); + + if (wayland_client_surface_release(wine_vk_surface->client) && + wayland_surface) + { + wayland_surface->client = NULL; + } + + if (wayland_surface) pthread_mutex_unlock(&wayland_surface->mutex); + } + free(wine_vk_surface); } @@ -166,6 +179,7 @@ static VkResult wayland_vkCreateWin32SurfaceKHR(VkInstance instance, VkResult res; VkWaylandSurfaceCreateInfoKHR create_info_host; struct wine_vk_surface *wine_vk_surface; + struct wayland_surface *wayland_surface; TRACE("%p %p %p %p\n", instance, create_info, allocator, vk_surface); @@ -180,7 +194,18 @@ static VkResult wayland_vkCreateWin32SurfaceKHR(VkInstance instance, goto err; } - wine_vk_surface->client = wl_compositor_create_surface(process_wayland.wl_compositor); + wayland_surface = wayland_surface_lock_hwnd(create_info->hwnd); + if (!wayland_surface) + { + ERR("Failed to find wayland surface for hwnd=%p\n", create_info->hwnd); + /* VK_KHR_win32_surface only allows out of host and device memory as errors. */ + res = VK_ERROR_OUT_OF_HOST_MEMORY; + goto err; + } + + wine_vk_surface->client = wayland_surface_get_client(wayland_surface); + pthread_mutex_unlock(&wayland_surface->mutex); + if (!wine_vk_surface->client) { ERR("Failed to create client surface for hwnd=%p\n", create_info->hwnd); @@ -193,7 +218,7 @@ static VkResult wayland_vkCreateWin32SurfaceKHR(VkInstance instance, create_info_host.pNext = NULL; create_info_host.flags = 0; /* reserved */ create_info_host.display = process_wayland.wl_display; - create_info_host.surface = wine_vk_surface->client; + create_info_host.surface = wine_vk_surface->client->wl_surface; res = pvkCreateWaylandSurfaceKHR(instance, &create_info_host, NULL /* allocator */, diff --git a/dlls/winewayland.drv/wayland.c b/dlls/winewayland.drv/wayland.c index ddb25209804..31cd27f7a76 100644 --- a/dlls/winewayland.drv/wayland.c +++ b/dlls/winewayland.drv/wayland.c @@ -149,6 +149,11 @@ static void registry_handle_global(void *data, struct wl_registry *registry, process_wayland.wp_viewporter = wl_registry_bind(registry, id, &wp_viewporter_interface, 1); } + else if (strcmp(interface, "wl_subcompositor") == 0) + { + process_wayland.wl_subcompositor = + wl_registry_bind(registry, id, &wl_subcompositor_interface, 1); + } } static void registry_handle_global_remove(void *data, struct wl_registry *registry, @@ -249,6 +254,11 @@ BOOL wayland_process_init(void) ERR("Wayland compositor doesn't support wl_shm\n"); return FALSE; } + if (!process_wayland.wl_subcompositor) + { + ERR("Wayland compositor doesn't support wl_subcompositor\n"); + return FALSE; + } wayland_init_display_devices(FALSE); diff --git a/dlls/winewayland.drv/wayland_surface.c b/dlls/winewayland.drv/wayland_surface.c index 8cfefefb969..cdcee27a042 100644 --- a/dlls/winewayland.drv/wayland_surface.c +++ b/dlls/winewayland.drv/wayland_surface.c @@ -687,3 +687,70 @@ void wayland_surface_coords_to_window(struct wayland_surface *surface, *window_x = round(surface_x * surface->window.scale); *window_y = round(surface_y * surface->window.scale); } + +/********************************************************************** + * wayland_client_surface_release + */ +BOOL wayland_client_surface_release(struct wayland_client_surface *client) +{ + if (InterlockedDecrement(&client->ref)) return FALSE; + + if (client->wl_subsurface) + wl_subsurface_destroy(client->wl_subsurface); + if (client->wl_surface) + wl_surface_destroy(client->wl_surface); + + free(client); + + return TRUE; +} + +/********************************************************************** + * wayland_surface_get_client + */ +struct wayland_client_surface *wayland_surface_get_client(struct wayland_surface *surface) +{ + if (surface->client) + { + InterlockedIncrement(&surface->client->ref); + return surface->client; + } + + surface->client = calloc(1, sizeof(*surface->client)); + if (!surface->client) + { + ERR("Failed to allocate space for client surface\n"); + goto err; + } + + surface->client->ref = 1; + + surface->client->wl_surface = + wl_compositor_create_surface(process_wayland.wl_compositor); + if (!surface->client->wl_surface) + { + ERR("Failed to create client wl_surface\n"); + goto err; + } + wl_surface_set_user_data(surface->client->wl_surface, surface->hwnd); + + surface->client->wl_subsurface = + wl_subcompositor_get_subsurface(process_wayland.wl_subcompositor, + surface->client->wl_surface, + surface->wl_surface); + if (!surface->client->wl_subsurface) + { + ERR("Failed to create client wl_subsurface\n"); + goto err; + } + + return surface->client; + +err: + if (surface->client) + { + wayland_client_surface_release(surface->client); + surface->client = NULL; + } + return NULL; +} diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index 9bc6aedf356..928c2f023eb 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -111,6 +111,7 @@ struct wayland struct xdg_wm_base *xdg_wm_base; struct wl_shm *wl_shm; struct wp_viewporter *wp_viewporter; + struct wl_subcompositor *wl_subcompositor; struct wayland_seat seat; struct wayland_keyboard keyboard; struct wayland_pointer pointer; @@ -163,6 +164,13 @@ struct wayland_window_config double scale; }; +struct wayland_client_surface +{ + LONG ref; + struct wl_surface *wl_surface; + struct wl_subsurface *wl_subsurface; +}; + struct wayland_surface { HWND hwnd; @@ -175,6 +183,7 @@ struct wayland_surface struct wayland_shm_buffer *latest_window_buffer; BOOL resizing; struct wayland_window_config window; + struct wayland_client_surface *client; }; struct wayland_shm_buffer @@ -226,6 +235,8 @@ void wayland_surface_coords_from_window(struct wayland_surface *surface, void wayland_surface_coords_to_window(struct wayland_surface *surface, double surface_x, double surface_y, int *window_x, int *window_y) DECLSPEC_HIDDEN; +struct wayland_client_surface *wayland_surface_get_client(struct wayland_surface *surface) DECLSPEC_HIDDEN; +BOOL wayland_client_surface_release(struct wayland_client_surface *client) DECLSPEC_HIDDEN; /********************************************************************** * Wayland SHM buffer

1 0

Alexandros Frantzis : winewayland.drv: Set client area subsurface position.
by Alexandre Julliard 17 Nov '23

17 Nov '23

Module: wine Branch: master Commit: 65a4789a7c8170a3864b0aa5d89106a8bfba25d9 URL: https://gitlab.winehq.org/wine/wine/-/commit/65a4789a7c8170a3864b0aa5d89106… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Mon Nov 6 10:40:59 2023 +0200 winewayland.drv: Set client area subsurface position. Set the position of the client area subsurface relative to its parent surface. --- dlls/winewayland.drv/wayland_surface.c | 26 ++++++++++++++++++++++++++ dlls/winewayland.drv/waylanddrv.h | 1 + dlls/winewayland.drv/window.c | 11 +++++++++-- 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/winewayland.drv/wayland_surface.c b/dlls/winewayland.drv/wayland_surface.c index cdcee27a042..f4a64d19ecd 100644 --- a/dlls/winewayland.drv/wayland_surface.c +++ b/dlls/winewayland.drv/wayland_surface.c @@ -468,6 +468,29 @@ static void wayland_surface_reconfigure_size(struct wayland_surface *surface, } } +/********************************************************************** + * wayland_surface_reconfigure_client + * + * Reconfigures the subsurface covering the client area. + */ +static void wayland_surface_reconfigure_client(struct wayland_surface *surface) +{ + struct wayland_window_config *window = &surface->window; + int client_x, client_y, x, y; + + if (!surface->client) return; + + /* The offset of the client area origin relatively to the window origin. */ + client_x = window->client_rect.left - window->rect.left; + client_y = window->client_rect.top - window->rect.top; + + wayland_surface_coords_from_window(surface, client_x, client_y, &x, &y); + + TRACE("hwnd=%p subsurface=%d,%d\n", surface->hwnd, x, y); + + wl_subsurface_set_position(surface->client->wl_subsurface, x, y); +} + /********************************************************************** * wayland_surface_reconfigure * @@ -525,6 +548,7 @@ BOOL wayland_surface_reconfigure(struct wayland_surface *surface) wayland_surface_reconfigure_geometry(surface, width, height); wayland_surface_reconfigure_size(surface, width, height); + wayland_surface_reconfigure_client(surface); return TRUE; } @@ -744,6 +768,8 @@ struct wayland_client_surface *wayland_surface_get_client(struct wayland_surface goto err; } + wayland_surface_reconfigure_client(surface); + return surface->client; err: diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index 928c2f023eb..2dc49a2fd4b 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -159,6 +159,7 @@ struct wayland_surface_config struct wayland_window_config { RECT rect; + RECT client_rect; enum wayland_surface_config_state state; /* The scale (i.e., normalized dpi) the window is rendering at. */ double scale; diff --git a/dlls/winewayland.drv/window.c b/dlls/winewayland.drv/window.c index 1423164834e..fff3749e9ad 100644 --- a/dlls/winewayland.drv/window.c +++ b/dlls/winewayland.drv/window.c @@ -45,6 +45,8 @@ struct wayland_win_data struct window_surface *window_surface; /* USER window rectangle relative to win32 parent window client area */ RECT window_rect; + /* USER client rectangle relative to win32 parent window client area */ + RECT client_rect; }; static int wayland_win_data_cmp_rb(const void *key, @@ -68,7 +70,8 @@ static struct rb_tree win_data_rb = { wayland_win_data_cmp_rb }; * Create a data window structure for an existing window. */ static struct wayland_win_data *wayland_win_data_create(HWND hwnd, - const RECT *window_rect) + const RECT *window_rect, + const RECT *client_rect) { struct wayland_win_data *data; struct rb_entry *rb_entry; @@ -83,6 +86,7 @@ static struct wayland_win_data *wayland_win_data_create(HWND hwnd, data->hwnd = hwnd; data->window_rect = *window_rect; + data->client_rect = *client_rect; pthread_mutex_lock(&win_data_mutex); @@ -157,6 +161,7 @@ static void wayland_win_data_get_config(struct wayland_win_data *data, DWORD style; conf->rect = data->window_rect; + conf->client_rect = data->client_rect; style = NtUserGetWindowLongW(data->hwnd, GWL_STYLE); TRACE("window=%s style=%#lx\n", wine_dbgstr_rect(&conf->rect), (long)style); @@ -310,7 +315,8 @@ BOOL WAYLAND_WindowPosChanging(HWND hwnd, HWND insert_after, UINT swp_flags, hwnd, wine_dbgstr_rect(window_rect), wine_dbgstr_rect(client_rect), wine_dbgstr_rect(visible_rect), insert_after, swp_flags); - if (!data && !(data = wayland_win_data_create(hwnd, window_rect))) return TRUE; + if (!data && !(data = wayland_win_data_create(hwnd, window_rect, client_rect))) + return TRUE; /* Release the dummy surface wine provides for toplevels. */ if (*surface) window_surface_release(*surface); @@ -361,6 +367,7 @@ void WAYLAND_WindowPosChanged(HWND hwnd, HWND insert_after, UINT swp_flags, if (!data) return; data->window_rect = *window_rect; + data->client_rect = *client_rect; if (surface) window_surface_add_ref(surface); if (data->window_surface) window_surface_release(data->window_surface);

1 0

Alexandros Frantzis : winewayland.drv: Set client area subsurface size.
by Alexandre Julliard 17 Nov '23

17 Nov '23

Module: wine Branch: master Commit: 4c9c991faea025bf63a24a185daf05f99c486a91 URL: https://gitlab.winehq.org/wine/wine/-/commit/4c9c991faea025bf63a24a185daf05… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Wed Nov 8 14:00:18 2023 +0200 winewayland.drv: Set client area subsurface size. Use the viewporter Wayland protocol to set the size of the client area subsurface, so that it always covers the client area bounds exactly. This may transiently lead to scaled contents. --- dlls/winewayland.drv/wayland.c | 5 +++++ dlls/winewayland.drv/wayland_surface.c | 33 ++++++++++++++++++++++++++++++++- dlls/winewayland.drv/waylanddrv.h | 1 + 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/winewayland.drv/wayland.c b/dlls/winewayland.drv/wayland.c index 31cd27f7a76..f7119367543 100644 --- a/dlls/winewayland.drv/wayland.c +++ b/dlls/winewayland.drv/wayland.c @@ -154,6 +154,11 @@ static void registry_handle_global(void *data, struct wl_registry *registry, process_wayland.wl_subcompositor = wl_registry_bind(registry, id, &wl_subcompositor_interface, 1); } + else if (strcmp(interface, "wp_viewporter") == 0) + { + process_wayland.wp_viewporter = + wl_registry_bind(registry, id, &wp_viewporter_interface, 1); + } } static void registry_handle_global_remove(void *data, struct wl_registry *registry, diff --git a/dlls/winewayland.drv/wayland_surface.c b/dlls/winewayland.drv/wayland_surface.c index f4a64d19ecd..b83709c5a8a 100644 --- a/dlls/winewayland.drv/wayland_surface.c +++ b/dlls/winewayland.drv/wayland_surface.c @@ -477,6 +477,7 @@ static void wayland_surface_reconfigure_client(struct wayland_surface *surface) { struct wayland_window_config *window = &surface->window; int client_x, client_y, x, y; + int client_width, client_height, width, height; if (!surface->client) return; @@ -484,11 +485,32 @@ static void wayland_surface_reconfigure_client(struct wayland_surface *surface) client_x = window->client_rect.left - window->rect.left; client_y = window->client_rect.top - window->rect.top; + client_width = window->client_rect.right - window->client_rect.left; + client_height = window->client_rect.bottom - window->client_rect.top; + wayland_surface_coords_from_window(surface, client_x, client_y, &x, &y); + wayland_surface_coords_from_window(surface, client_width, client_height, + &width, &height); - TRACE("hwnd=%p subsurface=%d,%d\n", surface->hwnd, x, y); + TRACE("hwnd=%p subsurface=%d,%d+%dx%d\n", surface->hwnd, x, y, width, height); wl_subsurface_set_position(surface->client->wl_subsurface, x, y); + + if (surface->client->wp_viewport) + { + if (width != 0 && height != 0) + { + wp_viewport_set_destination(surface->client->wp_viewport, + width, height); + } + else + { + /* We can't have a 0x0 destination, use 1x1 instead. */ + wp_viewport_set_destination(surface->client->wp_viewport, 1, 1); + } + } + + wl_surface_commit(surface->client->wl_surface); } /********************************************************************** @@ -719,6 +741,8 @@ BOOL wayland_client_surface_release(struct wayland_client_surface *client) { if (InterlockedDecrement(&client->ref)) return FALSE; + if (client->wp_viewport) + wp_viewport_destroy(client->wp_viewport); if (client->wl_subsurface) wl_subsurface_destroy(client->wl_subsurface); if (client->wl_surface) @@ -768,6 +792,13 @@ struct wayland_client_surface *wayland_surface_get_client(struct wayland_surface goto err; } + if (process_wayland.wp_viewporter) + { + surface->client->wp_viewport = + wp_viewporter_get_viewport(process_wayland.wp_viewporter, + surface->client->wl_surface); + } + wayland_surface_reconfigure_client(surface); return surface->client; diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index 2dc49a2fd4b..00c9112d5de 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -170,6 +170,7 @@ struct wayland_client_surface LONG ref; struct wl_surface *wl_surface; struct wl_subsurface *wl_subsurface; + struct wp_viewport *wp_viewport; }; struct wayland_surface

1 0

Alexandros Frantzis : winewayland.drv: Forward all client surface pointer events to parent.
by Alexandre Julliard 17 Nov '23

17 Nov '23

Module: wine Branch: master Commit: 7e4985212b8efcc1d07e2ac4db469697e864c766 URL: https://gitlab.winehq.org/wine/wine/-/commit/7e4985212b8efcc1d07e2ac4db4696… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Tue Nov 7 16:18:38 2023 +0200 winewayland.drv: Forward all client surface pointer events to parent. Set an empty input region for the client area surface, so that the compositor forwards input events to the main/parent surface instead. This simplifies input handling, since otherwise we would need to implement special handling of events on the client area surface and transform them accordingly. --- dlls/winewayland.drv/wayland_surface.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/winewayland.drv/wayland_surface.c b/dlls/winewayland.drv/wayland_surface.c index b83709c5a8a..5a808b3ac96 100644 --- a/dlls/winewayland.drv/wayland_surface.c +++ b/dlls/winewayland.drv/wayland_surface.c @@ -758,6 +758,8 @@ BOOL wayland_client_surface_release(struct wayland_client_surface *client) */ struct wayland_client_surface *wayland_surface_get_client(struct wayland_surface *surface) { + struct wl_region *empty_region; + if (surface->client) { InterlockedIncrement(&surface->client->ref); @@ -782,6 +784,16 @@ struct wayland_client_surface *wayland_surface_get_client(struct wayland_surface } wl_surface_set_user_data(surface->client->wl_surface, surface->hwnd); + /* Let parent handle all pointer events. */ + empty_region = wl_compositor_create_region(process_wayland.wl_compositor); + if (!empty_region) + { + ERR("Failed to create wl_region\n"); + goto err; + } + wl_surface_set_input_region(surface->client->wl_surface, empty_region); + wl_region_destroy(empty_region); + surface->client->wl_subsurface = wl_subcompositor_get_subsurface(process_wayland.wl_subcompositor, surface->client->wl_surface,

1 0