From dbe0602c4cae91b812fd66bd047f40c2d709ac84 Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Sun, 5 Jul 2020 15:12:57 -0300 Subject: [PATCH] clutter/colorize-effect: Switch to create_pipeline vfunc https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1355 --- clutter/clutter/clutter-colorize-effect.c | 62 +++++------------------ 1 file changed, 13 insertions(+), 49 deletions(-) diff --git a/clutter/clutter/clutter-colorize-effect.c b/clutter/clutter/clutter-colorize-effect.c index db372a9cb..8b8aba1d7 100644 --- a/clutter/clutter/clutter-colorize-effect.c +++ b/clutter/clutter/clutter-colorize-effect.c @@ -59,9 +59,6 @@ struct _ClutterColorizeEffect gint tint_uniform; - gint tex_width; - gint tex_height; - CoglPipeline *pipeline; }; @@ -104,16 +101,23 @@ G_DEFINE_TYPE (ClutterColorizeEffect, clutter_colorize_effect, CLUTTER_TYPE_OFFSCREEN_EFFECT); +static CoglPipeline * +clutter_colorize_effect_create_pipeline (ClutterOffscreenEffect *effect, + CoglTexture *texture) +{ + ClutterColorizeEffect *colorize_effect = CLUTTER_COLORIZE_EFFECT (effect); + + cogl_pipeline_set_layer_texture (colorize_effect->pipeline, 0, texture); + + return cogl_object_ref (colorize_effect->pipeline); +} + static gboolean clutter_colorize_effect_pre_paint (ClutterEffect *effect, ClutterPaintContext *paint_context) { - ClutterColorizeEffect *self = CLUTTER_COLORIZE_EFFECT (effect); ClutterEffectClass *parent_class; - if (!clutter_actor_meta_get_enabled (CLUTTER_ACTOR_META (effect))) - return FALSE; - if (!clutter_feature_available (CLUTTER_FEATURE_SHADERS_GLSL)) { /* if we don't have support for GLSL shaders then we @@ -127,47 +131,7 @@ clutter_colorize_effect_pre_paint (ClutterEffect *effect, } parent_class = CLUTTER_EFFECT_CLASS (clutter_colorize_effect_parent_class); - if (parent_class->pre_paint (effect, paint_context)) - { - ClutterOffscreenEffect *offscreen_effect = - CLUTTER_OFFSCREEN_EFFECT (effect); - CoglHandle texture; - - texture = clutter_offscreen_effect_get_texture (offscreen_effect); - self->tex_width = cogl_texture_get_width (texture); - self->tex_height = cogl_texture_get_height (texture); - - cogl_pipeline_set_layer_texture (self->pipeline, 0, texture); - - return TRUE; - } - else - return FALSE; -} - -static void -clutter_colorize_effect_paint_target (ClutterOffscreenEffect *effect, - ClutterPaintContext *paint_context) -{ - ClutterColorizeEffect *self = CLUTTER_COLORIZE_EFFECT (effect); - CoglFramebuffer *framebuffer = - clutter_paint_context_get_framebuffer (paint_context); - ClutterActor *actor; - guint8 paint_opacity; - - actor = clutter_actor_meta_get_actor (CLUTTER_ACTOR_META (effect)); - paint_opacity = clutter_actor_get_paint_opacity (actor); - - cogl_pipeline_set_color4ub (self->pipeline, - paint_opacity, - paint_opacity, - paint_opacity, - paint_opacity); - - cogl_framebuffer_draw_rectangle (framebuffer, - self->pipeline, - 0, 0, - self->tex_width, self->tex_height); + return parent_class->pre_paint (effect, paint_context); } static void @@ -233,7 +197,7 @@ clutter_colorize_effect_class_init (ClutterColorizeEffectClass *klass) ClutterOffscreenEffectClass *offscreen_class; offscreen_class = CLUTTER_OFFSCREEN_EFFECT_CLASS (klass); - offscreen_class->paint_target = clutter_colorize_effect_paint_target; + offscreen_class->create_pipeline = clutter_colorize_effect_create_pipeline; effect_class->pre_paint = clutter_colorize_effect_pre_paint;