AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'frame-clock-start-time' into 'master'

Browse Source 
Tweaks to frame clock for better ties to vsync

See merge request GNOME/gtk!2043
This commit is contained in:
Matthias Clasen 2020-06-05 18:33:48 +00:00
commit ed1872f0a8
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
gdk/gdkframeclockidle.c
View File

@ -56,6 +56,7 @@ struct _GdkFrameClockIdlePrivate
GdkFrameClockPhase phase; GdkFrameClockPhase phase;
guint in_paint_idle : 1; guint in_paint_idle : 1;
guint paint_is_thaw : 1;
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
guint begin_period : 1; guint begin_period : 1;
#endif #endif
@ -162,7 +163,7 @@ gdk_frame_clock_idle_dispose (GObject *object)
static gint64 static gint64
compute_smooth_frame_time (GdkFrameClock *clock, compute_smooth_frame_time (GdkFrameClock *clock,
gint64 new_frame_time, gint64 new_frame_time,
gboolean new_frame_time_is_regular, gboolean new_frame_time_is_vsync_related,
gint64 smoothed_frame_time_base, gint64 smoothed_frame_time_base,
gint64 frame_interval) gint64 frame_interval)
{ {
@ -204,13 +205,13 @@ compute_smooth_frame_time (GdkFrameClock *clock,
* (current_error/frame_interval)*(current_error/frame_interval)*frame_interval * (current_error/frame_interval)*(current_error/frame_interval)*frame_interval
* But this can be simplified as below. * But this can be simplified as below.
* *
* Note: We only do this correction if we're regularly animating (no * Note: We only do this correction if the new frame is caused by a
* or low frame skip). If the last frame was a long time ago, or if * thaw of the frame clock, so that we know the time is actually
* we're not doing this in the frame cycle this call was likely * related to the physical vblank. For frameclock cycles triggered
* triggered by an input event and new_frame_time is essentially * by other events we always step up in whole frames from the last
* random and not tied to the presentation time. * reported time.
*/ */
if (new_frame_time_is_regular) if (new_frame_time_is_vsync_related)
{ {
current_error = new_smoothed_time - new_frame_time; current_error = new_smoothed_time - new_frame_time;
correction_magnitude = current_error * current_error / frame_interval; /* Note, this is always > 0 due to the square */ correction_magnitude = current_error * current_error / frame_interval; /* Note, this is always > 0 due to the square */
@ -275,7 +276,8 @@ gdk_frame_clock_idle_get_frame_time (GdkFrameClock *clock)
(priv)->updating_count > 0)) (priv)->updating_count > 0))
static void static void
maybe_start_idle (GdkFrameClockIdle *clock_idle) maybe_start_idle (GdkFrameClockIdle *clock_idle,
gboolean caused_by_thaw)
{ {
GdkFrameClockIdlePrivate *priv = clock_idle->priv; GdkFrameClockIdlePrivate *priv = clock_idle->priv;
@ -303,6 +305,7 @@ maybe_start_idle (GdkFrameClockIdle *clock_idle)
if (!priv->in_paint_idle && if (!priv->in_paint_idle &&
priv->paint_idle_id == 0 && RUN_PAINT_IDLE (priv)) priv->paint_idle_id == 0 && RUN_PAINT_IDLE (priv))
{ {
priv->paint_is_thaw = caused_by_thaw;
priv->paint_idle_id = g_timeout_add_full (GDK_PRIORITY_REDRAW, priv->paint_idle_id = g_timeout_add_full (GDK_PRIORITY_REDRAW,
min_interval, min_interval,
gdk_frame_clock_paint_idle, gdk_frame_clock_paint_idle,
@ -409,7 +412,6 @@ gdk_frame_clock_paint_idle (void *data)
{ {
gint64 frame_interval = FRAME_INTERVAL; gint64 frame_interval = FRAME_INTERVAL;
GdkFrameTimings *prev_timings = gdk_frame_clock_get_current_timings (clock); GdkFrameTimings *prev_timings = gdk_frame_clock_get_current_timings (clock);
gint64 old_frame_time = priv->frame_time;
if (prev_timings && prev_timings->refresh_interval) if (prev_timings && prev_timings->refresh_interval)
frame_interval = prev_timings->refresh_interval; frame_interval = prev_timings->refresh_interval;
@ -424,11 +426,9 @@ gdk_frame_clock_paint_idle (void *data)
} }
else else
{ {
/* For long delays, cycle was probably caused by input event rather than animation */
gboolean is_regular = priv->frame_time - old_frame_time < 4 * FRAME_INTERVAL;
priv->smoothed_frame_time_base = priv->smoothed_frame_time_base =
compute_smooth_frame_time (clock, priv->frame_time, compute_smooth_frame_time (clock, priv->frame_time,
is_regular, priv->paint_is_thaw,
priv->smoothed_frame_time_base, priv->smoothed_frame_time_base,
priv->smoothed_frame_time_period); priv->smoothed_frame_time_period);
priv->smoothed_frame_time_period = frame_interval; priv->smoothed_frame_time_period = frame_interval;
@ -559,8 +559,8 @@ gdk_frame_clock_paint_idle (void *data)
if (priv->freeze_count == 0) if (priv->freeze_count == 0)
{ {
priv->min_next_frame_time = compute_min_next_frame_time (clock_idle, priv->min_next_frame_time = compute_min_next_frame_time (clock_idle,
priv->frame_time); priv->smoothed_frame_time_base);
maybe_start_idle (clock_idle); maybe_start_idle (clock_idle, FALSE);
} }
if (priv->freeze_count == 0) if (priv->freeze_count == 0)
@ -580,7 +580,7 @@ gdk_frame_clock_idle_request_phase (GdkFrameClock *clock,
GdkFrameClockIdlePrivate *priv = clock_idle->priv; GdkFrameClockIdlePrivate *priv = clock_idle->priv;
priv->requested |= phase; priv->requested |= phase;
maybe_start_idle (clock_idle); maybe_start_idle (clock_idle, FALSE);
} }
static void static void
@ -599,7 +599,7 @@ gdk_frame_clock_idle_begin_updating (GdkFrameClock *clock)
#endif #endif
priv->updating_count++; priv->updating_count++;
maybe_start_idle (clock_idle); maybe_start_idle (clock_idle, FALSE);
} }
static void static void
@ -649,7 +649,7 @@ gdk_frame_clock_idle_thaw (GdkFrameClock *clock)
priv->freeze_count--; priv->freeze_count--;
if (priv->freeze_count == 0) if (priv->freeze_count == 0)
{ {
maybe_start_idle (clock_idle); maybe_start_idle (clock_idle, TRUE);
/* If nothing is requested so we didn't start an idle, we need /* If nothing is requested so we didn't start an idle, we need
* to skip to the end of the state chain, since the idle won't * to skip to the end of the state chain, since the idle won't
* run and do it for us. * run and do it for us.