summaryrefslogtreecommitdiff
path: root/Source/Core/VideoCommon/TextureCacheBase.cpp
diff options
context:
space:
mode:
authorAdmiral H. Curtiss <pikachu025@gmail.com>2023-06-23 17:59:24 +0200
committerGitHub <noreply@github.com>2023-06-23 17:59:24 +0200
commit5bf3d55d3864274814efc883fb54e464ae406cf0 (patch)
treeb8d758ed2fa2e3dda297992df8f5e8a2eda9d178 /Source/Core/VideoCommon/TextureCacheBase.cpp
parent5b7fdfc7caf88802a2b3c194eeda6ebee50f42c9 (diff)
parent2dc24a9148e1dc98ada6629fe6eebb673ceb336b (diff)
Merge pull request #11981 from iwubcode/move_cached_asset_to_common
VideoCommon: move cached texture asset to 'CustomAsset' common code
Diffstat (limited to 'Source/Core/VideoCommon/TextureCacheBase.cpp')
-rw-r--r--Source/Core/VideoCommon/TextureCacheBase.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/VideoCommon/TextureCacheBase.cpp b/Source/Core/VideoCommon/TextureCacheBase.cpp
index fc5c26b5a8..c26cbb5f4c 100644
--- a/Source/Core/VideoCommon/TextureCacheBase.cpp
+++ b/Source/Core/VideoCommon/TextureCacheBase.cpp
@@ -267,7 +267,7 @@ bool TextureCacheBase::DidLinkedAssetsChange(const TCacheEntry& entry)
return false;
const auto last_asset_write_time = entry.linked_asset.m_asset->GetLastLoadedTime();
- return last_asset_write_time > entry.linked_asset.m_last_write_time;
+ return last_asset_write_time > entry.linked_asset.m_cached_write_time;
}
RcTcacheEntry TextureCacheBase::ApplyPaletteToEntry(RcTcacheEntry& entry, const u8* palette,
@@ -1590,7 +1590,7 @@ RcTcacheEntry TextureCacheBase::GetTexture(const int textureCacheSafetyColorSamp
InvalidateTexture(oldest_entry);
}
- CachedTextureAsset cached_texture_asset;
+ VideoCommon::CachedAsset<VideoCommon::GameTextureAsset> cached_texture_asset;
std::shared_ptr<VideoCommon::CustomTextureData> data = nullptr;
bool has_arbitrary_mipmaps = false;
std::shared_ptr<HiresTexture> hires_texture;