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

Revert "gl: Speed up icon cache lookups"

Browse Source 
This reverts commit dd5ee87b5b.
This commit is contained in:
Matthias Clasen 2019-10-22 02:39:56 -04:00
parent 472d8eebbe
commit 5b508ea94a
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gsk/gl/gskgliconcache.c
View File

@ -10,10 +10,7 @@
static void
icon_data_free (gpointer p)
{
IconData *icon_data = p;
gdk_texture_clear_render_data (icon_data->source_texture);
g_object_unref (icon_data->source_texture);
g_object_unref (((IconData *)p)->source_texture);
g_free (p);
}
@ -99,7 +96,7 @@ gsk_gl_icon_cache_begin_frame (GskGLIconCache *self,
gsk_gl_texture_atlas_mark_unused (icon_data->atlas, width + 2, height + 2);
icon_data->used = FALSE;
}
}
}
icon_data->accessed = FALSE;
}
@ -113,12 +110,7 @@ gsk_gl_icon_cache_lookup_or_add (GskGLIconCache *self,
GdkTexture *texture,
const IconData **out_icon_data)
{
IconData *icon_data;
icon_data = gdk_texture_get_render_data (texture, self);
if (!icon_data)
icon_data = g_hash_table_lookup (self->icons, texture);
IconData *icon_data = g_hash_table_lookup (self->icons, texture);
if (icon_data)
{
@ -234,8 +226,6 @@ gsk_gl_icon_cache_lookup_or_add (GskGLIconCache *self,
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;
cairo_surface_destroy (surface);