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

actor: don't dirty pick buffer in _real_queue_redraw

Browse Source 
Since re-working how redraws are queued it is no longer necessary to
dirty the pick buffer in _clutter_actor_real_queue_redraw since this
should now reliably be handled in _clutter_stage_queue_actor_redraw.
This commit is contained in:
Robert Bragg 2010-09-24 02:24:36 +01:00
parent 51fca9d968
commit 42f6364cac
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
clutter/clutter-actor.c
View File

@ -1798,7 +1798,6 @@ clutter_actor_real_queue_redraw (ClutterActor *self,
ClutterActor *origin) ClutterActor *origin)
{ {
ClutterActor *parent; ClutterActor *parent;
ClutterActor *stage;
CLUTTER_NOTE (PAINT, "Redraw queued on '%s' (from: '%s')", CLUTTER_NOTE (PAINT, "Redraw queued on '%s' (from: '%s')",
get_actor_debug_name (self), get_actor_debug_name (self),
@ -1816,13 +1815,6 @@ clutter_actor_real_queue_redraw (ClutterActor *self,
if (!CLUTTER_ACTOR_IS_VISIBLE (self)) if (!CLUTTER_ACTOR_IS_VISIBLE (self))
return; return;
/* XXX: when we merge the paint-box branch we should only need to
* invalidate the pick buffer in _clutter_stage_queue_actor_redraw
*/
stage = _clutter_actor_get_stage_internal (self);
if (stage != NULL)
_clutter_stage_set_pick_buffer_valid (CLUTTER_STAGE (stage), FALSE);
/* Although we could determine here that a full stage redraw /* Although we could determine here that a full stage redraw
* has already been queued and immediately bail out, we actually * has already been queued and immediately bail out, we actually
* guarantee that we will propagate a queue-redraw signal to our * guarantee that we will propagate a queue-redraw signal to our
@ -1832,6 +1824,7 @@ clutter_actor_real_queue_redraw (ClutterActor *self,
*/ */
if (self->priv->propagated_one_redraw) if (self->priv->propagated_one_redraw)
{ {
ClutterActor *stage = _clutter_actor_get_stage_internal (self);
if (stage != NULL && if (stage != NULL &&
_clutter_stage_has_full_redraw_queued (CLUTTER_STAGE (stage))) _clutter_stage_has_full_redraw_queued (CLUTTER_STAGE (stage)))
return; return;