AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-28 06:21:14 +00:00
Code Issues Projects Releases Wiki Activity

gl: Improve cache dropping code

Browse Source 
There was a TODO here to avoid iterating the
glyphs multiple times, so avoid that. And
actually log the number of glyphs that was dropped.
This commit is contained in:
Matthias Clasen 2019-06-02 22:21:05 +00:00
parent ad2a1c92ce
commit 0a09b8dca7
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
gsk/gl/gskglglyphcache.c
View File

@ -381,7 +381,7 @@ gsk_gl_glyph_cache_begin_frame (GskGLGlyphCache *self)
GHashTableIter iter;
GlyphCacheKey *key;
GskGLCachedGlyph *value;
guint dropped = 0;
GHashTable *removed = g_hash_table_new (g_direct_hash, g_direct_equal);
self->timestamp++;
@ -421,18 +421,29 @@ gsk_gl_glyph_cache_begin_frame (GskGLGlyphCache *self)
atlas->image->texture_id = 0;
}
/* Remove all glyphs that point to this atlas */
g_hash_table_iter_init (&iter, self->hash_table);
while (g_hash_table_iter_next (&iter, (gpointer *)&key, (gpointer *)&value))
{
if (value->atlas == atlas)
g_hash_table_iter_remove (&iter);
}
/* TODO: The above loop inside this other loop could be slow... */
g_hash_table_add (removed, atlas);
g_ptr_array_remove_index (self->atlases, i);
}
}
}
GSK_RENDERER_NOTE(self->renderer, GLYPH_CACHE, g_message ("Dropped %d glyphs", dropped));
if (g_hash_table_size (removed) > 0)
{
guint dropped = 0;
/* Remove all glyphs whose atlas was removed */
g_hash_table_iter_init (&iter, self->hash_table);
while (g_hash_table_iter_next (&iter, (gpointer *)&key, (gpointer *)&value))
{
if (g_hash_table_contains (removed, value->atlas))
{
g_hash_table_iter_remove (&iter);
dropped++;
}
}
GSK_RENDERER_NOTE(self->renderer, GLYPH_CACHE, if (dropped > 0) g_message ("Dropped %d glyphs", dropped));
}
g_hash_table_unref (removed);
}