diff options
Diffstat (limited to 'Source/Core/VideoCommon/TextureCacheBase.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/TextureCacheBase.cpp | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/Source/Core/VideoCommon/TextureCacheBase.cpp b/Source/Core/VideoCommon/TextureCacheBase.cpp index 39af7f155c..0f8a39b341 100644 --- a/Source/Core/VideoCommon/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/TextureCacheBase.cpp @@ -1353,7 +1353,7 @@ void TextureCacheBase::CopyRenderTargetToTexture(u32 dstAddr, unsigned int dstFo TextureCacheBase::TCacheEntryBase* TextureCacheBase::AllocateTexture(const TCacheEntryConfig& config) { - TexPool::iterator iter = texture_pool.find(config); + TexPool::iterator iter = FindMatchingTextureFromPool(config); TextureCacheBase::TCacheEntryBase* entry; if (iter != texture_pool.end()) { @@ -1373,6 +1373,19 @@ TextureCacheBase::AllocateTexture(const TCacheEntryConfig& config) return entry; } +TextureCacheBase::TexPool::iterator +TextureCacheBase::FindMatchingTextureFromPool(const TCacheEntryConfig& config) +{ + // Find a texture from the pool that does not have a frameCount of FRAMECOUNT_INVALID. + // This prevents a texture from being used twice in a single frame with different data, + // which potentially means that a driver has to maintain two copies of the texture anyway. + auto range = texture_pool.equal_range(config); + auto matching_iter = std::find_if(range.first, range.second, [](const auto& iter) { + return iter.second->frameCount != FRAMECOUNT_INVALID; + }); + return matching_iter != range.second ? matching_iter : texture_pool.end(); +} + TextureCacheBase::TexCache::iterator TextureCacheBase::GetTexCacheIter(TextureCacheBase::TCacheEntryBase* entry) { |