diff options
| author | 2021-07-30 13:28:24 -0700 | |
|---|---|---|
| committer | 2021-07-30 13:28:24 -0700 | |
| commit | 2c7fdee7a759fad644e5323c89d929e45ae19efc (patch) | |
| tree | de87c26ba0194098a079c7feec88dc1d8c997932 /src/yuzu_cmd/yuzu.cpp | |
| parent | Merge pull request #6759 from ReinUsesLisp/pipeline-statistics (diff) | |
| parent | emu_window: Remove global system instance (diff) | |
| download | yuzu-2c7fdee7a759fad644e5323c89d929e45ae19efc.tar.gz yuzu-2c7fdee7a759fad644e5323c89d929e45ae19efc.tar.xz yuzu-2c7fdee7a759fad644e5323c89d929e45ae19efc.zip | |
Merge pull request #6775 from lat9nq/cmd-remove-global-core
emu_window: Remove global system instance
Diffstat (limited to 'src/yuzu_cmd/yuzu.cpp')
| -rw-r--r-- | src/yuzu_cmd/yuzu.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/yuzu_cmd/yuzu.cpp b/src/yuzu_cmd/yuzu.cpp index 35ce23696..c10093820 100644 --- a/src/yuzu_cmd/yuzu.cpp +++ b/src/yuzu_cmd/yuzu.cpp | |||
| @@ -172,10 +172,10 @@ int main(int argc, char** argv) { | |||
| 172 | std::unique_ptr<EmuWindow_SDL2> emu_window; | 172 | std::unique_ptr<EmuWindow_SDL2> emu_window; |
| 173 | switch (Settings::values.renderer_backend.GetValue()) { | 173 | switch (Settings::values.renderer_backend.GetValue()) { |
| 174 | case Settings::RendererBackend::OpenGL: | 174 | case Settings::RendererBackend::OpenGL: |
| 175 | emu_window = std::make_unique<EmuWindow_SDL2_GL>(&input_subsystem, fullscreen); | 175 | emu_window = std::make_unique<EmuWindow_SDL2_GL>(&input_subsystem, system, fullscreen); |
| 176 | break; | 176 | break; |
| 177 | case Settings::RendererBackend::Vulkan: | 177 | case Settings::RendererBackend::Vulkan: |
| 178 | emu_window = std::make_unique<EmuWindow_SDL2_VK>(&input_subsystem, fullscreen); | 178 | emu_window = std::make_unique<EmuWindow_SDL2_VK>(&input_subsystem, system, fullscreen); |
| 179 | break; | 179 | break; |
| 180 | } | 180 | } |
| 181 | 181 | ||