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

xwayland: Refactor xwl_present_for_each_frame_callback helper 

Preparation for following changes, no functional change intended.
This commit is contained in:
Michel Dänzer 2023-03-09 18:44:25 +01:00 committed by Michel Dänzer
parent fc625fe172
commit 4d1cd7cdc2
3 changed files with 20 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,6 +89,18 @@ xwl_present_event_from_id(uint64_t event_id)
return (struct xwl_present_event*)(uintptr_t)event_id; return (struct xwl_present_event*)(uintptr_t)event_id;
} }
void
xwl_present_for_each_frame_callback(struct xwl_window *xwl_window,
void iter_func(struct xwl_present_window *))
{
struct xwl_present_window *xwl_present_window, *tmp;
xorg_list_for_each_entry_safe(xwl_present_window, tmp,
&xwl_window->frame_callback_list,
frame_callback_list)
iter_func(xwl_present_window);
}
static void static void
xwl_present_free_timer(struct xwl_present_window *xwl_present_window) xwl_present_free_timer(struct xwl_present_window *xwl_present_window)
{ {

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

@ -61,6 +61,8 @@ struct xwl_present_event {
PixmapPtr pixmap; PixmapPtr pixmap;
}; };
void xwl_present_for_each_frame_callback(struct xwl_window *xwl_window,
void iter_func(struct xwl_present_window *));
void xwl_present_reset_timer(struct xwl_present_window *xwl_present_window); void xwl_present_reset_timer(struct xwl_present_window *xwl_present_window);
void xwl_present_frame_callback(struct xwl_present_window *xwl_present_window); void xwl_present_frame_callback(struct xwl_present_window *xwl_present_window);
Bool xwl_present_init(ScreenPtr screen); Bool xwl_present_init(ScreenPtr screen);

33
hw/xwayland/xwayland-window.c
View File

@ -1090,15 +1090,8 @@ xwl_unrealize_window(WindowPtr window)
xwl_dmabuf_feedback_destroy(&xwl_window->feedback); xwl_dmabuf_feedback_destroy(&xwl_window->feedback);
#ifdef GLAMOR_HAS_GBM #ifdef GLAMOR_HAS_GBM
if (xwl_screen->present) { if (xwl_window->xwl_screen->present)
struct xwl_present_window *xwl_present_window, *tmp; xwl_present_for_each_frame_callback(xwl_window, xwl_present_unrealize_window);
xorg_list_for_each_entry_safe(xwl_present_window, tmp,
&xwl_window->frame_callback_list,
frame_callback_list) {
xwl_present_unrealize_window(xwl_present_window);
}
}
#endif #endif
release_wl_surface_for_window(xwl_window); release_wl_surface_for_window(xwl_window);
@ -1233,15 +1226,8 @@ frame_callback(void *data,
xwl_window->frame_callback = NULL; xwl_window->frame_callback = NULL;
#ifdef GLAMOR_HAS_GBM #ifdef GLAMOR_HAS_GBM
if (xwl_window->xwl_screen->present) { if (xwl_window->xwl_screen->present)
struct xwl_present_window *xwl_present_window, *tmp; xwl_present_for_each_frame_callback(xwl_window, xwl_present_frame_callback);
xorg_list_for_each_entry_safe(xwl_present_window, tmp,
&xwl_window->frame_callback_list,
frame_callback_list) {
xwl_present_frame_callback(xwl_present_window);
}
}
#endif #endif
} }
@ -1257,15 +1243,8 @@ xwl_window_create_frame_callback(struct xwl_window *xwl_window)
xwl_window); xwl_window);
#ifdef GLAMOR_HAS_GBM #ifdef GLAMOR_HAS_GBM
if (xwl_window->xwl_screen->present) { if (xwl_window->xwl_screen->present)
struct xwl_present_window *xwl_present_window, *tmp; xwl_present_for_each_frame_callback(xwl_window, xwl_present_reset_timer);
xorg_list_for_each_entry_safe(xwl_present_window, tmp,
&xwl_window->frame_callback_list,
frame_callback_list) {
xwl_present_reset_timer(xwl_present_window);
}
}
#endif #endif
} }