The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-03-12 14:46:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core: add CustomAssetLoader to System

Browse Source
This commit is contained in:
iwubcode 2023-03-20 01:22:09 -05:00
parent 678db26f68
commit 5738646e3e
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/Core/System.cpp
View File

@ -27,6 +27,7 @@
#include "Core/PowerPC/PowerPC.h" #include "Core/PowerPC/PowerPC.h"
#include "IOS/USB/Emulated/Infinity.h" #include "IOS/USB/Emulated/Infinity.h"
#include "IOS/USB/Emulated/Skylander.h" #include "IOS/USB/Emulated/Skylander.h"
#include "VideoCommon/Assets/CustomAssetLoader.h"
#include "VideoCommon/CommandProcessor.h" #include "VideoCommon/CommandProcessor.h"
#include "VideoCommon/Fifo.h" #include "VideoCommon/Fifo.h"
#include "VideoCommon/GeometryShaderManager.h" #include "VideoCommon/GeometryShaderManager.h"
@ -79,6 +80,7 @@ struct System::Impl
VideoInterface::VideoInterfaceManager m_video_interface; VideoInterface::VideoInterfaceManager m_video_interface;
Interpreter m_interpreter; Interpreter m_interpreter;
JitInterface m_jit_interface; JitInterface m_jit_interface;
VideoCommon::CustomAssetLoader m_custom_asset_loader;
}; };
System::System() : m_impl{std::make_unique<Impl>(*this)} System::System() : m_impl{std::make_unique<Impl>(*this)}
@ -263,4 +265,9 @@ VideoInterface::VideoInterfaceManager& System::GetVideoInterface() const
{ {
return m_impl->m_video_interface; return m_impl->m_video_interface;
} }
VideoCommon::CustomAssetLoader& System::GetCustomAssetLoader() const
{
return m_impl->m_custom_asset_loader;
}
} // namespace Core } // namespace Core

5
Source/Core/Core/System.h
View File

@ -85,6 +85,10 @@ namespace SerialInterface
{ {
class SerialInterfaceManager; class SerialInterfaceManager;
}; };
namespace VideoCommon
{
class CustomAssetLoader;
}
namespace VideoInterface namespace VideoInterface
{ {
class VideoInterfaceManager; class VideoInterfaceManager;
@ -152,6 +156,7 @@ public:
Sram& GetSRAM() const; Sram& GetSRAM() const;
VertexShaderManager& GetVertexShaderManager() const; VertexShaderManager& GetVertexShaderManager() const;
VideoInterface::VideoInterfaceManager& GetVideoInterface() const; VideoInterface::VideoInterfaceManager& GetVideoInterface() const;
VideoCommon::CustomAssetLoader& GetCustomAssetLoader() const;
private: private:
System(); System();