fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-05 06:28:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

gl: Don't keep a temporary surface in the device

Browse source 
We get circular references that way.
If it turns out later such a cache is critical, we'll need to invent a
way to avoid circling references. For now, just pretend it's not
important.
This commit is contained in:
Benjamin Otte 2010-05-12 21:14:36 +02:00
parent ec1ca17b71
commit c69143e3f9
2 changed files with 8 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/cairo-gl-glyphs.c
View file

@ -672,32 +672,13 @@ _cairo_gl_surface_show_glyphs_via_mask (cairo_gl_surface_t *dst,
return status;
/* XXX: For non-CA, this should be CAIRO_CONTENT_ALPHA to save memory */
mask = NULL;
if (ctx->glyphs_temporary_mask) {
if (glyph_extents->width <= ctx->glyphs_temporary_mask->width &&
glyph_extents->height <= ctx->glyphs_temporary_mask->height)
{
status = _cairo_gl_surface_clear (ctx->glyphs_temporary_mask);
if (unlikely (status)) {
_cairo_gl_context_release (ctx);
return status;
}
mask = &ctx->glyphs_temporary_mask->base;
} else {
cairo_surface_destroy (&ctx->glyphs_temporary_mask->base);
ctx->glyphs_temporary_mask = NULL;
}
}
if (mask == NULL) {
mask = cairo_gl_surface_create (dst->base.device,
CAIRO_CONTENT_COLOR_ALPHA,
glyph_extents->width,
glyph_extents->height);
if (unlikely (mask->status)) {
_cairo_gl_context_release (ctx);
return mask->status;
}
mask = cairo_gl_surface_create (dst->base.device,
CAIRO_CONTENT_COLOR_ALPHA,
glyph_extents->width,
glyph_extents->height);
if (unlikely (mask->status)) {
_cairo_gl_context_release (ctx);
return mask->status;
}
for (i = 0; i < num_glyphs; i++) {
@ -730,8 +711,7 @@ _cairo_gl_surface_show_glyphs_via_mask (cairo_gl_surface_t *dst,
*remaining_glyphs = num_glyphs;
}
if (ctx->glyphs_temporary_mask == NULL)
ctx->glyphs_temporary_mask = (cairo_gl_surface_t *) mask;
cairo_surface_destroy (mask);
_cairo_gl_context_release (ctx);

1
src/cairo-gl-private.h
View file

@ -135,7 +135,6 @@ typedef struct _cairo_gl_context {
[CAIRO_GL_SHADER_IN_COUNT];
cairo_gl_surface_t *current_target;
cairo_gl_surface_t *glyphs_temporary_mask;
cairo_gl_glyph_cache_t glyph_cache[2];
cairo_list_t fonts;