mirrors/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-21 03:54:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'stable'

Browse source
This commit is contained in:
Jules Blok 2015-06-24 19:34:16 +02:00
commit 2a5dd69c72
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Source/Core/VideoCommon/TextureCacheBase.cpp
View file

@ -981,7 +981,7 @@ TextureCache::TCacheEntryBase* TextureCache::AllocateTexture(const TCacheEntryCo
INCSTAT(stats.numTexturesCreated);
}
entry->textures_by_hash_iter = textures_by_address.end();
entry->textures_by_hash_iter = textures_by_hash.end();
return entry;
}
@ -989,10 +989,10 @@ TextureCache::TexCache::iterator TextureCache::FreeTexture(TexCache::iterator it
{
TCacheEntryBase* entry = iter->second;
if (entry->textures_by_hash_iter != textures_by_address.end())
if (entry->textures_by_hash_iter != textures_by_hash.end())
{
textures_by_hash.erase(entry->textures_by_hash_iter);
entry->textures_by_hash_iter = textures_by_address.end();
entry->textures_by_hash_iter = textures_by_hash.end();
}
entry->frameCount = FRAMECOUNT_INVALID;