clutter/offscreen-effect: Don't ever early out out of post paint

If we would, we'd miss popping the framebuffer from the pant context
framebuffer stack.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1166
This commit is contained in:
Jonas Ådahl 2020-03-31 19:42:47 +02:00 committed by Georges Basile Stavracas Neto
parent 50e0ae3cf3
commit 223f033780

View File

@ -446,13 +446,16 @@ clutter_offscreen_effect_post_paint (ClutterEffect *effect,
ClutterOffscreenEffectPrivate *priv = self->priv; ClutterOffscreenEffectPrivate *priv = self->priv;
CoglFramebuffer *framebuffer; CoglFramebuffer *framebuffer;
if (priv->offscreen == NULL || g_warn_if_fail (priv->offscreen);
priv->target == NULL || g_warn_if_fail (priv->target);
priv->actor == NULL) g_warn_if_fail (priv->actor);
return;
/* Restore the previous opacity override */ /* Restore the previous opacity override */
clutter_actor_set_opacity_override (priv->actor, priv->old_opacity_override); if (priv->actor)
{
clutter_actor_set_opacity_override (priv->actor,
priv->old_opacity_override);
}
framebuffer = clutter_paint_context_get_framebuffer (paint_context); framebuffer = clutter_paint_context_get_framebuffer (paint_context);
cogl_framebuffer_pop_matrix (framebuffer); cogl_framebuffer_pop_matrix (framebuffer);