diff options
| author | 2019-05-25 17:47:13 -0300 | |
|---|---|---|
| committer | 2019-05-25 17:47:13 -0300 | |
| commit | 4b80dd23a4462b0f4e9f096e0dc0cc4606d8cfe8 (patch) | |
| tree | 55e053696c28caab23c6da853f08e4f8593eb9e5 /src/yuzu_cmd/yuzu.cpp | |
| parent | shader/shader_ir: Make Comment() take a std::string by value (diff) | |
| download | yuzu-4b80dd23a4462b0f4e9f096e0dc0cc4606d8cfe8.tar.gz yuzu-4b80dd23a4462b0f4e9f096e0dc0cc4606d8cfe8.tar.xz yuzu-4b80dd23a4462b0f4e9f096e0dc0cc4606d8cfe8.zip | |
yuzu_cmd: Split emu_window OpenGL implementation into its own file
Diffstat (limited to 'src/yuzu_cmd/yuzu.cpp')
| -rw-r--r-- | src/yuzu_cmd/yuzu.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/yuzu_cmd/yuzu.cpp b/src/yuzu_cmd/yuzu.cpp index d3734927b..5d9442646 100644 --- a/src/yuzu_cmd/yuzu.cpp +++ b/src/yuzu_cmd/yuzu.cpp | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | #include "video_core/renderer_base.h" | 31 | #include "video_core/renderer_base.h" |
| 32 | #include "yuzu_cmd/config.h" | 32 | #include "yuzu_cmd/config.h" |
| 33 | #include "yuzu_cmd/emu_window/emu_window_sdl2.h" | 33 | #include "yuzu_cmd/emu_window/emu_window_sdl2.h" |
| 34 | #include "yuzu_cmd/emu_window/emu_window_sdl2_gl.h" | ||
| 34 | 35 | ||
| 35 | #include "core/file_sys/registered_cache.h" | 36 | #include "core/file_sys/registered_cache.h" |
| 36 | 37 | ||
| @@ -173,7 +174,7 @@ int main(int argc, char** argv) { | |||
| 173 | Settings::values.use_gdbstub = use_gdbstub; | 174 | Settings::values.use_gdbstub = use_gdbstub; |
| 174 | Settings::Apply(); | 175 | Settings::Apply(); |
| 175 | 176 | ||
| 176 | std::unique_ptr<EmuWindow_SDL2> emu_window{std::make_unique<EmuWindow_SDL2>(fullscreen)}; | 177 | std::unique_ptr<EmuWindow_SDL2> emu_window{std::make_unique<EmuWindow_SDL2_GL>(fullscreen)}; |
| 177 | 178 | ||
| 178 | if (!Settings::values.use_multi_core) { | 179 | if (!Settings::values.use_multi_core) { |
| 179 | // Single core mode must acquire OpenGL context for entire emulation session | 180 | // Single core mode must acquire OpenGL context for entire emulation session |