sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

clutter/frame-clock: Only update immediately after idle if vsynced

Browse source 
If the presentation time isn't known, e.g. if the monitor is virtual and
the actual presentation happens far away, the presentation time we
actually received tends to be the time a frame was presented to the next
layer, meaning practically immediately after painting.

When scheduling another update after that, don't assume that if the next
calculated update is not the immediate next update, schedule an update
sooner, as that will in such cases always be true, meaning we ended up
busy looping with constant frame updates being scheduled.

Fix this by only triggering that logic if the last presentation time was
actually vsync:ed.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3803>
This commit is contained in:
Jonas Ådahl 2024-06-11 15:26:03 +02:00 committed by Pascal Nowack
parent 62e559d752
commit 90aee21f20
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
clutter/clutter/clutter-frame-clock.c
View file

@ -96,6 +96,8 @@ struct _ClutterFrameClock
int64_t last_presentation_time_us; int64_t last_presentation_time_us;
int64_t next_update_time_us; int64_t next_update_time_us;
ClutterFrameInfoFlag last_presentation_flags;
gboolean is_next_presentation_time_valid; gboolean is_next_presentation_time_valid;
int64_t next_presentation_time_us; int64_t next_presentation_time_us;
@ -357,7 +359,10 @@ clutter_frame_clock_notify_presented (ClutterFrameClock *frame_clock,
#endif #endif
if (frame_info->presentation_time > 0) if (frame_info->presentation_time > 0)
frame_clock->last_presentation_time_us = frame_info->presentation_time; {
frame_clock->last_presentation_time_us = frame_info->presentation_time;
frame_clock->last_presentation_flags = frame_info->flags;
}
frame_clock->got_measurements_last_frame = FALSE; frame_clock->got_measurements_last_frame = FALSE;
@ -601,7 +606,8 @@ calculate_next_update_time_us (ClutterFrameClock *frame_clock,
} }
} }
if (next_presentation_time_us != last_presentation_time_us + refresh_interval_us) if (frame_clock->last_presentation_flags & CLUTTER_FRAME_INFO_FLAG_VSYNC &&
next_presentation_time_us != last_presentation_time_us + refresh_interval_us)
{ {
/* There was an idle period since the last presentation, so there seems /* There was an idle period since the last presentation, so there seems
* be no constantly updating actor. In this case it's best to start * be no constantly updating actor. In this case it's best to start