From 2dc24a9148e1dc98ada6629fe6eebb673ceb336b Mon Sep 17 00:00:00 2001 From: iwubcode Date: Tue, 20 Jun 2023 18:59:55 -0500 Subject: VideoCommon: move cached texture asset to 'CustomAsset' common code --- Source/Core/VideoCommon/TextureCacheBase.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'Source/Core/VideoCommon/TextureCacheBase.h') 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 } }; -struct CachedTextureAsset -{ - std::shared_ptr m_asset; - std::optional m_last_write_time; -}; - struct TCacheEntry { // common members @@ -172,7 +167,7 @@ struct TCacheEntry std::string texture_info_name = ""; - CachedTextureAsset linked_asset; + VideoCommon::CachedAsset linked_asset; explicit TCacheEntry(std::unique_ptr tex, std::unique_ptr fb); -- cgit v1.2.3