From de01dea93ec1ad6e9238ea26c91be3802d9b7b69 Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Mon, 29 Jun 2020 15:12:08 -0300 Subject: [PATCH] clutter/offscreen-effect: Simplify paint Simply chain up to get the pre and post paint methods, instead of reimplementing ClutterEffect.paint() https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1474 --- clutter/clutter/clutter-offscreen-effect.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/clutter/clutter/clutter-offscreen-effect.c b/clutter/clutter/clutter-offscreen-effect.c index d194787b7..a357f51cf 100644 --- a/clutter/clutter/clutter-offscreen-effect.c +++ b/clutter/clutter/clutter-offscreen-effect.c @@ -505,15 +505,10 @@ clutter_offscreen_effect_paint (ClutterEffect *effect, */ if (priv->offscreen == NULL || (flags & CLUTTER_EFFECT_PAINT_ACTOR_DIRTY)) { - ClutterEffectClass *effect_class = CLUTTER_EFFECT_GET_CLASS (effect); - gboolean pre_paint_succeeded; + ClutterEffectClass *parent_class = + CLUTTER_EFFECT_CLASS (clutter_offscreen_effect_parent_class); - pre_paint_succeeded = effect_class->pre_paint (effect, paint_context); - - clutter_actor_continue_paint (priv->actor, paint_context); - - if (pre_paint_succeeded) - effect_class->post_paint (effect, paint_context); + parent_class->paint (effect, paint_context, flags); } else clutter_offscreen_effect_paint_texture (self, paint_context);