brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only advance the master clock before drawing a frame

Browse Source 
Remove code to advance the master clock after drawing a frame; if
there are any running timelines the master clock will do another
frame by itself, and the clock will be advanced before running
that frame.

With this change, there is no point in queueing an extra frame
redraw after completing a timeline, since we are always advancing
the timeline *before* redrawing, so remove that code as well.
(This does mean that calling clutter_timeline_stop() won't implicitly
cause the stage to be redrawn; this doesn't seem like something
an app should rely on in any case.)

http://bugzilla.openedhand.com/show_bug.cgi?id=1637

Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
This commit is contained in:
Owen W. Taylor 2009-06-06 17:54:05 -04:00 committed by Emmanuele Bassi
parent 19c2e66398
commit 3ab303b662
2 changed files with 0 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clutter/clutter-main.c
View File

@ -208,11 +208,6 @@ _clutter_do_redraw (ClutterStage *stage)
*/ */
_clutter_backend_redraw (ctx->backend, stage); _clutter_backend_redraw (ctx->backend, stage);
/* prepare for the next frame; if anything queues a redraw as the
* result of a timeline, this will end up redrawing the scene
*/
_clutter_master_clock_advance (master_clock);
/* Complete FPS info */ /* Complete FPS info */
if (G_UNLIKELY (clutter_get_show_fps ())) if (G_UNLIKELY (clutter_get_show_fps ()))
{ {

63
clutter/clutter-master-clock.c
View File

@ -63,11 +63,6 @@ struct _ClutterMasterClock
* a redraw on the stage and drive the animations * a redraw on the stage and drive the animations
*/ */
GSource *source; GSource *source;
/* a guard, so that we dispatch the last redraw even
* after the last timeline has been completed
*/
guint last_advance : 1;
}; };
struct _ClutterMasterClockClass struct _ClutterMasterClockClass
@ -84,10 +79,6 @@ struct _ClutterClockSource
static void on_timeline_started (ClutterTimeline *timeline, static void on_timeline_started (ClutterTimeline *timeline,
ClutterMasterClock *master_clock); ClutterMasterClock *master_clock);
static void on_timeline_completed (ClutterTimeline *timeline,
ClutterMasterClock *master_clock);
static void on_timeline_paused (ClutterTimeline *timeline,
ClutterMasterClock *master_clock);
static gboolean clutter_clock_prepare (GSource *source, static gboolean clutter_clock_prepare (GSource *source,
gint *timeout); gint *timeout);
@ -125,9 +116,6 @@ has_running_timeline (ClutterMasterClock *master_clock,
{ {
GSList *l; GSList *l;
if (master_clock->last_advance)
return TRUE;
if (master_clock->timelines == NULL) if (master_clock->timelines == NULL)
return FALSE; return FALSE;
@ -201,8 +189,6 @@ clutter_clock_dispatch (GSource *source,
GSourceFunc callback, GSourceFunc callback,
gpointer user_data) gpointer user_data)
{ {
ClutterClockSource *clock_source = (ClutterClockSource *) source;
ClutterMasterClock *master_clock = clock_source->master_clock;
ClutterStageManager *stage_manager = clutter_stage_manager_get_default (); ClutterStageManager *stage_manager = clutter_stage_manager_get_default ();
const GSList *stages, *l; const GSList *stages, *l;
@ -217,15 +203,6 @@ clutter_clock_dispatch (GSource *source,
for (l = stages; l != NULL; l = l->next) for (l = stages; l != NULL; l = l->next)
clutter_actor_queue_redraw (l->data); clutter_actor_queue_redraw (l->data);
/* if this is the remainder of an advancement, needed for the last
* timeline to finish its run, then we need to reset the prev_tick
*/
if (master_clock->last_advance)
{
master_clock->prev_tick.tv_sec = 0;
master_clock->last_advance = FALSE;
}
return TRUE; return TRUE;
} }
@ -259,12 +236,6 @@ clutter_master_clock_finalize (GObject *gobject)
g_signal_handlers_disconnect_by_func (timeline, g_signal_handlers_disconnect_by_func (timeline,
G_CALLBACK (on_timeline_started), G_CALLBACK (on_timeline_started),
master_clock); master_clock);
g_signal_handlers_disconnect_by_func (timeline,
G_CALLBACK (on_timeline_completed),
master_clock);
g_signal_handlers_disconnect_by_func (timeline,
G_CALLBACK (on_timeline_paused),
master_clock);
} }
g_slist_free (master_clock->timelines); g_slist_free (master_clock->timelines);
@ -326,28 +297,6 @@ on_timeline_started (ClutterTimeline *timeline,
master_clock->prev_tick.tv_sec = 0; master_clock->prev_tick.tv_sec = 0;
} }
static void
on_timeline_completed (ClutterTimeline *timeline,
ClutterMasterClock *master_clock)
{
/* if this is the last timeline we need to turn :last-advance
* on in order to queue the redraw of the scene for the last
* frame; otherwise the ClockSource will fail the prepare and
* check phases and the last frame will not be painted
*/
if (!has_running_timeline (master_clock, NULL))
master_clock->last_advance = TRUE;
}
static void
on_timeline_paused (ClutterTimeline *timeline,
ClutterMasterClock *master_clock)
{
/* see the comment in on_timeline_completed */
if (!has_running_timeline (master_clock, NULL))
master_clock->last_advance = TRUE;
}
/* /*
* _clutter_master_clock_add_timeline: * _clutter_master_clock_add_timeline:
* @master_clock: a #ClutterMasterClock * @master_clock: a #ClutterMasterClock
@ -378,12 +327,6 @@ _clutter_master_clock_add_timeline (ClutterMasterClock *master_clock,
g_signal_connect (timeline, "started", g_signal_connect (timeline, "started",
G_CALLBACK (on_timeline_started), G_CALLBACK (on_timeline_started),
master_clock); master_clock);
g_signal_connect (timeline, "completed",
G_CALLBACK (on_timeline_completed),
master_clock);
g_signal_connect (timeline, "paused",
G_CALLBACK (on_timeline_paused),
master_clock);
} }
/* /*
@ -412,12 +355,6 @@ _clutter_master_clock_remove_timeline (ClutterMasterClock *master_clock,
g_signal_handlers_disconnect_by_func (timeline, g_signal_handlers_disconnect_by_func (timeline,
G_CALLBACK (on_timeline_started), G_CALLBACK (on_timeline_started),
master_clock); master_clock);
g_signal_handlers_disconnect_by_func (timeline,
G_CALLBACK (on_timeline_completed),
master_clock);
g_signal_handlers_disconnect_by_func (timeline,
G_CALLBACK (on_timeline_paused),
master_clock);
/* last timeline: unset the prev_tick so that we can start /* last timeline: unset the prev_tick so that we can start
* from scratch when we add a new timeline * from scratch when we add a new timeline