frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xwayland: Pass xwl_window to xwl_glamor_dri3_syncobj_passthrough 

Preparation for later changes, no functional change intended.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1300>
This commit is contained in:
Michel Dänzer 2024-04-09 18:04:07 +02:00 committed by Marge Bot
parent d3448f7aad
commit db248682b3
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/xwayland/xwayland-glamor-gbm.c
View File

@ -972,13 +972,12 @@ struct xwl_dri3_syncobj
}; };
void 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 *acquire_syncobj,
struct dri3_syncobj *release_syncobj, struct dri3_syncobj *release_syncobj,
uint64_t acquire_point, uint64_t acquire_point,
uint64_t release_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_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_acquire_syncobj = (struct xwl_dri3_syncobj *)acquire_syncobj;
struct xwl_dri3_syncobj *xwl_release_syncobj = (struct xwl_dri3_syncobj *)release_syncobj; struct xwl_dri3_syncobj *xwl_release_syncobj = (struct xwl_dri3_syncobj *)release_syncobj;

2
hw/xwayland/xwayland-glamor.h
View File

@ -67,7 +67,7 @@ Bool xwl_glamor_supports_syncobjs(struct xwl_screen *xwl_screen);
int xwl_glamor_get_fence(struct xwl_screen *screen); int xwl_glamor_get_fence(struct xwl_screen *screen);
void xwl_glamor_wait_fence(struct xwl_screen *xwl_screen, int fence); 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); 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 *acquire_syncobj,
struct dri3_syncobj *release_syncobj, struct dri3_syncobj *release_syncobj,
uint64_t acquire_point, uint64_t acquire_point,

2
hw/xwayland/xwayland-present.c
View File

@ -882,7 +882,7 @@ xwl_present_flip(present_vblank_ptr vblank, RegionPtr damage)
#ifdef XWL_HAS_GLAMOR #ifdef XWL_HAS_GLAMOR
if (vblank->acquire_syncobj && vblank->release_syncobj) { if (vblank->acquire_syncobj && vblank->release_syncobj) {
if (xwl_window->xwl_screen->explicit_sync) { 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->acquire_syncobj,
vblank->release_syncobj, vblank->release_syncobj,
vblank->acquire_point, vblank->acquire_point,

2
hw/xwayland/xwayland-window-buffers.c
View File

@ -393,7 +393,7 @@ xwl_window_buffers_set_syncpts(struct xwl_window_buffer *xwl_window_buffer)
else else
goto fail; 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,
xwl_window_buffer->syncobj, xwl_window_buffer->syncobj,
acquire_point, acquire_point,