From db248682b3ff8a39eb29469589e35ecddf008c36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Tue, 9 Apr 2024 18:04:07 +0200 Subject: [PATCH] xwayland: Pass xwl_window to xwl_glamor_dri3_syncobj_passthrough Preparation for later changes, no functional change intended. Part-of: --- hw/xwayland/xwayland-glamor-gbm.c | 3 +-- hw/xwayland/xwayland-glamor.h | 2 +- hw/xwayland/xwayland-present.c | 2 +- hw/xwayland/xwayland-window-buffers.c | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/hw/xwayland/xwayland-glamor-gbm.c b/hw/xwayland/xwayland-glamor-gbm.c index b5b0c2a1c..1198ca16b 100644 --- a/hw/xwayland/xwayland-glamor-gbm.c +++ b/hw/xwayland/xwayland-glamor-gbm.c @@ -972,13 +972,12 @@ struct xwl_dri3_syncobj }; void -xwl_glamor_dri3_syncobj_passthrough(WindowPtr window, +xwl_glamor_dri3_syncobj_passthrough(struct xwl_window *xwl_window, struct dri3_syncobj *acquire_syncobj, struct dri3_syncobj *release_syncobj, uint64_t acquire_point, uint64_t release_point) { - struct xwl_window *xwl_window = xwl_window_from_window(window); struct xwl_screen *xwl_screen = xwl_window->xwl_screen; struct xwl_dri3_syncobj *xwl_acquire_syncobj = (struct xwl_dri3_syncobj *)acquire_syncobj; struct xwl_dri3_syncobj *xwl_release_syncobj = (struct xwl_dri3_syncobj *)release_syncobj; diff --git a/hw/xwayland/xwayland-glamor.h b/hw/xwayland/xwayland-glamor.h index bbf930437..ef312a857 100644 --- a/hw/xwayland/xwayland-glamor.h +++ b/hw/xwayland/xwayland-glamor.h @@ -67,7 +67,7 @@ Bool xwl_glamor_supports_syncobjs(struct xwl_screen *xwl_screen); int xwl_glamor_get_fence(struct xwl_screen *screen); void xwl_glamor_wait_fence(struct xwl_screen *xwl_screen, int fence); struct dri3_syncobj *xwl_glamor_dri3_syncobj_create(struct xwl_screen *xwl_screen); -void xwl_glamor_dri3_syncobj_passthrough(WindowPtr window, +void xwl_glamor_dri3_syncobj_passthrough(struct xwl_window *xwl_window, struct dri3_syncobj *acquire_syncobj, struct dri3_syncobj *release_syncobj, uint64_t acquire_point, diff --git a/hw/xwayland/xwayland-present.c b/hw/xwayland/xwayland-present.c index 2153ce6fb..1ac099da9 100644 --- a/hw/xwayland/xwayland-present.c +++ b/hw/xwayland/xwayland-present.c @@ -882,7 +882,7 @@ xwl_present_flip(present_vblank_ptr vblank, RegionPtr damage) #ifdef XWL_HAS_GLAMOR if (vblank->acquire_syncobj && vblank->release_syncobj) { if (xwl_window->xwl_screen->explicit_sync) { - xwl_glamor_dri3_syncobj_passthrough(present_window, + xwl_glamor_dri3_syncobj_passthrough(xwl_window, vblank->acquire_syncobj, vblank->release_syncobj, vblank->acquire_point, diff --git a/hw/xwayland/xwayland-window-buffers.c b/hw/xwayland/xwayland-window-buffers.c index f66f36169..bdae04945 100644 --- a/hw/xwayland/xwayland-window-buffers.c +++ b/hw/xwayland/xwayland-window-buffers.c @@ -393,7 +393,7 @@ xwl_window_buffers_set_syncpts(struct xwl_window_buffer *xwl_window_buffer) else goto fail; - xwl_glamor_dri3_syncobj_passthrough(xwl_window->toplevel, + xwl_glamor_dri3_syncobj_passthrough(xwl_window, xwl_window_buffer->syncobj, xwl_window_buffer->syncobj, acquire_point,