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:
parent
31d2ebca77
commit
fe8c7855f3
|
@ -210,16 +210,10 @@ xwl_present_release_pixmap(struct xwl_present_event *event)
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
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);
|
xwl_present_release_pixmap(event);
|
||||||
xorg_list_del(&event->vblank.event_queue);
|
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);
|
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();
|
xwl_present_window->ust = GetTimeInMicros();
|
||||||
|
|
||||||
if (flip_pending && flip_pending->sync_flip) {
|
if (flip_pending && flip_pending->sync_flip)
|
||||||
event = xwl_present_event_from_id((uintptr_t)flip_pending);
|
|
||||||
xwl_present_flip_notify_vblank(flip_pending, xwl_present_window->ust, msc);
|
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,
|
xorg_list_for_each_entry_safe(event, tmp,
|
||||||
&xwl_present_window->wait_list,
|
&xwl_present_window->wait_list,
|
||||||
vblank.event_queue) {
|
vblank.event_queue) {
|
||||||
|
|
Loading…
Reference in New Issue