diff options
Diffstat (limited to 'src/cairo-gl-glyphs.c')
| -rw-r--r-- | src/cairo-gl-glyphs.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/cairo-gl-glyphs.c b/src/cairo-gl-glyphs.c index b390f821..140a9ea5 100644 --- a/src/cairo-gl-glyphs.c +++ b/src/cairo-gl-glyphs.c @@ -229,7 +229,7 @@ _render_glyphs (cairo_gl_surface_t *dst, cairo_gl_glyph_cache_t *cache = NULL; cairo_gl_context_t *ctx; cairo_gl_composite_t setup; - cairo_status_t status, status_maybe_ignored; + cairo_status_t status; int i = 0; *has_component_alpha = FALSE; @@ -306,14 +306,12 @@ _render_glyphs (cairo_gl_surface_t *dst, *has_component_alpha |= cache->pattern.base.has_component_alpha; - status = _cairo_gl_composite_begin (&setup, &ctx); - if (unlikely (status)) - goto FINISH; - /* XXX: _cairo_gl_composite_begin() acquires the context a * second time. Need to refactor this loop so this doesn't happen. */ - status = _cairo_gl_context_release (ctx); + status = _cairo_gl_composite_begin (&setup, &ctx); + + status = _cairo_gl_context_release (ctx, status); if (unlikely (status)) goto FINISH; } @@ -351,9 +349,7 @@ _render_glyphs (cairo_gl_surface_t *dst, FINISH: _cairo_scaled_font_thaw_cache (scaled_font); - status_maybe_ignored = _cairo_gl_context_release (ctx); - if (status == CAIRO_STATUS_SUCCESS) - status = status_maybe_ignored; + status = _cairo_gl_context_release (ctx, status); _cairo_gl_composite_fini (&setup); |