From e4c85e9f1aae02009bfdfc945b4b09ba85e5b342 Mon Sep 17 00:00:00 2001 From: iwubcode Date: Sun, 3 Aug 2025 16:56:34 -0500 Subject: [PATCH] hirestexture resource changes --- Source/Core/VideoCommon/HiresTextures.cpp | 3 ++- Source/Core/VideoCommon/HiresTextures.h | 11 ++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Source/Core/VideoCommon/HiresTextures.cpp b/Source/Core/VideoCommon/HiresTextures.cpp index 8acc3aff03..12f59f5ff5 100644 --- a/Source/Core/VideoCommon/HiresTextures.cpp +++ b/Source/Core/VideoCommon/HiresTextures.cpp @@ -27,6 +27,7 @@ #include "VideoCommon/Assets/CustomAsset.h" #include "VideoCommon/Assets/DirectFilesystemAssetLibrary.h" #include "VideoCommon/OnScreenDisplay.h" +#include "VideoCommon/Resources/CustomResourceManager.h" #include "VideoCommon/VideoConfig.h" constexpr std::string_view s_format_prefix{"tex1_"}; @@ -191,7 +192,7 @@ HiresTexture::HiresTexture(bool has_arbitrary_mipmaps, std::string id) { } -VideoCommon::CustomResourceManager::TextureTimePair HiresTexture::LoadTexture() const +VideoCommon::TextureDataResource* HiresTexture::LoadTexture() const { auto& system = Core::System::GetInstance(); auto& custom_resource_manager = system.GetCustomResourceManager(); diff --git a/Source/Core/VideoCommon/HiresTextures.h b/Source/Core/VideoCommon/HiresTextures.h index e99a3fc966..f577aebd78 100644 --- a/Source/Core/VideoCommon/HiresTextures.h +++ b/Source/Core/VideoCommon/HiresTextures.h @@ -8,12 +8,13 @@ #include #include -#include "Common/CommonTypes.h" -#include "VideoCommon/Assets/CustomResourceManager.h" -#include "VideoCommon/Assets/CustomTextureData.h" -#include "VideoCommon/TextureConfig.h" #include "VideoCommon/TextureInfo.h" +namespace VideoCommon +{ +class TextureDataResource; +} + enum class TextureFormat; std::set GetTextureDirectoriesWithGameId(const std::string& root_directory, @@ -30,7 +31,7 @@ public: HiresTexture(bool has_arbitrary_mipmaps, std::string id); bool HasArbitraryMipmaps() const { return m_has_arbitrary_mipmaps; } - VideoCommon::CustomResourceManager::TextureTimePair LoadTexture() const; + VideoCommon::TextureDataResource* LoadTexture() const; const std::string& GetId() const { return m_id; } private: