Merge pull request #13386 from iwubcode/resource_manager_system

VideoCommon: add resource manager, tracks resources to load assets in optimal way and manage memory

1 files changed, 7 insertions, 7 deletions

diff --git a/Source/Core/VideoCommon/TextureCacheBase.h b/Source/Core/VideoCommon/TextureCacheBase.h
index 532feaca7d..dd6cb46368 100644
--- a/Source/Core/VideoCommon/TextureCacheBase.h
+++ b/Source/Core/VideoCommon/TextureCacheBase.h
@@ -24,6 +24,7 @@
 #include "VideoCommon/AbstractTexture.h"
 #include "VideoCommon/Assets/CustomAsset.h"
 #include "VideoCommon/BPMemory.h"
+#include "VideoCommon/HiresTextures.h"
 #include "VideoCommon/TextureConfig.h"
 #include "VideoCommon/TextureDecoder.h"
 #include "VideoCommon/TextureInfo.h"
@@ -167,8 +168,8 @@ struct TCacheEntry
 
   std::string texture_info_name = "";
 
-  std::vector<VideoCommon::CachedAsset<VideoCommon::GameTextureAsset>> linked_game_texture_assets;
-  std::vector<VideoCommon::CachedAsset<VideoCommon::CustomAsset>> linked_asset_dependencies;
+  VideoCommon::CustomAsset::TimeType last_load_time;
+  std::shared_ptr<HiresTexture> hires_texture;
 
   explicit TCacheEntry(std::unique_ptr<AbstractTexture> tex,
                        std::unique_ptr<AbstractFramebuffer> fb);
@@ -351,11 +352,10 @@ private:
 
   void SetBackupConfig(const VideoConfig& config);
 
-  RcTcacheEntry
-  CreateTextureEntry(const TextureCreationInfo& creation_info, const TextureInfo& texture_info,
-                     int safety_color_sample_size,
-                     std::vector<std::shared_ptr<VideoCommon::TextureData>> assets_data,
-                     bool custom_arbitrary_mipmaps, bool skip_texture_dump);
+  RcTcacheEntry CreateTextureEntry(const TextureCreationInfo& creation_info,
+                                   const TextureInfo& texture_info, int safety_color_sample_size,
+                                   VideoCommon::CustomTextureData* custom_texture_data,
+                                   bool custom_arbitrary_mipmaps, bool skip_texture_dump);
 
   RcTcacheEntry GetXFBFromCache(u32 address, u32 width, u32 height, u32 stride);