summaryrefslogtreecommitdiff
path: root/Source/Core/VideoCommon/TextureCacheBase.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Source/Core/VideoCommon/TextureCacheBase.cpp')
-rw-r--r--Source/Core/VideoCommon/TextureCacheBase.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/Core/VideoCommon/TextureCacheBase.cpp b/Source/Core/VideoCommon/TextureCacheBase.cpp
index 4e4567da8e..e91479799b 100644
--- a/Source/Core/VideoCommon/TextureCacheBase.cpp
+++ b/Source/Core/VideoCommon/TextureCacheBase.cpp
@@ -1239,7 +1239,7 @@ private:
std::vector<Level> levels;
};
-TCacheEntry* TextureCacheBase::Load(u32 stage)
+RcTcacheEntry TextureCacheBase::Load(u32 stage)
{
if (auto entry = LoadImpl(stage, false))
{
@@ -1248,19 +1248,19 @@ TCacheEntry* TextureCacheBase::Load(u32 stage)
return entry;
}
- InvalidateTexture(GetTexCacheIter(entry));
+ InvalidateTexture(GetTexCacheIter(entry.get()));
return LoadImpl(stage, true);
}
return nullptr;
}
-TCacheEntry* TextureCacheBase::LoadImpl(u32 stage, bool force_reload)
+RcTcacheEntry TextureCacheBase::LoadImpl(u32 stage, bool force_reload)
{
// if this stage was not invalidated by changes to texture registers, keep the current texture
if (!force_reload && TMEM::IsValid(stage) && m_bound_textures[stage])
{
- TCacheEntry* entry = m_bound_textures[stage].get();
+ const auto& entry = m_bound_textures[stage];
// If the TMEM configuration is such that this texture is more or less guaranteed to still
// be in TMEM, then we know we can reuse the old entry without even hashing the memory
//
@@ -1308,7 +1308,7 @@ TCacheEntry* TextureCacheBase::LoadImpl(u32 stage, bool force_reload)
TMEM::Bind(texture_info.GetStage(), entry->NumBlocksX(), entry->NumBlocksY(),
entry->GetNumLevels() > 1, entry->format == TextureFormat::RGBA8);
- return entry.get();
+ return entry;
}
RcTcacheEntry TextureCacheBase::GetTexture(const int textureCacheSafetyColorSampleSize,