From e271b2ed99a62bfdfccd374ce2a56cc75c7ca0fd Mon Sep 17 00:00:00 2001 From: Marius Vlad Date: Mon, 1 Jul 2024 12:56:04 +0300 Subject: [PATCH] backend-headless: Nuke band-aid With commit a1f8c49d5bdd20ed 'compositor: repaint backends separately' we will be repainting outputs independently so there's no need to keep this band-aid on. Signed-off-by: Marius Vlad --- libweston/backend-headless/headless.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/libweston/backend-headless/headless.c b/libweston/backend-headless/headless.c index a08d593c3..d84b53455 100644 --- a/libweston/backend-headless/headless.c +++ b/libweston/backend-headless/headless.c @@ -137,18 +137,8 @@ static int finish_frame_handler(void *data) { struct headless_output *output = data; - struct timespec ts; - weston_compositor_read_presentation_clock(output->base.compositor, &ts); - - /* If another output's repaint failed before this repaint finished, - * this repaint will have been cancelled by now. In this case we cannot - * go through finish_frame, because the repaint machinery does not - * expect this. */ - if (output->base.repaint_status != REPAINT_AWAITING_COMPLETION) - return -1; - - weston_output_finish_frame(&output->base, &ts, 0); + weston_output_finish_frame_from_timer(&output->base); return 1; }