fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2025-12-20 12:50:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

xwayland/present: Only flip if the window pixmap dimensions match

Browse source 
If they don't, attaching the new buffer changes the dimensions of the
wl_surface representing the window, which can break stuff as described
in https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2044 .

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2047>
This commit is contained in:
Michel Dänzer 2025-07-16 16:30:53 +02:00 • committed by Marge Bot
parent 94e01f7d5c
commit 010c00828a
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
hw/xwayland/xwayland-present.c
View file

@ -741,6 +741,7 @@ xwl_present_check_flip(RRCrtcPtr crtc,
WindowPtr toplvl_window = xwl_present_toplvl_pixmap_window(present_window); WindowPtr toplvl_window = xwl_present_toplvl_pixmap_window(present_window);
struct xwl_window *xwl_window = xwl_window_from_window(present_window); struct xwl_window *xwl_window = xwl_window_from_window(present_window);
ScreenPtr screen = pixmap->drawable.pScreen; ScreenPtr screen = pixmap->drawable.pScreen;
PixmapPtr window_pixmap = screen->GetWindowPixmap(present_window);
if (reason) if (reason)
*reason = PRESENT_FLIP_REASON_UNKNOWN; *reason = PRESENT_FLIP_REASON_UNKNOWN;
@ -761,9 +762,11 @@ xwl_present_check_flip(RRCrtcPtr crtc,
if (valid) if (valid)
return FALSE; return FALSE;
/* Flip pixmap must have same dimensions as window */ /* Flip pixmap must have same dimensions as the window and its pixmap */
if (present_window->drawable.width != pixmap->drawable.width || if (present_window->drawable.width != pixmap->drawable.width ||
present_window->drawable.height != pixmap->drawable.height) present_window->drawable.height != pixmap->drawable.height ||
pixmap->drawable.width != window_pixmap->drawable.width ||
pixmap->drawable.height != window_pixmap->drawable.height)
return FALSE; return FALSE;
if (!xwl_pixmap_get_wl_buffer(pixmap)) if (!xwl_pixmap_get_wl_buffer(pixmap))
@ -781,7 +784,7 @@ xwl_present_check_flip(RRCrtcPtr crtc,
* window's, e.g. because a client redirected this window or one of its * window's, e.g. because a client redirected this window or one of its
* parents. * parents.
*/ */
if (screen->GetWindowPixmap(xwl_window->surface_window) != screen->GetWindowPixmap(present_window)) if (screen->GetWindowPixmap(xwl_window->surface_window) != window_pixmap)
return FALSE; return FALSE;
/* /*