summaryrefslogtreecommitdiffstats
path: root/src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2020-08-28 15:57:50 +0200
committerGitHub <noreply@github.com>2020-08-28 15:57:50 +0200
commit45b73ba840411fa61c75e6fe954b9a46ca5d59b6 (patch)
treec99333f0b6b386bfb80712d8e6ffa94bef04a9ff /src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp
parentMerge pull request #4586 from yuzu-emu/tsan-cpu-interrupt (diff)
parentinput_common: Eliminate most global state (diff)
downloadyuzu-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_cmd/emu_window/emu_window_sdl2_gl.cpp')
-rw-r--r--src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp b/src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp
index e78025737..881b67a76 100644
--- a/src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp
+++ b/src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp
@@ -87,8 +87,9 @@ bool EmuWindow_SDL2_GL::SupportsRequiredGLExtensions() {
return unsupported_ext.empty();
}
-EmuWindow_SDL2_GL::EmuWindow_SDL2_GL(Core::System& system, bool fullscreen)
- : EmuWindow_SDL2{system, fullscreen} {
+EmuWindow_SDL2_GL::EmuWindow_SDL2_GL(Core::System& system, bool fullscreen,
+ InputCommon::InputSubsystem* input_subsystem)
+ : EmuWindow_SDL2{system, fullscreen, input_subsystem} {
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 4);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 3);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_COMPATIBILITY);