Core: Avoid (Some) Global System Accessor

This commit is contained in:
mitaclaw
2024-03-18 01:35:42 -07:00
parent 85dee300b5
commit f09b71582e
16 changed files with 54 additions and 51 deletions

View File

@ -316,9 +316,9 @@ int main(int argc, char* argv[])
#endif
s_platform->MainLoop();
Core::Stop();
Core::Stop(Core::System::GetInstance());
Core::Shutdown();
Core::Shutdown(Core::System::GetInstance());
s_platform.reset();
return 0;

View File

@ -9,6 +9,7 @@
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/State.h"
#include "Core/System.h"
#include <climits>
#include <cstdio>
@ -78,7 +79,7 @@ void PlatformFBDev::MainLoop()
while (IsRunning())
{
UpdateRunningFlag();
Core::HostDispatchJobs();
Core::HostDispatchJobs(Core::System::GetInstance());
// TODO: Is this sleep appropriate?
std::this_thread::sleep_for(std::chrono::milliseconds(1));

View File

@ -3,7 +3,9 @@
#include <cstdio>
#include <thread>
#include "Core/Core.h"
#include "Core/System.h"
#include "DolphinNoGUI/Platform.h"
namespace
@ -27,7 +29,7 @@ void PlatformHeadless::MainLoop()
while (m_running.IsSet())
{
UpdateRunningFlag();
Core::HostDispatchJobs();
Core::HostDispatchJobs(Core::System::GetInstance());
std::this_thread::sleep_for(std::chrono::milliseconds(100));
}
}

View File

@ -7,6 +7,7 @@
#include "Core/Config/MainSettings.h"
#include "Core/Core.h"
#include "Core/State.h"
#include "Core/System.h"
#include "VideoCommon/Present.h"
#include "VideoCommon/RenderBase.h"
@ -225,7 +226,7 @@ void PlatformMacOS::MainLoop()
while (IsRunning())
{
UpdateRunningFlag();
Core::HostDispatchJobs();
Core::HostDispatchJobs(Core::System::GetInstance());
ProcessEvents();
UpdateWindowPosition();
}

View File

@ -8,6 +8,7 @@
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/State.h"
#include "Core/System.h"
#include <Windows.h>
#include <climits>
@ -123,7 +124,7 @@ void PlatformWin32::MainLoop()
while (IsRunning())
{
UpdateRunningFlag();
Core::HostDispatchJobs();
Core::HostDispatchJobs(Core::System::GetInstance());
ProcessEvents();
UpdateWindowPosition();

View File

@ -15,6 +15,7 @@ static constexpr auto X_None = None;
#include "Core/Config/MainSettings.h"
#include "Core/Core.h"
#include "Core/State.h"
#include "Core/System.h"
#include <climits>
#include <cstdio>
@ -151,7 +152,7 @@ void PlatformX11::MainLoop()
while (IsRunning())
{
UpdateRunningFlag();
Core::HostDispatchJobs();
Core::HostDispatchJobs(Core::System::GetInstance());
ProcessEvents();
UpdateWindowPosition();