From 29a72bfb0bdb060d91196c57dc1940e5049858ed Mon Sep 17 00:00:00 2001 From: Daniel van Vugt Date: Wed, 24 Apr 2024 18:42:54 +0800 Subject: [PATCH] clutter/frame-clock: Remove some redundant logic Which became unused with the introduction of VRR. --- clutter/clutter/clutter-frame-clock.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/clutter/clutter/clutter-frame-clock.c b/clutter/clutter/clutter-frame-clock.c index 9d4a2531a..75e33088c 100644 --- a/clutter/clutter/clutter-frame-clock.c +++ b/clutter/clutter/clutter-frame-clock.c @@ -923,7 +923,6 @@ clutter_frame_clock_schedule_update_now (ClutterFrameClock *frame_clock) case CLUTTER_FRAME_CLOCK_STATE_DISPATCHED_ONE_AND_SCHEDULED_NOW: return; case CLUTTER_FRAME_CLOCK_STATE_DISPATCHED_ONE_AND_SCHEDULED: - next_update_time_us = g_get_monotonic_time (); frame_clock->state = CLUTTER_FRAME_CLOCK_STATE_DISPATCHED_ONE_AND_SCHEDULED_NOW; break; @@ -1004,14 +1003,6 @@ clutter_frame_clock_schedule_update (ClutterFrameClock *frame_clock) frame_clock->pending_reschedule = TRUE; return; case TRIPLE_BUFFERING_MODE_AUTO: - calculate_next_update_time_us (frame_clock, - &next_update_time_us, - &frame_clock->next_presentation_time_us, - &frame_clock->next_frame_deadline_us); - frame_clock->is_next_presentation_time_valid = - (frame_clock->next_presentation_time_us != 0); - frame_clock->has_next_frame_deadline = - (frame_clock->next_frame_deadline_us != 0); frame_clock->state = CLUTTER_FRAME_CLOCK_STATE_DISPATCHED_ONE_AND_SCHEDULED; break; @@ -1021,7 +1012,7 @@ clutter_frame_clock_schedule_update (ClutterFrameClock *frame_clock) frame_clock->is_next_presentation_time_valid = FALSE; frame_clock->state = CLUTTER_FRAME_CLOCK_STATE_DISPATCHED_ONE_AND_SCHEDULED; - break; + goto got_update_time; } break; case CLUTTER_FRAME_CLOCK_STATE_DISPATCHED_TWO: @@ -1049,6 +1040,7 @@ clutter_frame_clock_schedule_update (ClutterFrameClock *frame_clock) break; } +got_update_time: g_warn_if_fail (next_update_time_us != -1); frame_clock->next_update_time_us = next_update_time_us;