diff options
| author | lat9nq <22451773+lat9nq@users.noreply.github.com> | 2021-09-02 21:40:55 -0400 |
|---|---|---|
| committer | Morph <39850852+Morph1984@users.noreply.github.com> | 2021-10-07 13:50:13 -0400 |
| commit | fb66a455c4c7c1e196fc1001a52325a33e50b127 (patch) | |
| tree | 97782dab7d9b57b119c765e73a585a6b90484a43 /src/yuzu/bootmanager.cpp | |
| parent | f84328934f5e09894a69d9fa1d2f6a34c715321b (diff) | |
yuzu qt: Remove global system instances from config, WaitTree, main
Diffstat (limited to 'src/yuzu/bootmanager.cpp')
| -rw-r--r-- | src/yuzu/bootmanager.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp index 8b9e186b05..c75f5e1ee1 100644 --- a/src/yuzu/bootmanager.cpp +++ b/src/yuzu/bootmanager.cpp @@ -42,7 +42,7 @@ #include "yuzu/bootmanager.h" #include "yuzu/main.h" -EmuThread::EmuThread() = default; +EmuThread::EmuThread(Core::System& system_) : system{system_} {} EmuThread::~EmuThread() = default; @@ -51,7 +51,6 @@ void EmuThread::run() { MicroProfileOnThreadCreate(name.c_str()); Common::SetCurrentThreadName(name.c_str()); - auto& system = Core::System::GetInstance(); auto& gpu = system.GPU(); auto stop_token = stop_source.get_token(); @@ -285,8 +284,10 @@ static Core::Frontend::EmuWindow::WindowSystemInfo GetWindowSystemInfo(QWindow* } GRenderWindow::GRenderWindow(GMainWindow* parent, EmuThread* emu_thread_, - std::shared_ptr<InputCommon::InputSubsystem> input_subsystem_) - : QWidget(parent), emu_thread(emu_thread_), input_subsystem{std::move(input_subsystem_)} { + std::shared_ptr<InputCommon::InputSubsystem> input_subsystem_, + Core::System& system_) + : QWidget(parent), + emu_thread(emu_thread_), input_subsystem{std::move(input_subsystem_)}, system{system_} { setWindowTitle(QStringLiteral("yuzu %1 | %2-%3") .arg(QString::fromUtf8(Common::g_build_name), QString::fromUtf8(Common::g_scm_branch), @@ -629,8 +630,7 @@ void GRenderWindow::ReleaseRenderTarget() { } void GRenderWindow::CaptureScreenshot(u32 res_scale, const QString& screenshot_path) { - auto& renderer = Core::System::GetInstance().Renderer(); - + VideoCore::RendererBase& renderer = system.Renderer(); if (res_scale == 0) { res_scale = VideoCore::GetResolutionScaleFactor(renderer); } |