From b7b781ff448675cc8486d7aa8f6d78d1f1e7c727 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Fri, 5 Oct 2018 20:07:02 +1000 Subject: [PATCH] Prevent excessive frame events when compositor doesn't swap buffers When we send an output frame event, we should not assume that the compositor is going to call wlr_output_swap_buffers in response to it. If the compositor does not swap the buffers, the idle event source still exists and is executed every time the Wayland event loop becomes idle, which means we send frame events repeatedly until the buffers are swapped. This moves the removal of the idle event source out of wlr_output_swap_buffers and into wlr_output_send_frame, where it is guaranteed to be removed. --- types/wlr_output.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/types/wlr_output.c b/types/wlr_output.c index b3840415..c407ca0b 100644 --- a/types/wlr_output.c +++ b/types/wlr_output.c @@ -472,10 +472,6 @@ bool wlr_output_swap_buffers(struct wlr_output *output, struct timespec *when, wlr_log(WLR_ERROR, "Tried to swap buffers when a frame is pending"); return false; } - if (output->idle_frame != NULL) { - wl_event_source_remove(output->idle_frame); - output->idle_frame = NULL; - } int width, height; wlr_output_transformed_resolution(output, &width, &height); @@ -529,7 +525,6 @@ bool wlr_output_swap_buffers(struct wlr_output *output, struct timespec *when, return false; } - output->frame_pending = true; output->needs_swap = false; pixman_region32_clear(&output->damage); @@ -540,6 +535,12 @@ bool wlr_output_swap_buffers(struct wlr_output *output, struct timespec *when, void wlr_output_send_frame(struct wlr_output *output) { output->frame_pending = false; wlr_signal_emit_safe(&output->events.frame, output); + output->frame_pending = true; + + if (output->idle_frame != NULL) { + wl_event_source_remove(output->idle_frame); + output->idle_frame = NULL; + } } static void schedule_frame_handle_idle_timer(void *data) {