[PATCH 0/2] MR7995: winewayland: Support shaped and transparent windows (alternative version)
This is based on https://gitlab.winehq.org/wine/wine/-/merge_requests/6025 but differs from it in that it switches to ARGB buffers dynamically, only when needed. This approach avoids the cost of manual handling opacity in non-shaped windows, and also the potential second-order performance effects (see https://gitlab.winehq.org/wine/wine/-/merge_requests/6025#note_75560). -- https://gitlab.winehq.org/wine/wine/-/merge_requests/7995
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winewayland.drv/window_surface.c | 30 +++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/winewayland.drv/window_surface.c b/dlls/winewayland.drv/window_surface.c index 33cffad67af..f3bda116e6d 100644 --- a/dlls/winewayland.drv/window_surface.c +++ b/dlls/winewayland.drv/window_surface.c @@ -336,6 +336,34 @@ static void wayland_shm_buffer_copy(struct wayland_shm_buffer *src, src->format == WL_SHM_FORMAT_XRGB8888 && dst->format == WL_SHM_FORMAT_ARGB8888); } +/********************************************************************** + * wayland_shm_buffer_copy_shape + */ +static void wayland_shm_buffer_copy_shape(struct wayland_shm_buffer *buffer, const RECT *dirty, + const BITMAPINFO *shape_info, const void *shape_bits) +{ + RECT dst_rect = {0, 0, buffer->width, buffer->height}; + UINT32 *color, shape_stride, color_stride, x, y; + const BYTE *shape; + RECT rect; + + shape_stride = shape_info->bmiHeader.biSizeImage / abs(shape_info->bmiHeader.biHeight); + color_stride = dst_rect.right - dst_rect.left; + + if (!intersect_rect(&rect, &dst_rect, dirty)) return; + + color = (UINT32 *)buffer->map_data + rect.top * color_stride; + shape = (const BYTE *)shape_bits + rect.top * shape_stride; + + for (y = rect.top; y < rect.bottom; y++, color += color_stride, shape += shape_stride) + { + for (x = rect.left; x < rect.right; x++) + { + if (!(shape[x / 8] & (1 << (7 - (x & 7))))) color[x] = 0; + } + } +} + /*********************************************************************** * wayland_window_surface_flush */ @@ -412,6 +440,8 @@ static BOOL wayland_window_surface_flush(struct window_surface *window_surface, wayland_shm_buffer_copy_data(shm_buffer, color_bits, &surface_rect, copy_from_window_region, !!shape_bits); + if (shape_bits) wayland_shm_buffer_copy_shape(shm_buffer, rect, shape_info, shape_bits); + NtGdiSetRectRgn(shm_buffer->damage_region, 0, 0, 0, 0); flushed = set_window_surface_contents(window_surface->hwnd, shm_buffer, surface_damage_region); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/7995
From: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> When we detect a shaped window, switch to ARGB buffers in order to be able to apply the shape (in a follow-up commit). --- dlls/winewayland.drv/wayland_surface.c | 1 + dlls/winewayland.drv/waylanddrv.h | 1 + dlls/winewayland.drv/window_surface.c | 66 +++++++++++++++++++------- 3 files changed, 52 insertions(+), 16 deletions(-) diff --git a/dlls/winewayland.drv/wayland_surface.c b/dlls/winewayland.drv/wayland_surface.c index 99049f4e536..d0385f03a4e 100644 --- a/dlls/winewayland.drv/wayland_surface.c +++ b/dlls/winewayland.drv/wayland_surface.c @@ -802,6 +802,7 @@ struct wayland_shm_buffer *wayland_shm_buffer_create(int width, int height, shm_buffer->ref = 1; shm_buffer->width = width; shm_buffer->height = height; + shm_buffer->format = format; shm_buffer->map_size = size; shm_buffer->damage_region = NtGdiCreateRectRgn(0, 0, width, height); diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index 24df4c66184..7ed3f75e3f3 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -246,6 +246,7 @@ struct wayland_shm_buffer struct wl_list link; struct wl_buffer *wl_buffer; int width, height; + uint32_t format; void *map_data; size_t map_size; BOOL busy; diff --git a/dlls/winewayland.drv/window_surface.c b/dlls/winewayland.drv/window_surface.c index 36bbb2d4f67..33cffad67af 100644 --- a/dlls/winewayland.drv/window_surface.c +++ b/dlls/winewayland.drv/window_surface.c @@ -38,6 +38,7 @@ struct wayland_buffer_queue struct wl_list buffer_list; int width; int height; + uint32_t format; }; struct wayland_window_surface @@ -101,7 +102,8 @@ static void wayland_buffer_queue_destroy(struct wayland_buffer_queue *queue) * * Creates a buffer queue containing buffers with the specified width and height. */ -static struct wayland_buffer_queue *wayland_buffer_queue_create(int width, int height) +static struct wayland_buffer_queue *wayland_buffer_queue_create(int width, int height, + uint32_t format) { struct wayland_buffer_queue *queue; @@ -112,6 +114,7 @@ static struct wayland_buffer_queue *wayland_buffer_queue_create(int width, int h if (!queue->wl_event_queue) goto err; queue->width = width; queue->height = height; + queue->format = format; wl_list_init(&queue->buffer_list); @@ -153,7 +156,7 @@ static struct wayland_shm_buffer *wayland_buffer_queue_get_free_buffer(struct wa if (nbuffers < 3) { shm_buffer = wayland_shm_buffer_create(queue->width, queue->height, - WL_SHM_FORMAT_XRGB8888); + queue->format); if (shm_buffer) { /* Buffer events go to their own queue so that we can dispatch @@ -241,7 +244,7 @@ RGNDATA *get_region_data(HRGN region) */ static void copy_pixel_region(const char *src_pixels, RECT *src_rect, char *dst_pixels, RECT *dst_rect, - HRGN region) + HRGN region, BOOL force_opaque) { static const int bpp = WINEWAYLAND_BYTES_PER_PIXEL; RGNDATA *rgndata = get_region_data(region); @@ -261,7 +264,7 @@ static void copy_pixel_region(const char *src_pixels, RECT *src_rect, { const char *src; char *dst; - int y, width_bytes, height; + int x, y, width, height; RECT rc; TRACE("rect %s\n", wine_dbgstr_rect(rgn_rect)); @@ -271,21 +274,39 @@ static void copy_pixel_region(const char *src_pixels, RECT *src_rect, src = src_pixels + (rc.top - src_rect->top) * src_stride + (rc.left - src_rect->left) * bpp; dst = dst_pixels + (rc.top - dst_rect->top) * dst_stride + (rc.left - dst_rect->left) * bpp; - width_bytes = (rc.right - rc.left) * bpp; + width = rc.right - rc.left; height = rc.bottom - rc.top; /* Fast path for full width rectangles. */ - if (width_bytes == src_stride && width_bytes == dst_stride) + if (width * bpp == src_stride && src_stride == dst_stride) { - memcpy(dst, src, height * width_bytes); + if (force_opaque) + { + for (x = 0; x < height * width; ++x) + ((UINT32 *)dst)[x] = ((UINT32 *)src)[x] | 0xff000000; + } + else memcpy(dst, src, height * width * 4); continue; } - for (y = 0; y < height; y++) + if (force_opaque) { - memcpy(dst, src, width_bytes); - src += src_stride; - dst += dst_stride; + for (y = 0; y < height; y++) + { + for (x = 0; x < width; ++x) + ((UINT32 *)dst)[x] = ((UINT32 *)src)[x] | 0xff000000; + src += src_stride; + dst += dst_stride; + } + } + else + { + for (y = 0; y < height; y++) + { + memcpy(dst, src, width * 4); + src += src_stride; + dst += dst_stride; + } } } @@ -297,11 +318,11 @@ static void copy_pixel_region(const char *src_pixels, RECT *src_rect, */ static void wayland_shm_buffer_copy_data(struct wayland_shm_buffer *buffer, const char *bits, RECT *rect, - HRGN region) + HRGN region, BOOL force_opaque) { RECT buffer_rect = {0, 0, buffer->width, buffer->height}; TRACE("buffer=%p bits=%p rect=%s\n", buffer, bits, wine_dbgstr_rect(rect)); - copy_pixel_region(bits, rect, buffer->map_data, &buffer_rect, region); + copy_pixel_region(bits, rect, buffer->map_data, &buffer_rect, region, force_opaque); } static void wayland_shm_buffer_copy(struct wayland_shm_buffer *src, @@ -311,7 +332,8 @@ static void wayland_shm_buffer_copy(struct wayland_shm_buffer *src, RECT src_rect = {0, 0, src->width, src->height}; RECT dst_rect = {0, 0, dst->width, dst->height}; TRACE("src=%p dst=%p\n", src, dst); - copy_pixel_region(src->map_data, &src_rect, dst->map_data, &dst_rect, region); + copy_pixel_region(src->map_data, &src_rect, dst->map_data, &dst_rect, region, + src->format == WL_SHM_FORMAT_XRGB8888 && dst->format == WL_SHM_FORMAT_ARGB8888); } /*********************************************************************** @@ -327,6 +349,7 @@ static BOOL wayland_window_surface_flush(struct window_surface *window_surface, BOOL flushed = FALSE; HRGN surface_damage_region = NULL; HRGN copy_from_window_region; + uint32_t buffer_format; surface_damage_region = NtGdiCreateRectRgn(rect->left + dirty->left, rect->top + dirty->top, rect->left + dirty->right, rect->top + dirty->bottom); @@ -336,6 +359,16 @@ static BOOL wayland_window_surface_flush(struct window_surface *window_surface, goto done; } + buffer_format = shape_bits ? WL_SHM_FORMAT_ARGB8888 : WL_SHM_FORMAT_XRGB8888; + if (wws->wayland_buffer_queue->format != buffer_format) + { + int width = wws->wayland_buffer_queue->width; + int height = wws->wayland_buffer_queue->height; + TRACE("recreating buffer queue with format %d\n", buffer_format); + wayland_buffer_queue_destroy(wws->wayland_buffer_queue); + wws->wayland_buffer_queue = wayland_buffer_queue_create(width, height, buffer_format); + } + wayland_buffer_queue_add_damage(wws->wayland_buffer_queue, surface_damage_region); shm_buffer = wayland_buffer_queue_get_free_buffer(wws->wayland_buffer_queue); @@ -377,7 +410,8 @@ static BOOL wayland_window_surface_flush(struct window_surface *window_surface, copy_from_window_region = shm_buffer->damage_region; } - wayland_shm_buffer_copy_data(shm_buffer, color_bits, &surface_rect, copy_from_window_region); + wayland_shm_buffer_copy_data(shm_buffer, color_bits, &surface_rect, copy_from_window_region, + !!shape_bits); NtGdiSetRectRgn(shm_buffer->damage_region, 0, 0, 0, 0); flushed = set_window_surface_contents(window_surface->hwnd, shm_buffer, surface_damage_region); @@ -433,7 +467,7 @@ static struct window_surface *wayland_window_surface_create(HWND hwnd, const REC if ((window_surface = window_surface_create(sizeof(*wws), &wayland_window_surface_funcs, hwnd, rect, info, 0))) { struct wayland_window_surface *wws = wayland_window_surface_cast(window_surface); - wws->wayland_buffer_queue = wayland_buffer_queue_create(width, height); + wws->wayland_buffer_queue = wayland_buffer_queue_create(width, height, WL_SHM_FORMAT_XRGB8888); } return window_surface; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/7995
Rémi Bernon (@rbernon) commented about dlls/winewayland.drv/window_surface.c:
goto done; }
+ buffer_format = shape_bits ? WL_SHM_FORMAT_ARGB8888 : WL_SHM_FORMAT_XRGB8888; + if (wws->wayland_buffer_queue->format != buffer_format)
I haven't looked into detail but this doesn't seem to work for whole window opacity (set with `SetLayeredWindowAttributes( hwnd, 0, 255 * 70 / 100, LWA_ALPHA )`) or `UpdateLayeredWindow` per-pixel alpha either. There's maybe something to do with `window_surface->alpha_mask != 0`, which also indicates per-pixel alpha, and should probably trigger usage of ARGB, but that doesn't seem to be enough. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/7995#note_102971
On Mon May 12 10:23:02 2025 +0000, Rémi Bernon wrote:
I haven't looked into detail but this doesn't seem to work for whole window opacity (set with `SetLayeredWindowAttributes( hwnd, 0, 255 * 70 / 100, LWA_ALPHA )`) or `UpdateLayeredWindow` per-pixel alpha either. There's maybe something to do with `window_surface->alpha_mask != 0`, which also indicates per-pixel alpha, and should probably trigger usage of ARGB, but that doesn't seem to be enough. Hi @rbernon, indeed this MR doesn't support layered windows, it is just targeting "shaped" windows (i.e., the ones that end up with non-NULL `shape_bits` at the driver level). Perhaps I should amend the title to leave out the "transparent" part to make this clearer?
My current (very) WIP efforts to support layered windows (on top of this branch) are: https://gitlab.winehq.org/afrantzis/wine/-/commits/wip/wayland-window-shape-... -- https://gitlab.winehq.org/wine/wine/-/merge_requests/7995#note_102987
This merge request was approved by Rémi Bernon. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/7995
On Mon May 12 11:55:55 2025 +0000, Alexandros Frantzis wrote:
Hi @rbernon, indeed this MR doesn't support layered windows, it is just targeting "shaped" windows (i.e., the ones that end up with non-NULL `shape_bits` at the driver level). Perhaps I should amend the title to leave out the "transparent" part to make this clearer? My current (very) WIP efforts to support layered windows (on top of this branch) are: https://gitlab.winehq.org/afrantzis/wine/-/commits/wip/wayland-window-shape-... Okay, I though maybe this would do both at once, but fine by me if it's done separately.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/7995#note_102994
participants (3)
-
Alexandros Frantzis -
Alexandros Frantzis (＠afrantzis)
-
Rémi Bernon