summaryrefslogtreecommitdiffstats
path: root/src/yuzu_cmd/yuzu.cpp
diff options
context:
space:
mode:
authorRodrigo Locatti <reinuseslisp@airmail.cc>2020-09-21 02:21:32 +0200
committerGitHub <noreply@github.com>2020-09-21 02:21:32 +0200
commita2eb44db825a892cc2863bd1f5d0352c273ff0f0 (patch)
tree3e75441609f97c8a6ad01e70461ecb218c51d086 /src/yuzu_cmd/yuzu.cpp
parentMerge pull request #4683 from Morph1984/NpadHandheldActivationMode-impl (diff)
parentrenderer_opengl: Remove emulated mailbox presentation (diff)
downloadyuzu-a2eb44db825a892cc2863bd1f5d0352c273ff0f0.tar
yuzu-a2eb44db825a892cc2863bd1f5d0352c273ff0f0.tar.gz
yuzu-a2eb44db825a892cc2863bd1f5d0352c273ff0f0.tar.bz2
yuzu-a2eb44db825a892cc2863bd1f5d0352c273ff0f0.tar.lz
yuzu-a2eb44db825a892cc2863bd1f5d0352c273ff0f0.tar.xz
yuzu-a2eb44db825a892cc2863bd1f5d0352c273ff0f0.tar.zst
yuzu-a2eb44db825a892cc2863bd1f5d0352c273ff0f0.zip
Diffstat (limited to 'src/yuzu_cmd/yuzu.cpp')
-rw-r--r--src/yuzu_cmd/yuzu.cpp7
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();