Merge branch 'linuxmint:master' into master

Author: itz-me-zappex

clutter/clutter/clutter-offscreen-effect.c

@@ -603,6 +603,30 @@ clutter_offscreen_effect_get_target (ClutterOffscreenEffect *effect)
   return (CoglMaterial *)effect->priv->target;
 }
 
+/**
+ * clutter_offscreen_effect_get_pipeline:
+ * @effect: a #ClutterOffscreenEffect
+ *
+ * Retrieves the pipeline used as a render target for the offscreen
+ * buffer created by @effect
+ *
+ * You should only use the returned #CoglPipeline when painting. The
+ * returned pipeline might change between different frames.
+ *
+ * Return value: (transfer none): a #CoglPipeline or %NULL. The
+ *   returned pipeline is owned by Clutter and it should not be
+ *   modified or freed
+ *
+ */
+CoglPipeline *
+clutter_offscreen_effect_get_pipeline (ClutterOffscreenEffect *effect)
+{
+  g_return_val_if_fail (CLUTTER_IS_OFFSCREEN_EFFECT (effect),
+                        NULL);
+
+  return effect->priv->target;
+}
+
 /**
  * clutter_offscreen_effect_paint_target:
  * @effect: a #ClutterOffscreenEffect

clutter/clutter/clutter-offscreen-effect.h

@@ -98,6 +98,9 @@ GType clutter_offscreen_effect_get_type (void) G_GNUC_CONST;
 CLUTTER_EXPORT
 CoglMaterial *  clutter_offscreen_effect_get_target             (ClutterOffscreenEffect *effect);
 
+CLUTTER_EXPORT
+CoglPipeline *  clutter_offscreen_effect_get_pipeline           (ClutterOffscreenEffect *effect);
+
 CLUTTER_EXPORT
 CoglHandle      clutter_offscreen_effect_get_texture            (ClutterOffscreenEffect *effect);
 

debian/libmuffin0.symbols

@@ -876,6 +876,7 @@ libmuffin-clutter-0.so.0 libmuffin0 #MINVER#
  clutter_matrix_init_identity@Base 5.3.0
  clutter_modifier_type_get_type@Base 5.3.0
  clutter_offscreen_effect_create_texture@Base 5.3.0
+ clutter_offscreen_effect_get_pipeline@Base 6.6.0
  clutter_offscreen_effect_get_target@Base 5.3.0
  clutter_offscreen_effect_get_target_rect@Base 5.3.0
  clutter_offscreen_effect_get_target_size@Base 5.3.0