From cf725896354bfb2690d448b1cf3054927f6572ca Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Thu, 15 Nov 2012 17:49:57 -0500 Subject: [PATCH] Distinguish "no delay" frames from spontaneous drawing When a client is drawing as hard as possible (without sleeping between frames) we need to draw as soon possible, since sleeping will decrease the effective frame rate shown to the user, and can also result in the system never kicking out of power-saving mode because it doesn't look fully utilized. Use the amount the client increments the counter value by when ending the frame to distinguish these cases: - Increment by 1: a no-delay frame - Increment by more than 1: a non-urgent frame, handle normally https://bugzilla.gnome.org/show_bug.cgi?id=685463 --- src/compositor/meta-window-actor.c | 6 ++++++ src/core/window-private.h | 5 +++++ src/core/window.c | 8 ++++++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c index 93c9c6748..4147784f6 100644 --- a/src/compositor/meta-window-actor.c +++ b/src/compositor/meta-window-actor.c @@ -2356,6 +2356,12 @@ meta_window_actor_handle_updates (MetaWindowActor *self) priv->frames = g_list_prepend (priv->frames, frame); priv->window->needs_frame_drawn = FALSE; + + if (priv->window->no_delay_frame) + { + ClutterActor *stage = clutter_actor_get_stage (CLUTTER_ACTOR (self)); + clutter_stage_skip_sync_delay (CLUTTER_STAGE (stage)); + } } } diff --git a/src/core/window-private.h b/src/core/window-private.h index 06afdcfec..c972e98e2 100644 --- a/src/core/window-private.h +++ b/src/core/window-private.h @@ -347,6 +347,11 @@ struct _MetaWindow * last update the sync request counter */ guint needs_frame_drawn : 1; + /* if TRUE, the frame that was just drawn was drawn without any delay + * on the client's part and thus is high-priority - if we add delay + * we might cause the client to miss it's target frame rate */ + guint no_delay_frame : 1; + /* Note: can be NULL */ GSList *struts; diff --git a/src/core/window.c b/src/core/window.c index 60bfa91b8..73aa0a986 100644 --- a/src/core/window.c +++ b/src/core/window.c @@ -9445,8 +9445,12 @@ void meta_window_update_sync_request_counter (MetaWindow *window, gint64 new_counter_value) { - if (window->extended_sync_request_counter) - window->needs_frame_drawn = TRUE; + if (window->extended_sync_request_counter && + new_counter_value % 2 == 0) + { + window->needs_frame_drawn = TRUE; + window->no_delay_frame = new_counter_value == window->sync_request_serial + 1; + } window->sync_request_serial = new_counter_value; meta_compositor_set_updates_frozen (window->display->compositor, window,