diff options
| author | Georges Basile Stavracas Neto <georges.stavracas@gmail.com> | 2020-06-26 23:11:36 -0300 |
|---|---|---|
| committer | Georges Basile Stavracas Neto <georges.stavracas@gmail.com> | 2020-10-07 13:30:36 +0000 |
| commit | 67129c7757cd24e1fc718e2cd8f6a8246c8a9ef6 (patch) | |
| tree | 2bd4878c6a1e355053569e9b315ef6c44576e10c | |
| parent | 0cab71ea52f3468ca44afc2d7e274a03dd8436b0 (diff) | |
| download | mutter-67129c7757cd24e1fc718e2cd8f6a8246c8a9ef6.tar.gz | |
clutter/effect: Don't expose pre and post paint helpers
They're not used outside ClutterEffect.
https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1474
| -rw-r--r-- | clutter/clutter/clutter-effect-private.h | 4 | ||||
| -rw-r--r-- | clutter/clutter/clutter-effect.c | 23 |
2 files changed, 3 insertions, 24 deletions
diff --git a/clutter/clutter/clutter-effect-private.h b/clutter/clutter/clutter-effect-private.h index f081a0535..ec2e82ba4 100644 --- a/clutter/clutter/clutter-effect-private.h +++ b/clutter/clutter/clutter-effect-private.h @@ -5,10 +5,6 @@ G_BEGIN_DECLS -gboolean _clutter_effect_pre_paint (ClutterEffect *effect, - ClutterPaintContext *paint_context); -void _clutter_effect_post_paint (ClutterEffect *effect, - ClutterPaintContext *paint_context); gboolean _clutter_effect_modify_paint_volume (ClutterEffect *effect, ClutterPaintVolume *volume); gboolean _clutter_effect_has_custom_paint_volume (ClutterEffect *effect); diff --git a/clutter/clutter/clutter-effect.c b/clutter/clutter/clutter-effect.c index 43185ea21..9ef269daf 100644 --- a/clutter/clutter/clutter-effect.c +++ b/clutter/clutter/clutter-effect.c @@ -201,6 +201,7 @@ clutter_effect_real_paint (ClutterEffect *effect, ClutterPaintContext *paint_context, ClutterEffectPaintFlags flags) { + ClutterEffectClass *effect_class = CLUTTER_EFFECT_GET_CLASS (effect); ClutterActorMeta *actor_meta = CLUTTER_ACTOR_META (effect); ClutterActor *actor; gboolean pre_paint_succeeded; @@ -209,13 +210,13 @@ clutter_effect_real_paint (ClutterEffect *effect, effects that haven't migrated to use the 'paint' virtual yet. This just calls the old pre and post virtuals before chaining on */ - pre_paint_succeeded = _clutter_effect_pre_paint (effect, paint_context); + pre_paint_succeeded = effect_class->pre_paint (effect, paint_context); actor = clutter_actor_meta_get_actor (actor_meta); clutter_actor_continue_paint (actor, paint_context); if (pre_paint_succeeded) - _clutter_effect_post_paint (effect, paint_context); + effect_class->post_paint (effect, paint_context); } static void @@ -263,24 +264,6 @@ clutter_effect_init (ClutterEffect *self) { } -gboolean -_clutter_effect_pre_paint (ClutterEffect *effect, - ClutterPaintContext *paint_context) -{ - g_return_val_if_fail (CLUTTER_IS_EFFECT (effect), FALSE); - - return CLUTTER_EFFECT_GET_CLASS (effect)->pre_paint (effect, paint_context); -} - -void -_clutter_effect_post_paint (ClutterEffect *effect, - ClutterPaintContext *paint_context) -{ - g_return_if_fail (CLUTTER_IS_EFFECT (effect)); - - CLUTTER_EFFECT_GET_CLASS (effect)->post_paint (effect, paint_context); -} - void _clutter_effect_paint (ClutterEffect *effect, ClutterPaintContext *paint_context, |