[cairo-commit] src/cairo-gl-composite.c

Chris Wilson ickle at kemper.freedesktop.org
Thu Feb 9 03:32:15 PST 2012

 src/cairo-gl-composite.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 7c34997a3ba89f2e957953aeb4bffa910dbf375b
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Feb 9 11:30:34 2012 +0000

    gl: Just flush the context upon operand destroy
    Replace the assertion that the context is flushed when we destroy the
    operation and jfdi. Easiest way to resolve it rather than untangle just
    why we end up there with an unflushed context.
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/cairo-gl-composite.c b/src/cairo-gl-composite.c
index ebd9455..064f4d7 100644
--- a/src/cairo-gl-composite.c
+++ b/src/cairo-gl-composite.c
@@ -269,7 +269,9 @@ _cairo_gl_context_destroy_operand (cairo_gl_context_t *ctx,
                                    cairo_gl_tex_t tex_unit)
     cairo_gl_dispatch_t *dispatch = &ctx->dispatch;
-    assert (_cairo_gl_context_is_flushed (ctx));
+    if  (!_cairo_gl_context_is_flushed (ctx))
+	_cairo_gl_composite_flush (ctx);
     switch (ctx->operands[tex_unit].type) {

More information about the cairo-commit mailing list