summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Dänzer <mdaenzer@redhat.com>2020-03-17 12:55:34 +0100
committerMichel Dänzer <michel@daenzer.net>2020-07-07 13:47:11 +0000
commit2beefda5a80e5a016c32c1da733f9415a121179d (patch)
treebf05ad2c55bdc3c22020433270ac7694e3f62c8c
parent12af425acd3f4a3a8aa85352857b130b0006b83c (diff)
xwayland: Move xwl_surface_damage definition to xwayland-screen.c
It was already declared in xwayland-screen.h, and only takes a screen parameter, no window ones. Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
-rw-r--r--hw/xwayland/xwayland-screen.c10
-rw-r--r--hw/xwayland/xwayland-window.c10
2 files changed, 10 insertions, 10 deletions
diff --git a/hw/xwayland/xwayland-screen.c b/hw/xwayland/xwayland-screen.c
index 18d8968c7..d248a3901 100644
--- a/hw/xwayland/xwayland-screen.c
+++ b/hw/xwayland/xwayland-screen.c
@@ -513,6 +513,16 @@ xwl_sync_events (struct xwl_screen *xwl_screen)
xwl_read_events (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)
+{
+ 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);
+}
+
void
xwl_screen_roundtrip(struct xwl_screen *xwl_screen)
{
diff --git a/hw/xwayland/xwayland-window.c b/hw/xwayland/xwayland-window.c
index 7c5cfb015..23d2b3086 100644
--- a/hw/xwayland/xwayland-window.c
+++ b/hw/xwayland/xwayland-window.c
@@ -783,16 +783,6 @@ 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);
-}
-
void
xwl_window_post_damage(struct xwl_window *xwl_window)
{