aboutsummaryrefslogtreecommitdiff
path: root/src/yuzu_tester/emu_window/emu_window_sdl2_hide.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2020-08-28 09:57:50 -0400
committerGitHub <noreply@github.com>2020-08-28 09:57:50 -0400
commit45b73ba840411fa61c75e6fe954b9a46ca5d59b6 (patch)
treec99333f0b6b386bfb80712d8e6ffa94bef04a9ff /src/yuzu_tester/emu_window/emu_window_sdl2_hide.cpp
parent40320a1d8428f9079d43a363421083678c4a9042 (diff)
parent9e1b0af25907f7a8b960aa5c1e7d931691f40196 (diff)
Merge pull request #4544 from lioncash/input-sub
input_common: Eliminate most global state
Diffstat (limited to 'src/yuzu_tester/emu_window/emu_window_sdl2_hide.cpp')
-rw-r--r--src/yuzu_tester/emu_window/emu_window_sdl2_hide.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/yuzu_tester/emu_window/emu_window_sdl2_hide.cpp b/src/yuzu_tester/emu_window/emu_window_sdl2_hide.cpp
index 8584f6671..78f75fb38 100644
--- a/src/yuzu_tester/emu_window/emu_window_sdl2_hide.cpp
+++ b/src/yuzu_tester/emu_window/emu_window_sdl2_hide.cpp
@@ -13,7 +13,6 @@
#include <glad/glad.h>
-#include "common/assert.h"
#include "common/logging/log.h"
#include "common/scm_rev.h"
#include "core/settings.h"
@@ -53,7 +52,7 @@ EmuWindow_SDL2_Hide::EmuWindow_SDL2_Hide() {
exit(1);
}
- InputCommon::Init();
+ input_subsystem->Initialize();
SDL_SetMainReady();
@@ -105,7 +104,7 @@ EmuWindow_SDL2_Hide::EmuWindow_SDL2_Hide() {
}
EmuWindow_SDL2_Hide::~EmuWindow_SDL2_Hide() {
- InputCommon::Shutdown();
+ input_subsystem->Shutdown();
SDL_GL_DeleteContext(gl_context);
SDL_Quit();
}