diff options
| author | Jules Blok <jules.blok@gmail.com> | 2015-06-24 19:34:16 +0200 |
|---|---|---|
| committer | Jules Blok <jules.blok@gmail.com> | 2015-06-24 19:34:16 +0200 |
| commit | 2a5dd69c72677154215564aa837bb6bdc0213dea (patch) | |
| tree | 0dcf2b12a998ad3a8c409b7a1fea3c22ef520803 /Source/Core/VideoCommon/TextureCacheBase.cpp | |
| parent | 519a7c4a292b4277ce78a4472756f7e635574371 (diff) | |
| parent | 6274cdb478ddd3aa473df78b0b8c154795feb48a (diff) | |
Merge branch 'stable'
Diffstat (limited to 'Source/Core/VideoCommon/TextureCacheBase.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/TextureCacheBase.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/VideoCommon/TextureCacheBase.cpp b/Source/Core/VideoCommon/TextureCacheBase.cpp index 33424f654c..0b0588cf6e 100644 --- a/Source/Core/VideoCommon/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/TextureCacheBase.cpp @@ -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; |
