diff options
| author | Michel Dänzer <mdaenzer@redhat.com> | 2021-04-29 18:44:04 +0200 |
|---|---|---|
| committer | Michel Dänzer <michel@daenzer.net> | 2021-07-09 16:15:10 +0200 |
| commit | 35f173ddb606f9fbac7957e427fe28a377204cfe (patch) | |
| tree | 58ab31025371da000cd3a4a1fe0068c1ba571392 | |
| parent | 0517460301cbf9c6ed3020ef1dd0cd1df94ea178 (diff) | |
xwayland/present: Drop abort member of struct xwl_present_event
We can call xwl_present_free_event unconditionally from
xwl_present_abort_vblank, since the sync_callback is already destroyed
in xwl_present_cleanup.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
| -rw-r--r-- | hw/xwayland/xwayland-present.c | 11 | ||||
| -rw-r--r-- | hw/xwayland/xwayland-present.h | 1 |
2 files changed, 4 insertions, 8 deletions
diff --git a/hw/xwayland/xwayland-present.c b/hw/xwayland/xwayland-present.c index f5e3593ad..c7566ab94 100644 --- a/hw/xwayland/xwayland-present.c +++ b/hw/xwayland/xwayland-present.c @@ -459,8 +459,7 @@ xwl_present_buffer_release(void *data) xwl_present_release_pixmap(event); - if (!event->abort) - xwl_present_idle_notify(event->xwl_present_window->window, event->event_id); + xwl_present_idle_notify(event->xwl_present_window->window, event->event_id); if (!event->pending) xwl_present_free_event(event); @@ -547,9 +546,8 @@ xwl_present_sync_callback(void *data, event->pending = FALSE; - if (!event->abort) - xwl_present_flip_notify(xwl_present_window->window, event->event_id, - xwl_present_window->ust, xwl_present_window->msc); + xwl_present_flip_notify(xwl_present_window->window, event->event_id, + xwl_present_window->ust, xwl_present_window->msc); if (!event->pixmap) xwl_present_free_event(event); @@ -642,7 +640,7 @@ xwl_present_abort_vblank(ScreenPtr screen, xorg_list_for_each_entry(event, &xwl_present_window->release_list, list) { if (event->event_id == event_id) { - event->abort = TRUE; + xwl_present_free_event(event); break; } } @@ -816,7 +814,6 @@ xwl_present_flip(WindowPtr present_window, event->pixmap = pixmap; event->target_msc = target_msc; event->pending = TRUE; - event->abort = FALSE; if (sync_flip) { xorg_list_init(&event->list); diff --git a/hw/xwayland/xwayland-present.h b/hw/xwayland/xwayland-present.h index e595f4de2..2b789f53a 100644 --- a/hw/xwayland/xwayland-present.h +++ b/hw/xwayland/xwayland-present.h @@ -60,7 +60,6 @@ struct xwl_present_event { uint64_t event_id; uint64_t target_msc; - Bool abort; Bool pending; struct xwl_present_window *xwl_present_window; |