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

clutter/effect: Remove pick flags

Browse Source 
As pointed out, they are now unused. Remove
the pick flags.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/865
This commit is contained in:
Georges Basile Stavracas Neto 2019-10-21 10:45:52 -03:00
parent db8fcc0537
commit 05da4a6094
4 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clutter/clutter/clutter-actor.c
View File

@ -4286,7 +4286,6 @@ clutter_actor_continue_pick (ClutterActor *actor)
else
{
ClutterEffect *old_current_effect;
ClutterEffectPaintFlags run_flags = 0;
/* Cache the current effect so that we can put it back before
* returning.
@ -4296,12 +4295,7 @@ clutter_actor_continue_pick (ClutterActor *actor)
priv->current_effect = priv->next_effect_to_paint->data;
priv->next_effect_to_paint = priv->next_effect_to_paint->next;
/* We can't determine when an actor has been modified since
* its last pick so lets just assume it has always been
* modified.
*/
run_flags |= CLUTTER_EFFECT_PAINT_ACTOR_DIRTY;
_clutter_effect_pick (priv->current_effect, run_flags);
_clutter_effect_pick (priv->current_effect);
priv->current_effect = old_current_effect;
}

3
clutter/clutter/clutter-effect-private.h
View File

@ -12,8 +12,7 @@ gboolean _clutter_effect_modify_paint_volume (ClutterEffect
gboolean _clutter_effect_has_custom_paint_volume (ClutterEffect *effect);
void _clutter_effect_paint (ClutterEffect *effect,
ClutterEffectPaintFlags flags);
void _clutter_effect_pick (ClutterEffect *effect,
ClutterEffectPaintFlags flags);
void _clutter_effect_pick (ClutterEffect *effect);
G_END_DECLS

8
clutter/clutter/clutter-effect.c
View File

@ -216,8 +216,7 @@ clutter_effect_real_paint (ClutterEffect *effect,
}
static void
clutter_effect_real_pick (ClutterEffect *effect,
ClutterEffectPaintFlags flags)
clutter_effect_real_pick (ClutterEffect *effect)
{
ClutterActorMeta *actor_meta = CLUTTER_ACTOR_META (effect);
ClutterActor *actor;
@ -288,12 +287,11 @@ _clutter_effect_paint (ClutterEffect *effect,
}
void
_clutter_effect_pick (ClutterEffect *effect,
ClutterEffectPaintFlags flags)
_clutter_effect_pick (ClutterEffect *effect)
{
g_return_if_fail (CLUTTER_IS_EFFECT (effect));
CLUTTER_EFFECT_GET_CLASS (effect)->pick (effect, flags);
CLUTTER_EFFECT_GET_CLASS (effect)->pick (effect);
}
gboolean

3
clutter/clutter/clutter-effect.h
View File

@ -82,8 +82,7 @@ struct _ClutterEffectClass
void (* paint) (ClutterEffect *effect,
ClutterEffectPaintFlags flags);
void (* pick) (ClutterEffect *effect,
ClutterEffectPaintFlags flags);
void (* pick) (ClutterEffect *effect);
/*< private >*/
void (* _clutter_effect4) (void);