AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

gl: Speed up icon cache lookups

Browse Source 
Use gdk_texture_set_render_data to avoid
hash table lookups when we can.
This commit is contained in:
Matthias Clasen 2019-10-15 08:27:16 -04:00
parent e34d1b8a26
commit dd5ee87b5b
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gsk/gl/gskgliconcache.c
View File

@ -10,7 +10,10 @@
static void static void
icon_data_free (gpointer p) icon_data_free (gpointer p)
{ {
g_object_unref (((IconData *)p)->source_texture); IconData *icon_data = p;
gdk_texture_clear_render_data (icon_data->source_texture);
g_object_unref (icon_data->source_texture);
g_free (p); g_free (p);
} }
@ -91,12 +94,12 @@ gsk_gl_icon_cache_begin_frame (GskGLIconCache *self,
{ {
if (icon_data->used) if (icon_data->used)
{ {
const int width = gdk_texture_get_width (icon_data->source_texture); const int width = icon_data->source_texture->width;
const int height = gdk_texture_get_height (icon_data->source_texture); const int height = icon_data->source_texture->height;
gsk_gl_texture_atlas_mark_unused (icon_data->atlas, width + 2, height + 2); gsk_gl_texture_atlas_mark_unused (icon_data->atlas, width + 2, height + 2);
icon_data->used = FALSE; icon_data->used = FALSE;
} }
} }
icon_data->accessed = FALSE; icon_data->accessed = FALSE;
} }
@ -110,16 +113,18 @@ gsk_gl_icon_cache_lookup_or_add (GskGLIconCache *self,
GdkTexture *texture, GdkTexture *texture,
const IconData **out_icon_data) const IconData **out_icon_data)
{ {
IconData *icon_data = g_hash_table_lookup (self->icons, texture); IconData *icon_data;
icon_data = gdk_texture_get_render_data (texture, self);
if (!icon_data)
icon_data = g_hash_table_lookup (self->icons, texture);
if (icon_data) if (icon_data)
{ {
if (!icon_data->used) if (!icon_data->used)
{ {
const int width = gdk_texture_get_width (texture); gsk_gl_texture_atlas_mark_used (icon_data->atlas, texture->width + 2, texture->height + 2);
const int height = gdk_texture_get_height (texture);
gsk_gl_texture_atlas_mark_used (icon_data->atlas, width + 2, height + 2);
icon_data->used = TRUE; icon_data->used = TRUE;
} }
icon_data->accessed = TRUE; icon_data->accessed = TRUE;
@ -130,8 +135,8 @@ gsk_gl_icon_cache_lookup_or_add (GskGLIconCache *self,
/* texture not on any atlas yet. Find a suitable one. */ /* texture not on any atlas yet. Find a suitable one. */
{ {
const int width = gdk_texture_get_width (texture); const int width = texture->width;
const int height = gdk_texture_get_height (texture); const int height = texture->height;
GskGLTextureAtlas *atlas = NULL; GskGLTextureAtlas *atlas = NULL;
int packed_x = 0; int packed_x = 0;
int packed_y = 0; int packed_y = 0;
@ -229,6 +234,8 @@ gsk_gl_icon_cache_lookup_or_add (GskGLIconCache *self,
gdk_gl_context_pop_debug_group (gdk_gl_context_get_current ()); gdk_gl_context_pop_debug_group (gdk_gl_context_get_current ());
gdk_texture_set_render_data (texture, self, icon_data, NULL);
*out_icon_data = icon_data; *out_icon_data = icon_data;
cairo_surface_destroy (surface); cairo_surface_destroy (surface);