mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-16 23:39:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

hirestexture resource changes

Browse source
This commit is contained in:
iwubcode 2025-08-03 16:56:34 -05:00
commit e4c85e9f1a
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Source/Core/VideoCommon/HiresTextures.cpp
View file

@ -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();

11
Source/Core/VideoCommon/HiresTextures.h
View file

@ -8,12 +8,13 @@
#include <string>
#include <vector>
#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<std::string> 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: