diff options
| author | Benjamin Otte <otte@redhat.com> | 2010-05-28 21:51:08 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2010-06-07 13:37:48 +0200 |
| commit | a8d6ac1efc3f1f5ff4f92f4e7a3492e62518f3f7 (patch) | |
| tree | a2a4a8edd5401e60da29cf82ae2a57fe176f6881 | |
| parent | 8f675fb801f7864aa52778d4d53d7ab68f4e664b (diff) | |
gl: Remove check if we're between begin/end
This will be useless soon, because we will keep the current state alive as
long as possible.
| -rw-r--r-- | src/cairo-gl-composite.c | 1 | ||||
| -rw-r--r-- | src/cairo-gl-private.h | 7 |
2 files changed, 0 insertions, 8 deletions
diff --git a/src/cairo-gl-composite.c b/src/cairo-gl-composite.c index ff8fc0c0..24291cfd 100644 --- a/src/cairo-gl-composite.c +++ b/src/cairo-gl-composite.c @@ -972,7 +972,6 @@ _cairo_gl_composite_begin (cairo_gl_composite_t *setup, if (unlikely (status)) return status; - assert (! _cairo_gl_context_is_in_progress (ctx)); glEnable (GL_BLEND); component_alpha = ((setup->mask.type == CAIRO_GL_OPERAND_TEXTURE) && diff --git a/src/cairo-gl-private.h b/src/cairo-gl-private.h index f28b0f5b..fe5be0c3 100644 --- a/src/cairo-gl-private.h +++ b/src/cairo-gl-private.h @@ -226,13 +226,6 @@ _cairo_gl_context_create_in_error (cairo_status_t status) cairo_private cairo_status_t _cairo_gl_context_init (cairo_gl_context_t *ctx); -static cairo_always_inline cairo_bool_t cairo_warn -_cairo_gl_context_is_in_progress (cairo_gl_context_t *ctx) -{ - /* This variable gets set when _begin() is called */ - return ctx->vertex_size != 0; -} - cairo_private void _cairo_gl_surface_init (cairo_device_t *device, cairo_gl_surface_t *surface, |