diff options
| author | 2020-09-21 00:21:32 +0000 | |
|---|---|---|
| committer | 2020-09-21 00:21:32 +0000 | |
| commit | a2eb44db825a892cc2863bd1f5d0352c273ff0f0 (patch) | |
| tree | 3e75441609f97c8a6ad01e70461ecb218c51d086 /src/yuzu_cmd/emu_window/emu_window_sdl2.cpp | |
| parent | Merge pull request #4683 from Morph1984/NpadHandheldActivationMode-impl (diff) | |
| parent | renderer_opengl: Remove emulated mailbox presentation (diff) | |
| download | yuzu-a2eb44db825a892cc2863bd1f5d0352c273ff0f0.tar.gz yuzu-a2eb44db825a892cc2863bd1f5d0352c273ff0f0.tar.xz yuzu-a2eb44db825a892cc2863bd1f5d0352c273ff0f0.zip | |
Merge pull request #4692 from ReinUsesLisp/remove-vsync
renderer_opengl: Remove emulated mailbox presentation
Diffstat (limited to 'src/yuzu_cmd/emu_window/emu_window_sdl2.cpp')
| -rw-r--r-- | src/yuzu_cmd/emu_window/emu_window_sdl2.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp index a804d5185..521209622 100644 --- a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp +++ b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp | |||
| @@ -13,9 +13,8 @@ | |||
| 13 | #include "input_common/sdl/sdl.h" | 13 | #include "input_common/sdl/sdl.h" |
| 14 | #include "yuzu_cmd/emu_window/emu_window_sdl2.h" | 14 | #include "yuzu_cmd/emu_window/emu_window_sdl2.h" |
| 15 | 15 | ||
| 16 | EmuWindow_SDL2::EmuWindow_SDL2(Core::System& system, bool fullscreen, | 16 | EmuWindow_SDL2::EmuWindow_SDL2(InputCommon::InputSubsystem* input_subsystem_) |
| 17 | InputCommon::InputSubsystem* input_subsystem_) | 17 | : input_subsystem{input_subsystem_} { |
| 18 | : system{system}, input_subsystem{input_subsystem_} { | ||
| 19 | if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK) < 0) { | 18 | if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK) < 0) { |
| 20 | LOG_CRITICAL(Frontend, "Failed to initialize SDL2! Exiting..."); | 19 | LOG_CRITICAL(Frontend, "Failed to initialize SDL2! Exiting..."); |
| 21 | exit(1); | 20 | exit(1); |