summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2012-06-20 10:26:49 +0200
committerAndy Wingo <wingo@pobox.com>2012-06-20 11:42:39 +0200
commitb6a0b708c3d6a056a3f3bf12e655b58d407fd5fd (patch)
tree0b4d325881e1bf0301d9c1b52a9e5802b4f21d54
parent6ca9a59e46553a7a4734ce0200aeacb72279d584 (diff)
downloadclutter-b6a0b708c3d6a056a3f3bf12e655b58d407fd5fd.tar.gz
cairo: Always update texture after ClutterCairoTexture::draw
* clutter/clutter-cairo-texture.c (clutter_cairo_texture_emit_draw): Always update the Cogl texture after emitting ::draw, since we control the dynamic extent in which drawing should happen on the cairo_t. Fixes #677966.
-rw-r--r--clutter/clutter-cairo-texture.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/clutter/clutter-cairo-texture.c b/clutter/clutter-cairo-texture.c
index c1c31e7d8..28d2a2691 100644
--- a/clutter/clutter-cairo-texture.c
+++ b/clutter/clutter-cairo-texture.c
@@ -342,9 +342,6 @@ clutter_cairo_texture_emit_draw (ClutterCairoTexture *self,
g_assert (self->priv->cr_surface != NULL);
cr = cairo_create (self->priv->cr_surface);
- cairo_set_user_data (cr, &clutter_cairo_texture_context_key,
- ctxt,
- clutter_cairo_texture_context_destroy);
if (ctxt->is_clipped)
{
@@ -363,6 +360,8 @@ clutter_cairo_texture_emit_draw (ClutterCairoTexture *self,
self->priv->cr_context = NULL;
+ clutter_cairo_texture_context_destroy (ctxt);
+
cairo_destroy (cr);
}