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

texture-cache: Don't share requests for uncachable textures

Browse Source 
Make create_texture_and_ensure_request() aware of the caching
policy to avoid returning the same texture for different
images.

https://bugzilla.gnome.org/show_bug.cgi?id=660585
This commit is contained in:
Florian Müllner 2011-10-05 01:18:16 +02:00
parent 472b20d933
commit 23a4d4c69e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1115,6 +1115,7 @@ st_texture_cache_load (StTextureCache *cache,
* @cache:
* @key: A cache key
* @size: Size in pixels
* @policy: Cache policy
* @request: (out): If no request is outstanding, one will be created and returned here
* @texture: (out): A new texture, also added to the request
*
@ -1128,6 +1129,7 @@ static gboolean
create_texture_and_ensure_request (StTextureCache *cache,
const char *key,
guint size,
StTextureCachePolicy policy,
AsyncTextureLoadData **request,
ClutterActor **texture)
{
@ -1154,7 +1156,8 @@ create_texture_and_ensure_request (StTextureCache *cache,
{
/* Not cached and no pending request, create it */
*request = g_new0 (AsyncTextureLoadData, 1);
g_hash_table_insert (cache->priv->outstanding_requests, g_strdup (key), *request);
if (policy != ST_TEXTURE_CACHE_POLICY_NONE)
g_hash_table_insert (cache->priv->outstanding_requests, g_strdup (key), *request);
}
else
*request = pending;
@ -1203,7 +1206,7 @@ load_gicon_with_colors (StTextureCache *cache,
}
g_free (gicon_string);
if (create_texture_and_ensure_request (cache, key, size, &request, &texture))
if (create_texture_and_ensure_request (cache, key, size, policy, &request, &texture))
{
g_free (key);
return texture;