brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

st-texture-cache: Obey cache policy in st_texture_cache_load

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=663461


(cherry picked from commit 50e849a186)
This commit is contained in:
Jasper St. Pierre 2011-11-04 20:03:33 +00:00 committed by Marco Trevisan
parent 9152d3a286
commit 4dfc2e0fd1
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/st/st-texture-cache.c
View File

@ -780,13 +780,13 @@ st_texture_cache_load (StTextureCache *cache,
if (!texture) if (!texture)
{ {
texture = load (cache, key, data, error); texture = load (cache, key, data, error);
if (texture) if (texture && policy == ST_TEXTURE_CACHE_POLICY_FOREVER)
g_hash_table_insert (cache->priv->keyed_cache, g_strdup (key), texture); g_hash_table_insert (cache->priv->keyed_cache, g_strdup (key), texture);
else
return NULL;
} }
cogl_object_ref (texture); if (texture && policy == ST_TEXTURE_CACHE_POLICY_FOREVER)
cogl_object_ref (texture);
return texture; return texture;
} }

2
src/st/st-theme-node-drawing.c
View File

@ -402,7 +402,7 @@ st_theme_node_lookup_corner (StThemeNode *node,
return COGL_INVALID_HANDLE; return COGL_INVALID_HANDLE;
key = corner_to_string (&corner); key = corner_to_string (&corner);
texture = st_texture_cache_load (cache, key, ST_TEXTURE_CACHE_POLICY_NONE, load_corner, &corner, NULL); texture = st_texture_cache_load (cache, key, ST_TEXTURE_CACHE_POLICY_FOREVER, load_corner, &corner, NULL);
if (texture) if (texture)
{ {