diff options
| author | Admiral H. Curtiss <pikachu025@gmail.com> | 2023-06-23 17:59:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-23 17:59:24 +0200 |
| commit | 5bf3d55d3864274814efc883fb54e464ae406cf0 (patch) | |
| tree | b8d758ed2fa2e3dda297992df8f5e8a2eda9d178 /Source/Core/VideoCommon/TextureCacheBase.h | |
| parent | 5b7fdfc7caf88802a2b3c194eeda6ebee50f42c9 (diff) | |
| parent | 2dc24a9148e1dc98ada6629fe6eebb673ceb336b (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.h')
| -rw-r--r-- | Source/Core/VideoCommon/TextureCacheBase.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/Source/Core/VideoCommon/TextureCacheBase.h b/Source/Core/VideoCommon/TextureCacheBase.h index 766b21bc80..f248d2b49f 100644 --- a/Source/Core/VideoCommon/TextureCacheBase.h +++ b/Source/Core/VideoCommon/TextureCacheBase.h @@ -22,6 +22,7 @@ #include "Common/MathUtil.h" #include "VideoCommon/AbstractTexture.h" +#include "VideoCommon/Assets/CustomAsset.h" #include "VideoCommon/BPMemory.h" #include "VideoCommon/TextureConfig.h" #include "VideoCommon/TextureDecoder.h" @@ -115,12 +116,6 @@ struct fmt::formatter<EFBCopyParams> } }; -struct CachedTextureAsset -{ - std::shared_ptr<VideoCommon::GameTextureAsset> m_asset; - std::optional<std::filesystem::file_time_type> m_last_write_time; -}; - struct TCacheEntry { // common members @@ -172,7 +167,7 @@ struct TCacheEntry std::string texture_info_name = ""; - CachedTextureAsset linked_asset; + VideoCommon::CachedAsset<VideoCommon::GameTextureAsset> linked_asset; explicit TCacheEntry(std::unique_ptr<AbstractTexture> tex, std::unique_ptr<AbstractFramebuffer> fb); |
