1e468bc44a
- backport from stable "xserver-1.20-branch" up to commit ad7364d8d (for mutter fullscreen unredirect on Wayland) - Update videodrv minor ABI as 1.20.7 changed the minor ABI version (backward compatible, API addition in glamor) - Rebase Xwayland randr resolution change emulation support patches
156 lines
6.6 KiB
Diff
156 lines
6.6 KiB
Diff
From 4f06238e319c604638693f5eb452211210b14abf Mon Sep 17 00:00:00 2001
|
|
From: Robert Mader <robert.mader@posteo.de>
|
|
Date: Tue, 2 Jul 2019 12:03:12 +0200
|
|
Subject: [PATCH xserver 03/17] xwayland: Use buffer_damage instead of surface
|
|
damage if available
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
When a viewport is set, damage will only work properly when using
|
|
wl_surface_damage_buffer instead of wl_surface_damage.
|
|
|
|
When no viewport is set, there should be no difference between
|
|
surface and buffer damage.
|
|
|
|
This is a preparation patch for using viewport to add support for fake
|
|
mode-changes through xrandr for apps which want to change the resolution
|
|
when going fullscreen.
|
|
|
|
Changes by Hans de Goede <hdegoede@redhat.com>:
|
|
-Split the damage changes out into their own patch
|
|
-Add xwl_surface_damage helper
|
|
-Also use buffer_damage / the new helper for the present and cursor code
|
|
|
|
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
|
|
Acked-by: Michel Dänzer <mdaenzer@redhat.com>
|
|
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
---
|
|
hw/xwayland/xwayland-cursor.c | 12 ++++++------
|
|
hw/xwayland/xwayland-present.c | 6 +++---
|
|
hw/xwayland/xwayland.c | 29 +++++++++++++++++++++++------
|
|
hw/xwayland/xwayland.h | 3 +++
|
|
4 files changed, 35 insertions(+), 15 deletions(-)
|
|
|
|
diff --git a/hw/xwayland/xwayland-cursor.c b/hw/xwayland/xwayland-cursor.c
|
|
index 66720bcc0..cbc715061 100644
|
|
--- a/hw/xwayland/xwayland-cursor.c
|
|
+++ b/hw/xwayland/xwayland-cursor.c
|
|
@@ -165,9 +165,9 @@ xwl_seat_set_cursor(struct xwl_seat *xwl_seat)
|
|
xwl_seat->x_cursor->bits->yhot);
|
|
wl_surface_attach(xwl_cursor->surface,
|
|
xwl_shm_pixmap_get_wl_buffer(pixmap), 0, 0);
|
|
- wl_surface_damage(xwl_cursor->surface, 0, 0,
|
|
- xwl_seat->x_cursor->bits->width,
|
|
- xwl_seat->x_cursor->bits->height);
|
|
+ xwl_surface_damage(xwl_seat->xwl_screen, xwl_cursor->surface, 0, 0,
|
|
+ xwl_seat->x_cursor->bits->width,
|
|
+ xwl_seat->x_cursor->bits->height);
|
|
|
|
xwl_cursor->frame_cb = wl_surface_frame(xwl_cursor->surface);
|
|
wl_callback_add_listener(xwl_cursor->frame_cb, &frame_listener, xwl_cursor);
|
|
@@ -217,9 +217,9 @@ xwl_tablet_tool_set_cursor(struct xwl_tablet_tool *xwl_tablet_tool)
|
|
xwl_seat->x_cursor->bits->yhot);
|
|
wl_surface_attach(xwl_cursor->surface,
|
|
xwl_shm_pixmap_get_wl_buffer(pixmap), 0, 0);
|
|
- wl_surface_damage(xwl_cursor->surface, 0, 0,
|
|
- xwl_seat->x_cursor->bits->width,
|
|
- xwl_seat->x_cursor->bits->height);
|
|
+ xwl_surface_damage(xwl_seat->xwl_screen, xwl_cursor->surface, 0, 0,
|
|
+ xwl_seat->x_cursor->bits->width,
|
|
+ xwl_seat->x_cursor->bits->height);
|
|
|
|
xwl_cursor->frame_cb = wl_surface_frame(xwl_cursor->surface);
|
|
wl_callback_add_listener(xwl_cursor->frame_cb, &frame_listener, xwl_cursor);
|
|
diff --git a/hw/xwayland/xwayland-present.c b/hw/xwayland/xwayland-present.c
|
|
index c7c077aaa..e583708cb 100644
|
|
--- a/hw/xwayland/xwayland-present.c
|
|
+++ b/hw/xwayland/xwayland-present.c
|
|
@@ -495,9 +495,9 @@ xwl_present_flip(WindowPtr present_window,
|
|
/* Realign timer */
|
|
xwl_present_reset_timer(xwl_present_window);
|
|
|
|
- wl_surface_damage(xwl_window->surface, 0, 0,
|
|
- damage_box->x2 - damage_box->x1,
|
|
- damage_box->y2 - damage_box->y1);
|
|
+ xwl_surface_damage(xwl_window->xwl_screen, xwl_window->surface, 0, 0,
|
|
+ damage_box->x2 - damage_box->x1,
|
|
+ damage_box->y2 - damage_box->y1);
|
|
|
|
wl_surface_commit(xwl_window->surface);
|
|
|
|
diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c
|
|
index 13b298f7f..87185e6f3 100644
|
|
--- a/hw/xwayland/xwayland.c
|
|
+++ b/hw/xwayland/xwayland.c
|
|
@@ -796,6 +796,16 @@ xwl_destroy_window(WindowPtr window)
|
|
return ret;
|
|
}
|
|
|
|
+void xwl_surface_damage(struct xwl_screen *xwl_screen,
|
|
+ struct wl_surface *surface,
|
|
+ int32_t x, int32_t y, int32_t width, int32_t height)
|
|
+{
|
|
+ if (wl_surface_get_version(surface) >= WL_SURFACE_DAMAGE_BUFFER_SINCE_VERSION)
|
|
+ wl_surface_damage_buffer(surface, x, y, width, height);
|
|
+ else
|
|
+ wl_surface_damage(surface, x, y, width, height);
|
|
+}
|
|
+
|
|
static void
|
|
xwl_window_post_damage(struct xwl_window *xwl_window)
|
|
{
|
|
@@ -832,13 +842,15 @@ xwl_window_post_damage(struct xwl_window *xwl_window)
|
|
*/
|
|
if (RegionNumRects(region) > 256) {
|
|
box = RegionExtents(region);
|
|
- wl_surface_damage(xwl_window->surface, box->x1, box->y1,
|
|
- box->x2 - box->x1, box->y2 - box->y1);
|
|
+ xwl_surface_damage(xwl_screen, xwl_window->surface, box->x1, box->y1,
|
|
+ box->x2 - box->x1, box->y2 - box->y1);
|
|
} else {
|
|
box = RegionRects(region);
|
|
- for (i = 0; i < RegionNumRects(region); i++, box++)
|
|
- wl_surface_damage(xwl_window->surface, box->x1, box->y1,
|
|
- box->x2 - box->x1, box->y2 - box->y1);
|
|
+ for (i = 0; i < RegionNumRects(region); i++, box++) {
|
|
+ xwl_surface_damage(xwl_screen, xwl_window->surface,
|
|
+ box->x1, box->y1,
|
|
+ box->x2 - box->x1, box->y2 - box->y1);
|
|
+ }
|
|
}
|
|
|
|
xwl_window_create_frame_callback(xwl_window);
|
|
@@ -897,8 +909,13 @@ registry_global(void *data, struct wl_registry *registry, uint32_t id,
|
|
struct xwl_screen *xwl_screen = data;
|
|
|
|
if (strcmp(interface, "wl_compositor") == 0) {
|
|
+ uint32_t request_version = 1;
|
|
+
|
|
+ if (version >= WL_SURFACE_DAMAGE_BUFFER_SINCE_VERSION)
|
|
+ request_version = WL_SURFACE_DAMAGE_BUFFER_SINCE_VERSION;
|
|
+
|
|
xwl_screen->compositor =
|
|
- wl_registry_bind(registry, id, &wl_compositor_interface, 1);
|
|
+ wl_registry_bind(registry, id, &wl_compositor_interface, request_version);
|
|
}
|
|
else if (strcmp(interface, "wl_shm") == 0) {
|
|
xwl_screen->shm = wl_registry_bind(registry, id, &wl_shm_interface, 1);
|
|
diff --git a/hw/xwayland/xwayland.h b/hw/xwayland/xwayland.h
|
|
index 042e107ce..07baa09e2 100644
|
|
--- a/hw/xwayland/xwayland.h
|
|
+++ b/hw/xwayland/xwayland.h
|
|
@@ -382,6 +382,9 @@ struct xwl_output {
|
|
void xwl_window_create_frame_callback(struct xwl_window *xwl_window);
|
|
|
|
void xwl_sync_events (struct xwl_screen *xwl_screen);
|
|
+void xwl_surface_damage(struct xwl_screen *xwl_screen,
|
|
+ struct wl_surface *surface,
|
|
+ int32_t x, int32_t y, int32_t width, int32_t height);
|
|
|
|
Bool xwl_screen_init_cursor(struct xwl_screen *xwl_screen);
|
|
|
|
--
|
|
2.24.1
|
|
|