diff options
| author | Lioncash <mathew1800@gmail.com> | 2020-08-27 15:16:47 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2020-08-27 16:11:17 -0400 |
| commit | 9e1b0af25907f7a8b960aa5c1e7d931691f40196 (patch) | |
| tree | 9bfda0b559cb025da3bc65168d28ee78144daa20 /src/yuzu_tester/emu_window/emu_window_sdl2_hide.cpp | |
| parent | 3db9a259771a44278ff34168ba140c2c7815a1cf (diff) | |
input_common: Eliminate most global state
Abstracts most of the input mechanisms under an InputSubsystem class
that is managed by the frontends, eliminating any static constructors
and destructors. This gets rid of global accessor functions and also
allows the frontends to have a more fine-grained control over the
lifecycle of the input subsystem.
This also makes it explicit which interfaces rely on the input subsystem
instead of making it opaque in the interface functions. All that remains
to migrate over is the factories, which can be done in a separate
change.
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(); } |
