diff options
| author | bunnei <bunneidev@gmail.com> | 2020-08-28 15:57:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-28 15:57:50 +0200 |
| commit | 45b73ba840411fa61c75e6fe954b9a46ca5d59b6 (patch) | |
| tree | c99333f0b6b386bfb80712d8e6ffa94bef04a9ff /src/yuzu_tester/emu_window/emu_window_sdl2_hide.cpp | |
| parent | Merge pull request #4586 from yuzu-emu/tsan-cpu-interrupt (diff) | |
| parent | input_common: Eliminate most global state (diff) | |
| download | yuzu-45b73ba840411fa61c75e6fe954b9a46ca5d59b6.tar yuzu-45b73ba840411fa61c75e6fe954b9a46ca5d59b6.tar.gz yuzu-45b73ba840411fa61c75e6fe954b9a46ca5d59b6.tar.bz2 yuzu-45b73ba840411fa61c75e6fe954b9a46ca5d59b6.tar.lz yuzu-45b73ba840411fa61c75e6fe954b9a46ca5d59b6.tar.xz yuzu-45b73ba840411fa61c75e6fe954b9a46ca5d59b6.tar.zst yuzu-45b73ba840411fa61c75e6fe954b9a46ca5d59b6.zip | |
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.cpp | 5 |
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(); } |