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:45:21 +0200
commitd571719a3dbefbc12097d67fb13e6b0e2007efb3 (patch)
tree6326bc84a54131169c66db1d3fb820515b2cb068
parent286e7e28e8d25eabe69fb20842d560648aac916b (diff)
downloadclutter-d571719a3dbefbc12097d67fb13e6b0e2007efb3.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/deprecated/clutter-cairo-texture.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/clutter/deprecated/clutter-cairo-texture.c b/clutter/deprecated/clutter-cairo-texture.c
index 9b4a3067d..c9bf3a21f 100644
--- a/clutter/deprecated/clutter-cairo-texture.c
+++ b/clutter/deprecated/clutter-cairo-texture.c
@@ -347,9 +347,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)
{
@@ -368,6 +365,8 @@ clutter_cairo_texture_emit_draw (ClutterCairoTexture *self,
self->priv->cr_context = NULL;
+ clutter_cairo_texture_context_destroy (ctxt);
+
cairo_destroy (cr);
}