diff --git a/Source/Core/Core/System.cpp b/Source/Core/Core/System.cpp index 5afc6a9dfa..c5ff6db61a 100644 --- a/Source/Core/Core/System.cpp +++ b/Source/Core/Core/System.cpp @@ -33,15 +33,14 @@ #include "IOS/USB/Emulated/Infinity.h" #include "IOS/USB/Emulated/Skylanders/Skylander.h" #include "IOS/USB/USBScanner.h" -#include "VideoCommon/Assets/CustomResourceManager.h" #include "VideoCommon/CommandProcessor.h" #include "VideoCommon/Fifo.h" #include "VideoCommon/GeometryShaderManager.h" #include "VideoCommon/GraphicsModEditor/EditorMain.h" -#include "VideoCommon/GraphicsModSystem/Runtime/CustomResourceManager.h" #include "VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.h" #include "VideoCommon/PixelEngine.h" #include "VideoCommon/PixelShaderManager.h" +#include "VideoCommon/Resources/CustomResourceManager.h" #include "VideoCommon/VertexShaderManager.h" #include "VideoCommon/XFStateManager.h" @@ -100,7 +99,6 @@ struct System::Impl Interpreter m_interpreter; JitInterface m_jit_interface; VideoCommon::CustomResourceManager m_custom_resource_manager; - VideoCommon::CustomResourceManager m_custom_resource_manager; FifoPlayer m_fifo_player; FifoRecorder m_fifo_recorder; Movie::MovieManager m_movie; @@ -346,11 +344,6 @@ VideoCommon::CustomResourceManager& System::GetCustomResourceManager() const return m_impl->m_custom_resource_manager; } -VideoCommon::CustomResourceManager& System::GetCustomResourceManager() const -{ - return m_impl->m_custom_resource_manager; -} - GraphicsModEditor::EditorMain& System::GetGraphicsModEditor() const { return m_impl->m_graphics_mod_editor; diff --git a/Source/Core/Core/System.h b/Source/Core/Core/System.h index e45f277f60..38fb66626c 100644 --- a/Source/Core/Core/System.h +++ b/Source/Core/Core/System.h @@ -206,7 +206,6 @@ public: XFStateManager& GetXFStateManager() const; VideoInterface::VideoInterfaceManager& GetVideoInterface() const; VideoCommon::CustomResourceManager& GetCustomResourceManager() const; - VideoCommon::CustomResourceManager& GetCustomResourceManager() const; GraphicsModEditor::EditorMain& GetGraphicsModEditor() const; GraphicsModSystem::Runtime::GraphicsModManager& GetGraphicsModManager() const;