diff options
| author | Benjamin Otte <otte@redhat.com> | 2010-05-17 14:20:17 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2010-05-17 18:54:31 +0200 |
| commit | 7f22372edf10f5eab53ea132d9226f6d5b49eb9a (patch) | |
| tree | d44796d811a322f71d33bb1e4807f288492aaef5 | |
| parent | 75f15babed8409fb1eaae514411de01d57072c80 (diff) | |
gl: Get rid of src and mask argument to composite_init()
This was thought of as a way to detect self-painting, but it's better to
check that later in _begin() - when we check it.
| -rw-r--r-- | src/cairo-gl-composite.c | 2 | ||||
| -rw-r--r-- | src/cairo-gl-glyphs.c | 2 | ||||
| -rw-r--r-- | src/cairo-gl-private.h | 2 | ||||
| -rw-r--r-- | src/cairo-gl-surface.c | 9 |
4 files changed, 5 insertions, 10 deletions
diff --git a/src/cairo-gl-composite.c b/src/cairo-gl-composite.c index 8491821b..c492d2c5 100644 --- a/src/cairo-gl-composite.c +++ b/src/cairo-gl-composite.c @@ -1370,8 +1370,6 @@ _cairo_gl_composite_init (cairo_gl_context_t *ctx, cairo_gl_composite_t *setup, cairo_operator_t op, cairo_gl_surface_t *dst, - const cairo_pattern_t *src, - const cairo_pattern_t *mask, cairo_bool_t assume_component_alpha, const cairo_rectangle_int_t *rect) { diff --git a/src/cairo-gl-glyphs.c b/src/cairo-gl-glyphs.c index d9107bcb..7d187c5d 100644 --- a/src/cairo-gl-glyphs.c +++ b/src/cairo-gl-glyphs.c @@ -287,7 +287,7 @@ _render_glyphs (cairo_gl_surface_t *dst, _cairo_scaled_font_freeze_cache (scaled_font); status = _cairo_gl_composite_init (ctx, &setup, - op, dst, source, NULL, + op, dst, TRUE, glyph_extents); if (unlikely (status)) diff --git a/src/cairo-gl-private.h b/src/cairo-gl-private.h index 1f03d413..2a1007e0 100644 --- a/src/cairo-gl-private.h +++ b/src/cairo-gl-private.h @@ -277,8 +277,6 @@ _cairo_gl_composite_init (cairo_gl_context_t *ctx, cairo_gl_composite_t *setup, cairo_operator_t op, cairo_gl_surface_t *dst, - const cairo_pattern_t *src, - const cairo_pattern_t *mask, cairo_bool_t has_component_alpha, const cairo_rectangle_int_t *rect); diff --git a/src/cairo-gl-surface.c b/src/cairo-gl-surface.c index b7bf14a7..531159b8 100644 --- a/src/cairo-gl-surface.c +++ b/src/cairo-gl-surface.c @@ -971,7 +971,7 @@ _cairo_gl_surface_composite (cairo_operator_t op, return status; status = _cairo_gl_composite_init (ctx, &setup, - op, dst, src, mask, + op, dst, mask && mask->has_component_alpha, &rect); if (unlikely (status)) @@ -1098,15 +1098,14 @@ _cairo_gl_surface_fill_rectangles (void *abstract_dst, if (unlikely (status)) return status; - _cairo_pattern_init_solid (&solid, color, CAIRO_CONTENT_COLOR_ALPHA); - status = _cairo_gl_composite_init (ctx, &setup, - op, dst, &solid.base, NULL, + op, dst, FALSE, /* XXX */ NULL); if (unlikely (status)) goto CLEANUP; + _cairo_pattern_init_solid (&solid, color, CAIRO_CONTENT_COLOR_ALPHA); status = _cairo_gl_composite_set_source (ctx, &setup, &solid.base, 0, 0, 0, 0, @@ -1302,7 +1301,7 @@ _cairo_gl_surface_create_span_renderer (cairo_operator_t op, status = _cairo_gl_composite_init (renderer->ctx, &renderer->setup, - op, dst, src, NULL, + op, dst, FALSE, extents); if (unlikely (status)) goto FAIL; |