[mutter/gbsneto/split-pick-paint] clutter/effect: Remove pick flags
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/gbsneto/split-pick-paint] clutter/effect: Remove pick flags
- Date: Mon, 21 Oct 2019 13:46:45 +0000 (UTC)
commit 1e8de06f5bcdfde3a6092be8004e0ca6770dfd54
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Mon Oct 21 10:45:52 2019 -0300
clutter/effect: Remove pick flags
As pointed out, they are now unused. Remove
the pick flags.
https://gitlab.gnome.org/GNOME/mutter/merge_requests/865
clutter/clutter/clutter-actor.c | 8 +-------
clutter/clutter/clutter-effect-private.h | 3 +--
clutter/clutter/clutter-effect.c | 8 +++-----
clutter/clutter/clutter-effect.h | 3 +--
4 files changed, 6 insertions(+), 16 deletions(-)
---
diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c
index c6b753b3b..207a5ef30 100644
--- a/clutter/clutter/clutter-actor.c
+++ b/clutter/clutter/clutter-actor.c
@@ -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;
}
diff --git a/clutter/clutter/clutter-effect-private.h b/clutter/clutter/clutter-effect-private.h
index 87f348460..15901bcfb 100644
--- a/clutter/clutter/clutter-effect-private.h
+++ b/clutter/clutter/clutter-effect-private.h
@@ -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
diff --git a/clutter/clutter/clutter-effect.c b/clutter/clutter/clutter-effect.c
index 5a4c7aa87..5cc64da66 100644
--- a/clutter/clutter/clutter-effect.c
+++ b/clutter/clutter/clutter-effect.c
@@ -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
diff --git a/clutter/clutter/clutter-effect.h b/clutter/clutter/clutter-effect.h
index 6f280d95b..0e9de2f36 100644
--- a/clutter/clutter/clutter-effect.h
+++ b/clutter/clutter/clutter-effect.h
@@ -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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]