diff options
| author | Benjamin Otte <otte@redhat.com> | 2010-05-26 19:16:41 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2010-06-07 13:37:47 +0200 |
| commit | 9486ad5fbdad047b5194f6bed68a08bb4c594610 (patch) | |
| tree | cfa22f3f63c62ce5ac97ca749fc2a1550374bda4 | |
| parent | 16e420b4dca5325ab295a27103299a916f334b05 (diff) | |
gl: Remove composite_t argument from _flush() function
| -rw-r--r-- | src/cairo-gl-composite.c | 17 | ||||
| -rw-r--r-- | src/cairo-gl-glyphs.c | 2 | ||||
| -rw-r--r-- | src/cairo-gl-private.h | 3 |
3 files changed, 9 insertions, 13 deletions
diff --git a/src/cairo-gl-composite.c b/src/cairo-gl-composite.c index 38b46cc1..6cd2eb7d 100644 --- a/src/cairo-gl-composite.c +++ b/src/cairo-gl-composite.c @@ -1024,7 +1024,6 @@ FAIL: static inline void _cairo_gl_composite_draw (cairo_gl_context_t *ctx, - cairo_gl_composite_t *setup, unsigned int count) { if (! ctx->pre_shader) { @@ -1045,8 +1044,7 @@ _cairo_gl_composite_draw (cairo_gl_context_t *ctx, } void -_cairo_gl_composite_flush (cairo_gl_context_t *ctx, - cairo_gl_composite_t *setup) +_cairo_gl_composite_flush (cairo_gl_context_t *ctx) { unsigned int count; @@ -1068,20 +1066,19 @@ _cairo_gl_composite_flush (cairo_gl_context_t *ctx, cairo_region_get_rectangle (ctx->clip_region, i, &rect); glScissor (rect.x, rect.y, rect.width, rect.height); - _cairo_gl_composite_draw (ctx, setup, count); + _cairo_gl_composite_draw (ctx, count); } } else { - _cairo_gl_composite_draw (ctx, setup, count); + _cairo_gl_composite_draw (ctx, count); } } static void _cairo_gl_composite_prepare_buffer (cairo_gl_context_t *ctx, - cairo_gl_composite_t *setup, unsigned int n_vertices) { if (ctx->vb_offset + n_vertices * ctx->vertex_size > CAIRO_GL_VBO_SIZE) - _cairo_gl_composite_flush (ctx, setup); + _cairo_gl_composite_flush (ctx); if (ctx->vb == NULL) { glBufferDataARB (GL_ARRAY_BUFFER_ARB, CAIRO_GL_VBO_SIZE, @@ -1161,7 +1158,7 @@ _cairo_gl_composite_emit_rect (cairo_gl_context_t *ctx, GLfloat y2, uint8_t alpha) { - _cairo_gl_composite_prepare_buffer (ctx, setup, 6); + _cairo_gl_composite_prepare_buffer (ctx, 6); _cairo_gl_composite_emit_vertex (ctx, setup, x1, y1, alpha); _cairo_gl_composite_emit_vertex (ctx, setup, x2, y1, alpha); @@ -1205,7 +1202,7 @@ _cairo_gl_composite_emit_glyph (cairo_gl_context_t *ctx, GLfloat glyph_x2, GLfloat glyph_y2) { - _cairo_gl_composite_prepare_buffer (ctx, setup, 6); + _cairo_gl_composite_prepare_buffer (ctx, 6); _cairo_gl_composite_emit_glyph_vertex (ctx, setup, x1, y1, glyph_x1, glyph_y1); _cairo_gl_composite_emit_glyph_vertex (ctx, setup, x2, y1, glyph_x2, glyph_y1); @@ -1220,7 +1217,7 @@ void _cairo_gl_composite_end (cairo_gl_context_t *ctx, cairo_gl_composite_t *setup) { - _cairo_gl_composite_flush (ctx, setup); + _cairo_gl_composite_flush (ctx); if (ctx->clip_region) { glDisable (GL_SCISSOR_TEST); diff --git a/src/cairo-gl-glyphs.c b/src/cairo-gl-glyphs.c index ca0b596c..d500785b 100644 --- a/src/cairo-gl-glyphs.c +++ b/src/cairo-gl-glyphs.c @@ -324,7 +324,7 @@ _render_glyphs (cairo_gl_surface_t *dst, if (status == CAIRO_INT_STATUS_UNSUPPORTED) { /* Cache is full, so flush existing prims and try again. */ - _cairo_gl_composite_flush (ctx, &setup); + _cairo_gl_composite_flush (ctx); _cairo_gl_glyph_cache_unlock (cache); status = _cairo_gl_glyph_cache_add_glyph (ctx, cache, scaled_glyph); } diff --git a/src/cairo-gl-private.h b/src/cairo-gl-private.h index e8c8c684..bc916d30 100644 --- a/src/cairo-gl-private.h +++ b/src/cairo-gl-private.h @@ -342,8 +342,7 @@ _cairo_gl_composite_emit_glyph (cairo_gl_context_t *ctx, GLfloat glyph_y2); cairo_private void -_cairo_gl_composite_flush (cairo_gl_context_t *ctx, - cairo_gl_composite_t *setup); +_cairo_gl_composite_flush (cairo_gl_context_t *ctx); cairo_private void _cairo_gl_composite_end (cairo_gl_context_t *ctx, |