summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2020-04-22 18:37:01 +0200
committerGitHub <noreply@github.com>2020-04-22 18:37:01 +0200
commit5ed13304e17aa572f2d9605fe78dc61615dadec6 (patch)
tree93d0dfa077bde3b8f29f8fb31ce58661ad177b40
parentMerge pull request #3653 from ReinUsesLisp/nsight-aftermath (diff)
parentInit SDL info structure and add dummy context (diff)
downloadyuzu-5ed13304e17aa572f2d9605fe78dc61615dadec6.tar
yuzu-5ed13304e17aa572f2d9605fe78dc61615dadec6.tar.gz
yuzu-5ed13304e17aa572f2d9605fe78dc61615dadec6.tar.bz2
yuzu-5ed13304e17aa572f2d9605fe78dc61615dadec6.tar.lz
yuzu-5ed13304e17aa572f2d9605fe78dc61615dadec6.tar.xz
yuzu-5ed13304e17aa572f2d9605fe78dc61615dadec6.tar.zst
yuzu-5ed13304e17aa572f2d9605fe78dc61615dadec6.zip
-rw-r--r--src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp3
-rw-r--r--src/yuzu_cmd/emu_window/emu_window_sdl2_vk.h2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp b/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp
index f2990910e..5149fa867 100644
--- a/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp
+++ b/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp
@@ -29,6 +29,7 @@ EmuWindow_SDL2_VK::EmuWindow_SDL2_VK(Core::System& system, bool fullscreen)
SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI);
SDL_SysWMinfo wm;
+ SDL_VERSION(&wm.version);
if (SDL_GetWindowWMInfo(render_window, &wm) == SDL_FALSE) {
LOG_CRITICAL(Frontend, "Failed to get information from the window manager");
std::exit(EXIT_FAILURE);
@@ -70,7 +71,7 @@ EmuWindow_SDL2_VK::EmuWindow_SDL2_VK(Core::System& system, bool fullscreen)
EmuWindow_SDL2_VK::~EmuWindow_SDL2_VK() = default;
std::unique_ptr<Core::Frontend::GraphicsContext> EmuWindow_SDL2_VK::CreateSharedContext() const {
- return nullptr;
+ return std::make_unique<DummyContext>()
}
void EmuWindow_SDL2_VK::Present() {
diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.h b/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.h
index b8021ebea..77a6ca72b 100644
--- a/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.h
+++ b/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.h
@@ -22,3 +22,5 @@ public:
std::unique_ptr<Core::Frontend::GraphicsContext> CreateSharedContext() const override;
};
+
+class DummyContext : public Core::Frontend::GraphicsContext {};