andreacavalli
/
xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xwayland/present: Fold xwl_present_release_event into _free_event 

The only difference was unhooking from the vblank.event_queue list,
which is already done by xwl_present_flip_notify_vblank in
xwl_present_msc_bump.
This commit is contained in:
Michel Dänzer 2021-05-12 12:51:32 +02:00 committed by Michel Dänzer
parent 31d2ebca77
commit fe8c7855f3
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -210,16 +210,10 @@ xwl_present_release_pixmap(struct xwl_present_event *event)
}
static void
xwl_present_release_event(struct xwl_present_event *event)
xwl_present_free_event(struct xwl_present_event *event)
{
xwl_present_release_pixmap(event);
xorg_list_del(&event->vblank.event_queue);
}
static void
xwl_present_free_event(struct xwl_present_event *event)
{
xwl_present_release_event(event);
present_vblank_destroy(&event->vblank);
}
@ -390,16 +384,9 @@ xwl_present_msc_bump(struct xwl_present_window *xwl_present_window)
xwl_present_window->ust = GetTimeInMicros();
if (flip_pending && flip_pending->sync_flip) {
event = xwl_present_event_from_id((uintptr_t)flip_pending);
if (flip_pending && flip_pending->sync_flip)
xwl_present_flip_notify_vblank(flip_pending, xwl_present_window->ust, msc);
if (!event->pixmap) {
/* If the buffer was already released, clean up now */
xwl_present_release_event(event);
}
}
xorg_list_for_each_entry_safe(event, tmp,
&xwl_present_window->wait_list,
vblank.event_queue) {