diff --git a/Source/Core/Core/System.cpp b/Source/Core/Core/System.cpp index eecb590d5c..aeb81e5122 100644 --- a/Source/Core/Core/System.cpp +++ b/Source/Core/Core/System.cpp @@ -27,6 +27,7 @@ #include "Core/PowerPC/PowerPC.h" #include "IOS/USB/Emulated/Infinity.h" #include "IOS/USB/Emulated/Skylander.h" +#include "VideoCommon/Assets/CustomAssetLoader.h" #include "VideoCommon/CommandProcessor.h" #include "VideoCommon/Fifo.h" #include "VideoCommon/GeometryShaderManager.h" @@ -79,6 +80,7 @@ struct System::Impl VideoInterface::VideoInterfaceManager m_video_interface; Interpreter m_interpreter; JitInterface m_jit_interface; + VideoCommon::CustomAssetLoader m_custom_asset_loader; }; System::System() : m_impl{std::make_unique(*this)} @@ -263,4 +265,9 @@ VideoInterface::VideoInterfaceManager& System::GetVideoInterface() const { return m_impl->m_video_interface; } + +VideoCommon::CustomAssetLoader& System::GetCustomAssetLoader() const +{ + return m_impl->m_custom_asset_loader; +} } // namespace Core diff --git a/Source/Core/Core/System.h b/Source/Core/Core/System.h index 8d00a3ec5e..a8732eb106 100644 --- a/Source/Core/Core/System.h +++ b/Source/Core/Core/System.h @@ -85,6 +85,10 @@ namespace SerialInterface { class SerialInterfaceManager; }; +namespace VideoCommon +{ +class CustomAssetLoader; +} namespace VideoInterface { class VideoInterfaceManager; @@ -152,6 +156,7 @@ public: Sram& GetSRAM() const; VertexShaderManager& GetVertexShaderManager() const; VideoInterface::VideoInterfaceManager& GetVideoInterface() const; + VideoCommon::CustomAssetLoader& GetCustomAssetLoader() const; private: System();