frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Michel Dänzer 2021-04-29 18:44:04 +02:00 committed by Michel Dänzer
parent 0517460301
commit 35f173ddb6
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -459,8 +459,7 @@ xwl_present_buffer_release(void *data)
xwl_present_release_pixmap(event); 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) if (!event->pending)
xwl_present_free_event(event); xwl_present_free_event(event);
@ -547,9 +546,8 @@ xwl_present_sync_callback(void *data,
event->pending = FALSE; event->pending = FALSE;
if (!event->abort) xwl_present_flip_notify(xwl_present_window->window, event->event_id,
xwl_present_flip_notify(xwl_present_window->window, event->event_id, xwl_present_window->ust, xwl_present_window->msc);
xwl_present_window->ust, xwl_present_window->msc);
if (!event->pixmap) if (!event->pixmap)
xwl_present_free_event(event); 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) { xorg_list_for_each_entry(event, &xwl_present_window->release_list, list) {
if (event->event_id == event_id) { if (event->event_id == event_id) {
event->abort = TRUE; xwl_present_free_event(event);
break; break;
} }
} }
@ -816,7 +814,6 @@ xwl_present_flip(WindowPtr present_window,
event->pixmap = pixmap; event->pixmap = pixmap;
event->target_msc = target_msc; event->target_msc = target_msc;
event->pending = TRUE; event->pending = TRUE;
event->abort = FALSE;
if (sync_flip) { if (sync_flip) {
xorg_list_init(&event->list); xorg_list_init(&event->list);

1
hw/xwayland/xwayland-present.h
View File

@ -60,7 +60,6 @@ struct xwl_present_event {
uint64_t event_id; uint64_t event_id;
uint64_t target_msc; uint64_t target_msc;
Bool abort;
Bool pending; Bool pending;
struct xwl_present_window *xwl_present_window; struct xwl_present_window *xwl_present_window;