From fe8c7855f3a85f156c792a3f18a175138407054b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Wed, 12 May 2021 12:51:32 +0200 Subject: [PATCH] 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. --- hw/xwayland/xwayland-present.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/hw/xwayland/xwayland-present.c b/hw/xwayland/xwayland-present.c index a5b0f9c46..1beba69bd 100644 --- a/hw/xwayland/xwayland-present.c +++ b/hw/xwayland/xwayland-present.c @@ -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) {