diff --git a/Source/Core/VideoCommon/TextureCacheBase.cpp b/Source/Core/VideoCommon/TextureCacheBase.cpp index 90d2c2048f..5bb8993897 100644 --- a/Source/Core/VideoCommon/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/TextureCacheBase.cpp @@ -272,6 +272,15 @@ void TextureCacheBase::SetBackupConfig(const VideoConfig& config) config.graphics_mod_config ? config.graphics_mod_config->GetChangeCount() : 0; } +bool TextureCacheBase::DidLinkedAssetsChange(const TCacheEntry& entry) +{ + if (!entry.linked_asset.m_asset) + 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; +} + RcTcacheEntry TextureCacheBase::ApplyPaletteToEntry(RcTcacheEntry& entry, const u8* palette, TLUTFormat tlutfmt) { @@ -1271,9 +1280,26 @@ private: }; TCacheEntry* TextureCacheBase::Load(const TextureInfo& texture_info) +{ + if (auto entry = LoadImpl(texture_info, false)) + { + if (!DidLinkedAssetsChange(*entry)) + { + return entry; + } + + InvalidateTexture(GetTexCacheIter(entry)); + return LoadImpl(texture_info, true); + } + + return nullptr; +} + +TCacheEntry* TextureCacheBase::LoadImpl(const TextureInfo& texture_info, bool force_reload) { // if this stage was not invalidated by changes to texture registers, keep the current texture - if (TMEM::IsValid(texture_info.GetStage()) && bound_textures[texture_info.GetStage()]) + if (!force_reload && TMEM::IsValid(texture_info.GetStage()) && + bound_textures[texture_info.GetStage()]) { TCacheEntry* entry = bound_textures[texture_info.GetStage()].get(); // If the TMEM configuration is such that this texture is more or less guaranteed to still @@ -1582,6 +1608,7 @@ RcTcacheEntry TextureCacheBase::GetTexture(const int textureCacheSafetyColorSamp InvalidateTexture(oldest_entry); } + CachedTextureAsset cached_texture_asset; std::shared_ptr data = nullptr; bool has_arbitrary_mipmaps = false; std::shared_ptr hires_texture; @@ -1591,6 +1618,8 @@ RcTcacheEntry TextureCacheBase::GetTexture(const int textureCacheSafetyColorSamp if (hires_texture) { data = hires_texture->GetAsset()->GetData(); + cached_texture_asset = {hires_texture->GetAsset(), + hires_texture->GetAsset()->GetLastLoadedTime()}; has_arbitrary_mipmaps = hires_texture->HasArbitraryMipmaps(); if (data) { @@ -1603,9 +1632,11 @@ RcTcacheEntry TextureCacheBase::GetTexture(const int textureCacheSafetyColorSamp } } - return CreateTextureEntry( + auto entry = CreateTextureEntry( TextureCreationInfo{base_hash, full_hash, bytes_per_block, palette_size}, texture_info, textureCacheSafetyColorSampleSize, data.get(), has_arbitrary_mipmaps); + entry->linked_asset = std::move(cached_texture_asset); + return entry; } RcTcacheEntry TextureCacheBase::CreateTextureEntry( diff --git a/Source/Core/VideoCommon/TextureCacheBase.h b/Source/Core/VideoCommon/TextureCacheBase.h index 72151c9443..bcfa7898fd 100644 --- a/Source/Core/VideoCommon/TextureCacheBase.h +++ b/Source/Core/VideoCommon/TextureCacheBase.h @@ -4,6 +4,7 @@ #pragma once #include +#include #include #include #include @@ -35,7 +36,8 @@ struct VideoConfig; namespace VideoCommon { class CustomTextureData; -} +class GameTextureAsset; +} // namespace VideoCommon constexpr std::string_view EFB_DUMP_PREFIX = "efb1"; constexpr std::string_view XFB_DUMP_PREFIX = "xfb1"; @@ -113,6 +115,12 @@ struct fmt::formatter } }; +struct CachedTextureAsset +{ + std::shared_ptr m_asset; + std::optional m_last_write_time; +}; + struct TCacheEntry { // common members @@ -164,6 +172,8 @@ struct TCacheEntry std::string texture_info_name = ""; + CachedTextureAsset linked_asset; + explicit TCacheEntry(std::unique_ptr tex, std::unique_ptr fb); @@ -337,6 +347,10 @@ private: using TexPool = std::unordered_multimap; + static bool DidLinkedAssetsChange(const TCacheEntry& entry); + + TCacheEntry* LoadImpl(const TextureInfo& texture_info, bool force_reload); + bool CreateUtilityTextures(); void SetBackupConfig(const VideoConfig& config);