Commit c24eb7e3 authored by Roman Gilg's avatar Roman Gilg Committed by Michel Dänzer
Browse files

xwayland: Simplify Present event handling code



Instead of optionally return early when an event is aborted and potentially
clean it up in there we can only optionally inform Present if not aborted and
afterwards clean it up if required.

Saves some lines of code and conditional branches.
Signed-off-by: Roman Gilg's avatarRoman Gilg <subdiff@gmail.com>
parent 06901e12
......@@ -185,17 +185,11 @@ xwl_present_buffer_release(void *data)
xwl_present_release_pixmap(event);
if (event->abort) {
if (!event->pending)
xwl_present_free_event(event);
return;
}
if (!event->abort)
present_wnmd_idle_notify(event->xwl_present_window->window, event->event_id);
present_wnmd_idle_notify(event->xwl_present_window->window, event->event_id);
if (!event->pending) {
if (!event->pending)
xwl_present_free_event(event);
}
}
static void
......@@ -279,20 +273,12 @@ xwl_present_sync_callback(void *data,
event->pending = FALSE;
if (event->abort) {
/* Event might have been aborted */
if (!event->pixmap)
/* Buffer was already released, cleanup now */
xwl_present_free_event(event);
return;
}
present_wnmd_flip_notify(xwl_present_window->window, event->event_id,
xwl_present_window->ust, xwl_present_window->msc);
if (!event->abort)
present_wnmd_flip_notify(xwl_present_window->window, event->event_id,
xwl_present_window->ust, xwl_present_window->msc);
if (!event->pixmap) {
if (!event->pixmap)
xwl_present_free_event(event);
}
}
static const struct wl_callback_listener xwl_present_sync_listener = {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment