diff options
author | ReinUsesLisp <reinuseslisp@airmail.cc> | 2020-09-19 22:15:02 +0200 |
---|---|---|
committer | ReinUsesLisp <reinuseslisp@airmail.cc> | 2020-09-20 21:29:41 +0200 |
commit | 7003090187e02c8625f4eb7a024ac97f9b0159aa (patch) | |
tree | b38f399967df79eb7c0dc711508cd54b7c9bf62e /src/yuzu_cmd/yuzu.cpp | |
parent | Merge pull request #4643 from FearlessTobi/decrease-pad-update-interval (diff) | |
download | yuzu-7003090187e02c8625f4eb7a024ac97f9b0159aa.tar yuzu-7003090187e02c8625f4eb7a024ac97f9b0159aa.tar.gz yuzu-7003090187e02c8625f4eb7a024ac97f9b0159aa.tar.bz2 yuzu-7003090187e02c8625f4eb7a024ac97f9b0159aa.tar.lz yuzu-7003090187e02c8625f4eb7a024ac97f9b0159aa.tar.xz yuzu-7003090187e02c8625f4eb7a024ac97f9b0159aa.tar.zst yuzu-7003090187e02c8625f4eb7a024ac97f9b0159aa.zip |
Diffstat (limited to 'src/yuzu_cmd/yuzu.cpp')
-rw-r--r-- | src/yuzu_cmd/yuzu.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/yuzu_cmd/yuzu.cpp b/src/yuzu_cmd/yuzu.cpp index e960b5413..3a76c785f 100644 --- a/src/yuzu_cmd/yuzu.cpp +++ b/src/yuzu_cmd/yuzu.cpp @@ -185,11 +185,11 @@ int main(int argc, char** argv) { std::unique_ptr<EmuWindow_SDL2> emu_window; switch (Settings::values.renderer_backend.GetValue()) { case Settings::RendererBackend::OpenGL: - emu_window = std::make_unique<EmuWindow_SDL2_GL>(system, fullscreen, &input_subsystem); + emu_window = std::make_unique<EmuWindow_SDL2_GL>(&input_subsystem, fullscreen); break; case Settings::RendererBackend::Vulkan: #ifdef HAS_VULKAN - emu_window = std::make_unique<EmuWindow_SDL2_VK>(system, fullscreen, &input_subsystem); + emu_window = std::make_unique<EmuWindow_SDL2_VK>(&input_subsystem); break; #else LOG_CRITICAL(Frontend, "Vulkan backend has not been compiled!"); @@ -240,14 +240,11 @@ int main(int argc, char** argv) { system.CurrentProcess()->GetTitleID(), false, [](VideoCore::LoadCallbackStage, size_t value, size_t total) {}); - std::thread render_thread([&emu_window] { emu_window->Present(); }); system.Run(); while (emu_window->IsOpen()) { std::this_thread::sleep_for(std::chrono::milliseconds(1)); } system.Pause(); - render_thread.join(); - system.Shutdown(); detached_tasks.WaitForAllTasks(); |