diff options
| author | bunnei <bunneidev@gmail.com> | 2021-07-30 13:28:24 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-30 13:28:24 -0700 |
| commit | 2c7fdee7a759fad644e5323c89d929e45ae19efc (patch) | |
| tree | de87c26ba0194098a079c7feec88dc1d8c997932 /src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp | |
| parent | 7530594602d57f42ba5d10814603d0771909886c (diff) | |
| parent | 335de3fdf584de939adebb99c4b960b564a406d5 (diff) | |
Merge pull request #6775 from lat9nq/cmd-remove-global-core
emu_window: Remove global system instance
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.cpp | 5 |
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 eadb41790..5b98c255b 100644 --- a/src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp +++ b/src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp @@ -76,8 +76,9 @@ bool EmuWindow_SDL2_GL::SupportsRequiredGLExtensions() { return unsupported_ext.empty(); } -EmuWindow_SDL2_GL::EmuWindow_SDL2_GL(InputCommon::InputSubsystem* input_subsystem, bool fullscreen) - : EmuWindow_SDL2{input_subsystem} { +EmuWindow_SDL2_GL::EmuWindow_SDL2_GL(InputCommon::InputSubsystem* input_subsystem, + Core::System& system_, bool fullscreen) + : EmuWindow_SDL2{input_subsystem, system_} { SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 4); SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 6); SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_COMPATIBILITY); |