windowing and input stuff

src/yuzu_cmd/emu_window/emu_window_sdl2.cpp

@@ -4,7 +4,8 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <SDL3/SDL.h>
-
+#include <SDL3/SDL_main.h>
+#include <SDL3/SDL_mouse.h>
 #include "common/logging/log.h"
 #include "common/scm_rev.h"
 #include "common/settings.h"
@@ -18,23 +19,23 @@
 #include "yuzu_cmd/emu_window/emu_window_sdl2.h"
 #include "yuzu_cmd/yuzu_icon.h"
 
-EmuWindow_SDL2::EmuWindow_SDL2(InputCommon::InputSubsystem* input_subsystem_, Core::System& system_)
+EmuWindow_SDL3::EmuWindow_SDL3(InputCommon::InputSubsystem* input_subsystem_, Core::System& system_)
     : input_subsystem{input_subsystem_}, system{system_} {
     input_subsystem->Initialize();
-    if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_GAMEPAD) < 0) {
-        LOG_CRITICAL(Frontend, "Failed to initialize SDL2: {}, Exiting...", SDL_GetError());
+    if (!SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_GAMEPAD)) {
+        LOG_CRITICAL(Frontend, "Failed to initialize SDL3: {}, Exiting...", SDL_GetError());
         exit(1);
     }
     SDL_SetMainReady();
 }
 
-EmuWindow_SDL2::~EmuWindow_SDL2() {
+EmuWindow_SDL3::~EmuWindow_SDL3() {
     system.HIDCore().UnloadInputDevices();
     input_subsystem->Shutdown();
     SDL_Quit();
 }
 
-InputCommon::MouseButton EmuWindow_SDL2::SDLButtonToMouseButton(u32 button) const {
+InputCommon::MouseButton EmuWindow_SDL3::SDLButtonToMouseButton(u32 button) const {
     switch (button) {
     case SDL_BUTTON_LEFT:
         return InputCommon::MouseButton::Left;
@@ -52,21 +53,17 @@ InputCommon::MouseButton EmuWindow_SDL2::SDLButtonToMouseButton(u32 button) cons
 }
 
 /// @brief Translates pixel position to float position
-EmuWindow_SDL2::FloatPairNonHFA EmuWindow_SDL2::MouseToTouchPos(s32 touch_x, s32 touch_y) const {
+EmuWindow_SDL3::FloatPairNonHFA EmuWindow_SDL3::MouseToTouchPos(s32 touch_x, s32 touch_y) const {
     int w = 0, h = 0;
     SDL_GetWindowSize(render_window, &w, &h);
     const float fx = float(touch_x) / w;
     const float fy = float(touch_y) / h;
-    return {
-        std::clamp<float>(fx, 0.0f, 1.0f),
-        std::clamp<float>(fy, 0.0f, 1.0f),
-        0
-    };
+    return {std::clamp<float>(fx, 0.0f, 1.0f), std::clamp<float>(fy, 0.0f, 1.0f), 0};
 }
 
-void EmuWindow_SDL2::OnMouseButton(u32 button, u8 state, s32 x, s32 y) {
+void EmuWindow_SDL3::OnMouseButton(u32 button, bool pressed, s32 x, s32 y) {
     const auto mouse_button = SDLButtonToMouseButton(button);
-    if (state == SDL_PRESSED) {
+    if (pressed) {
         auto const [touch_x, touch_y, _] = MouseToTouchPos(x, y);
         input_subsystem->GetMouse()->PressButton(x, y, mouse_button);
         input_subsystem->GetMouse()->PressMouseButton(mouse_button);
@@ -76,64 +73,65 @@ void EmuWindow_SDL2::OnMouseButton(u32 button, u8 state, s32 x, s32 y) {
     }
 }
 
-void EmuWindow_SDL2::OnMouseMotion(s32 x, s32 y) {
+void EmuWindow_SDL3::OnMouseMotion(s32 x, s32 y) {
     auto const [touch_x, touch_y, _] = MouseToTouchPos(x, y);
     input_subsystem->GetMouse()->Move(x, y, 0, 0);
     input_subsystem->GetMouse()->MouseMove(touch_x, touch_y);
     input_subsystem->GetMouse()->TouchMove(touch_x, touch_y);
 }
 
-void EmuWindow_SDL2::OnFingerDown(float x, float y, std::size_t id) {
+void EmuWindow_SDL3::OnFingerDown(float x, float y, std::size_t id) {
     input_subsystem->GetTouchScreen()->TouchPressed(x, y, id);
 }
 
-void EmuWindow_SDL2::OnFingerMotion(float x, float y, std::size_t id) {
+void EmuWindow_SDL3::OnFingerMotion(float x, float y, std::size_t id) {
     input_subsystem->GetTouchScreen()->TouchMoved(x, y, id);
 }
 
-void EmuWindow_SDL2::OnFingerUp() {
+void EmuWindow_SDL3::OnFingerUp() {
     input_subsystem->GetTouchScreen()->ReleaseAllTouch();
 }
 
-void EmuWindow_SDL2::OnKeyEvent(int key, u8 state) {
-    if (state == SDL_PRESSED) {
+void EmuWindow_SDL3::OnKeyEvent(int key, bool pressed) {
+    if (pressed) {
         input_subsystem->GetKeyboard()->PressKey(static_cast<std::size_t>(key));
-    } else if (state == SDL_RELEASED) {
+    } else {
         input_subsystem->GetKeyboard()->ReleaseKey(static_cast<std::size_t>(key));
     }
 }
 
-bool EmuWindow_SDL2::IsOpen() const {
+bool EmuWindow_SDL3::IsOpen() const {
     return is_open;
 }
 
-bool EmuWindow_SDL2::IsShown() const {
+bool EmuWindow_SDL3::IsShown() const {
     return is_shown;
 }
 
-void EmuWindow_SDL2::OnResize() {
+void EmuWindow_SDL3::OnResize() {
     int width, height;
-    SDL_GL_GetDrawableSize(render_window, &width, &height);
+    SDL_GetWindowSizeInPixels(render_window, &width, &height);
     UpdateCurrentFramebufferLayout(width, height);
 }
 
-void EmuWindow_SDL2::ShowCursor(bool show_cursor) {
-    SDL_ShowCursor(show_cursor ? SDL_ENABLE : SDL_DISABLE);
+void EmuWindow_SDL3::ShowCursor(bool show_cursor) {
+    show_cursor ? SDL_ShowCursor() : SDL_HideCursor();
 }
 
-void EmuWindow_SDL2::Fullscreen() {
-    SDL_DisplayMode display_mode;
+void EmuWindow_SDL3::Fullscreen() {
+    const SDL_DisplayMode* display_mode;
     switch (Settings::values.fullscreen_mode.GetValue()) {
     case Settings::FullscreenMode::Exclusive:
-        // Set window size to render size before entering fullscreen -- SDL2 does not resize window
+        // Set window size to render size before entering fullscreen -- SDL3 does not resize window
         // to display dimensions automatically in this mode.
-        if (SDL_GetDesktopDisplayMode(0, &display_mode) == 0) {
-            SDL_SetWindowSize(render_window, display_mode.w, display_mode.h);
+        display_mode = SDL_GetDesktopDisplayMode(0);
+        if (display_mode) {
+            SDL_SetWindowSize(render_window, display_mode->w, display_mode->h);
         } else {
             LOG_ERROR(Frontend, "SDL_GetDesktopDisplayMode failed: {}", SDL_GetError());
         }
 
-        if (SDL_SetWindowFullscreen(render_window, SDL_WINDOW_FULLSCREEN) == 0) {
+        if (SDL_SetWindowFullscreen(render_window, SDL_WINDOW_FULLSCREEN)) {
             return;
         }
 
@@ -141,7 +139,7 @@ void EmuWindow_SDL2::Fullscreen() {
         LOG_INFO(Frontend, "Attempting to use borderless fullscreen...");
         [[fallthrough]];
     case Settings::FullscreenMode::Borderless:
-        if (SDL_SetWindowFullscreen(render_window, SDL_WINDOW_FULLSCREEN_DESKTOP) == 0) {
+        if (SDL_SetWindowFullscreen(render_window, true)) {
             return;
         }
 
@@ -156,11 +154,13 @@ void EmuWindow_SDL2::Fullscreen() {
     }
 }
 
-void EmuWindow_SDL2::WaitEvent() {
+void EmuWindow_SDL3::WaitEvent() {
     // Called on main thread
     SDL_Event event;
 
-    if (!SDL_WaitEvent(&event)) {
+    if (SDL_WaitEvent(&event)) {
+        // Event received successfully
+    } else {
         const char* error = SDL_GetError();
         if (!error || strcmp(error, "") == 0) {
             // https://github.com/libsdl-org/SDL/issues/5780
@@ -174,27 +174,23 @@ void EmuWindow_SDL2::WaitEvent() {
     }
 
     switch (event.type) {
-    case SDL_WINDOWEVENT:
-        switch (event.window.event) {
-        case SDL_EVENT_WINDOW_PIXEL_SIZE_CHANGED:
-        case SDL_EVENT_WINDOW_RESIZED:
-        case SDL_EVENT_WINDOW_MAXIMIZED:
-        case SDL_EVENT_WINDOW_RESTORED:
-            OnResize();
-            break;
-        case SDL_EVENT_WINDOW_MINIMIZED:
-        case SDL_EVENT_WINDOW_EXPOSED:
-            is_shown = event.window.event == SDL_EVENT_WINDOW_EXPOSED;
-            OnResize();
-            break;
-        case SDL_EVENT_WINDOW_CLOSE_REQUESTED:
-            is_open = false;
-            break;
-        }
+    case SDL_EVENT_WINDOW_PIXEL_SIZE_CHANGED:
+    case SDL_EVENT_WINDOW_RESIZED:
+    case SDL_EVENT_WINDOW_MAXIMIZED:
+    case SDL_EVENT_WINDOW_RESTORED:
+        OnResize();
+        break;
+    case SDL_EVENT_WINDOW_MINIMIZED:
+    case SDL_EVENT_WINDOW_EXPOSED:
+        is_shown = event.type == SDL_EVENT_WINDOW_EXPOSED;
+        OnResize();
+        break;
+    case SDL_EVENT_WINDOW_CLOSE_REQUESTED:
+        is_open = false;
         break;
     case SDL_EVENT_KEY_DOWN:
     case SDL_EVENT_KEY_UP:
-        OnKeyEvent(static_cast<int>(event.key.keysym.scancode), event.key.state);
+        OnKeyEvent(static_cast<int>(event.key.scancode), event.type == SDL_EVENT_KEY_DOWN);
         break;
     case SDL_EVENT_MOUSE_MOTION:
         // ignore if it came from touch
@@ -205,16 +201,17 @@ void EmuWindow_SDL2::WaitEvent() {
     case SDL_EVENT_MOUSE_BUTTON_UP:
         // ignore if it came from touch
         if (event.button.which != SDL_TOUCH_MOUSEID) {
-            OnMouseButton(event.button.button, event.button.state, event.button.x, event.button.y);
+            OnMouseButton(event.button.button, event.type == SDL_EVENT_MOUSE_BUTTON_DOWN,
+                          event.button.x, event.button.y);
         }
         break;
     case SDL_EVENT_FINGER_DOWN:
         OnFingerDown(event.tfinger.x, event.tfinger.y,
-                     static_cast<std::size_t>(event.tfinger.touchId));
+                     static_cast<std::size_t>(event.tfinger.touchID));
         break;
     case SDL_EVENT_FINGER_MOTION:
         OnFingerMotion(event.tfinger.x, event.tfinger.y,
-                       static_cast<std::size_t>(event.tfinger.touchId));
+                       static_cast<std::size_t>(event.tfinger.touchID));
         break;
     case SDL_EVENT_FINGER_UP:
         OnFingerUp();
@@ -241,7 +238,7 @@ void EmuWindow_SDL2::WaitEvent() {
 }
 
 // Credits to Samantas5855 and others for this function.
-void EmuWindow_SDL2::SetWindowIcon() {
+void EmuWindow_SDL3::SetWindowIcon() {
     SDL_IOStream* const yuzu_icon_stream = SDL_IOFromConstMem((void*)yuzu_icon, yuzu_icon_size);
     if (yuzu_icon_stream == nullptr) {
         LOG_WARNING(Frontend, "Failed to create Eden icon stream.");
@@ -257,6 +254,6 @@ void EmuWindow_SDL2::SetWindowIcon() {
     SDL_DestroySurface(window_icon);
 }
 
-void EmuWindow_SDL2::OnMinimalClientAreaChangeRequest(std::pair<u32, u32> minimal_size) {
+void EmuWindow_SDL3::OnMinimalClientAreaChangeRequest(std::pair<u32, u32> minimal_size) {
     SDL_SetWindowMinimumSize(render_window, minimal_size.first, minimal_size.second);
 }

src/yuzu_cmd/emu_window/emu_window_sdl2.h

@@ -22,10 +22,10 @@ class InputSubsystem;
 enum class MouseButton;
 } // namespace InputCommon
 
-class EmuWindow_SDL2 : public Core::Frontend::EmuWindow {
+class EmuWindow_SDL3 : public Core::Frontend::EmuWindow {
 public:
-    explicit EmuWindow_SDL2(InputCommon::InputSubsystem* input_subsystem_, Core::System& system_);
-    ~EmuWindow_SDL2();
+    explicit EmuWindow_SDL3(InputCommon::InputSubsystem* input_subsystem_, Core::System& system_);
+    ~EmuWindow_SDL3();
 
     /// Whether the window is still open, and a close request hasn't yet been sent
     bool IsOpen() const;
@@ -41,7 +41,7 @@ public:
 
 protected:
     /// Called by WaitEvent when a key is pressed or released.
-    void OnKeyEvent(int key, u8 state);
+    void OnKeyEvent(int key, bool pressed);
 
     /// Converts a SDL mouse button into MouseInput mouse button
     InputCommon::MouseButton SDLButtonToMouseButton(u32 button) const;
@@ -53,7 +53,7 @@ protected:
     FloatPairNonHFA MouseToTouchPos(s32 touch_x, s32 touch_y) const;
 
     /// Called by WaitEvent when a mouse button is pressed or released
-    void OnMouseButton(u32 button, u8 state, s32 x, s32 y);
+    void OnMouseButton(u32 button, bool pressed, s32 x, s32 y);
 
     /// Called by WaitEvent when the mouse moves.
     void OnMouseMotion(s32 x, s32 y);
@@ -85,7 +85,7 @@ protected:
     /// Is the window being shown?
     bool is_shown = true;
 
-    /// Internal SDL2 render window
+    /// Internal SDL3 render window
     SDL_Window* render_window{};
 
     /// Keeps track of how often to update the title bar during gameplay

src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp

@@ -4,7 +4,6 @@
 // SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include <algorithm>
 #include <cstdlib>
 #include <string>
 
@@ -16,7 +15,6 @@
 #include "common/logging/log.h"
 #include "common/scm_rev.h"
 #include "common/settings.h"
-#include "common/string_util.h"
 #include "core/core.h"
 #include "input_common/main.h"
 #include "video_core/renderer_base.h"
@@ -58,7 +56,7 @@ private:
     bool is_current = false;
 };
 
-bool EmuWindow_SDL2_GL::SupportsRequiredGLExtensions() {
+bool EmuWindow_SDL3_GL::SupportsRequiredGLExtensions() {
     std::vector<std::string_view> unsupported_ext;
 
     // Extensions required to support some texture formats.
@@ -76,9 +74,9 @@ bool EmuWindow_SDL2_GL::SupportsRequiredGLExtensions() {
     return unsupported_ext.empty();
 }
 
-EmuWindow_SDL2_GL::EmuWindow_SDL2_GL(InputCommon::InputSubsystem* input_subsystem_,
+EmuWindow_SDL3_GL::EmuWindow_SDL3_GL(InputCommon::InputSubsystem* input_subsystem_,
                                      Core::System& system_, bool fullscreen)
-    : EmuWindow_SDL2{input_subsystem_, system_} {
+    : EmuWindow_SDL3{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);
@@ -95,15 +93,12 @@ EmuWindow_SDL2_GL::EmuWindow_SDL2_GL(InputCommon::InputSubsystem* input_subsyste
 
     std::string window_title = fmt::format("{} | {}-{}", Common::g_build_fullname,
                                            Common::g_scm_branch, Common::g_scm_desc);
-    render_window =
-        SDL_CreateWindow(window_title.c_str(),
-                         SDL_WINDOWPOS_UNDEFINED, // x position
-                         SDL_WINDOWPOS_UNDEFINED, // y position
-                         Layout::ScreenUndocked::Width, Layout::ScreenUndocked::Height,
-                         SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE | SDL_WINDOW_HIGH_PIXEL_DENSITY);
+    render_window = SDL_CreateWindow(
+        window_title.c_str(), Layout::ScreenUndocked::Width, Layout::ScreenUndocked::Height,
+        SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE | SDL_WINDOW_HIGH_PIXEL_DENSITY);
 
     if (render_window == nullptr) {
-        LOG_CRITICAL(Frontend, "Failed to create SDL2 window! {}", SDL_GetError());
+        LOG_CRITICAL(Frontend, "Failed to create SDL3 window! {}", SDL_GetError());
         exit(1);
     }
 
@@ -120,15 +115,17 @@ EmuWindow_SDL2_GL::EmuWindow_SDL2_GL(InputCommon::InputSubsystem* input_subsyste
     core_context = CreateSharedContext();
 
     if (window_context == nullptr) {
-        LOG_CRITICAL(Frontend, "Failed to create SDL2 GL context: {}", SDL_GetError());
+        LOG_CRITICAL(Frontend, "Failed to create SDL3 GL context: {}", SDL_GetError());
         exit(1);
     }
     if (core_context == nullptr) {
-        LOG_CRITICAL(Frontend, "Failed to create shared SDL2 GL context: {}", SDL_GetError());
+        LOG_CRITICAL(Frontend, "Failed to create shared SDL3 GL context: {}", SDL_GetError());
         exit(1);
     }
 
-    if (!gladLoadGLLoader(static_cast<GLADloadproc>(SDL_GL_GetProcAddress))) {
+    if (!gladLoadGLLoader([](const char* name) -> void* {
+            return reinterpret_cast<void*>(SDL_GL_GetProcAddress(name));
+        })) {
         LOG_CRITICAL(Frontend, "Failed to initialize GL functions! {}", SDL_GetError());
         exit(1);
     }
@@ -146,11 +143,11 @@ EmuWindow_SDL2_GL::EmuWindow_SDL2_GL(InputCommon::InputSubsystem* input_subsyste
     Settings::LogSettings();
 }
 
-EmuWindow_SDL2_GL::~EmuWindow_SDL2_GL() {
+EmuWindow_SDL3_GL::~EmuWindow_SDL3_GL() {
     core_context.reset();
     SDL_GL_DestroyContext(window_context);
 }
 
-std::unique_ptr<Core::Frontend::GraphicsContext> EmuWindow_SDL2_GL::CreateSharedContext() const {
+std::unique_ptr<Core::Frontend::GraphicsContext> EmuWindow_SDL3_GL::CreateSharedContext() const {
     return std::make_unique<SDLGLContext>(render_window);
 }

src/yuzu_cmd/emu_window/emu_window_sdl2_gl.h

@@ -4,6 +4,7 @@
 #pragma once
 
 #include <memory>
+#include <SDL3/SDL.h>
 #include "core/frontend/emu_window.h"
 #include "yuzu_cmd/emu_window/emu_window_sdl2.h"
 
@@ -15,11 +16,11 @@ namespace InputCommon {
 class InputSubsystem;
 }
 
-class EmuWindow_SDL2_GL final : public EmuWindow_SDL2 {
+class EmuWindow_SDL3_GL final : public EmuWindow_SDL3 {
 public:
-    explicit EmuWindow_SDL2_GL(InputCommon::InputSubsystem* input_subsystem_, Core::System& system_,
+    explicit EmuWindow_SDL3_GL(InputCommon::InputSubsystem* input_subsystem_, Core::System& system_,
                                bool fullscreen);
-    ~EmuWindow_SDL2_GL();
+    ~EmuWindow_SDL3_GL();
 
     std::unique_ptr<Core::Frontend::GraphicsContext> CreateSharedContext() const override;
 
@@ -27,8 +28,6 @@ private:
     /// Whether the GPU and driver supports the OpenGL extension required
     bool SupportsRequiredGLExtensions();
 
-    using SDL_GLContext = void*;
-
     /// The OpenGL context associated with the window
     SDL_GLContext window_context;
 

src/yuzu_cmd/emu_window/emu_window_sdl2_null.cpp

@@ -12,7 +12,7 @@
 #include "video_core/renderer_null/renderer_null.h"
 #include "yuzu_cmd/emu_window/emu_window_sdl2_null.h"
 
-#ifdef YUZU_USE_EXTERNAL_SDL2
+#ifdef YUZU_USE_EXTERNAL_SDL3
 // Include this before SDL.h to prevent the external from including a dummy
 #define USING_GENERATED_CONFIG_H
 #include <SDL3/SDL_config.h>
@@ -20,15 +20,14 @@
 
 #include <SDL3/SDL.h>
 
-EmuWindow_SDL2_Null::EmuWindow_SDL2_Null(InputCommon::InputSubsystem* input_subsystem_,
+EmuWindow_SDL3_Null::EmuWindow_SDL3_Null(InputCommon::InputSubsystem* input_subsystem_,
                                          Core::System& system_, bool fullscreen)
-    : EmuWindow_SDL2{input_subsystem_, system_} {
+    : EmuWindow_SDL3{input_subsystem_, system_} {
     const std::string window_title = fmt::format("Eden {} | {}-{} (Vulkan)", Common::g_build_name,
                                                  Common::g_scm_branch, Common::g_scm_desc);
-    render_window =
-        SDL_CreateWindow(window_title.c_str(), SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED,
-                         Layout::ScreenUndocked::Width, Layout::ScreenUndocked::Height,
-                         SDL_WINDOW_RESIZABLE | SDL_WINDOW_HIGH_PIXEL_DENSITY);
+    render_window = SDL_CreateWindow(window_title.c_str(), Layout::ScreenUndocked::Width,
+                                     Layout::ScreenUndocked::Height,
+                                     SDL_WINDOW_RESIZABLE | SDL_WINDOW_HIGH_PIXEL_DENSITY);
 
     SetWindowIcon();
 
@@ -44,8 +43,8 @@ EmuWindow_SDL2_Null::EmuWindow_SDL2_Null(InputCommon::InputSubsystem* input_subs
              Common::g_scm_branch, Common::g_scm_desc);
 }
 
-EmuWindow_SDL2_Null::~EmuWindow_SDL2_Null() = default;
+EmuWindow_SDL3_Null::~EmuWindow_SDL3_Null() = default;
 
-std::unique_ptr<Core::Frontend::GraphicsContext> EmuWindow_SDL2_Null::CreateSharedContext() const {
+std::unique_ptr<Core::Frontend::GraphicsContext> EmuWindow_SDL3_Null::CreateSharedContext() const {
     return std::make_unique<DummyContext>();
 }

src/yuzu_cmd/emu_window/emu_window_sdl2_null.h

@@ -16,11 +16,11 @@ namespace InputCommon {
 class InputSubsystem;
 }
 
-class EmuWindow_SDL2_Null final : public EmuWindow_SDL2 {
+class EmuWindow_SDL3_Null final : public EmuWindow_SDL3 {
 public:
-    explicit EmuWindow_SDL2_Null(InputCommon::InputSubsystem* input_subsystem_,
+    explicit EmuWindow_SDL3_Null(InputCommon::InputSubsystem* input_subsystem_,
                                  Core::System& system, bool fullscreen);
-    ~EmuWindow_SDL2_Null() override;
+    ~EmuWindow_SDL3_Null() override;
 
     std::unique_ptr<Core::Frontend::GraphicsContext> CreateSharedContext() const override;
 };

src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp

@@ -9,31 +9,18 @@
 
 #include "common/logging/log.h"
 #include "common/scm_rev.h"
-#include "video_core/renderer_vulkan/renderer_vulkan.h"
 #include "yuzu_cmd/emu_window/emu_window_sdl2_vk.h"
 
 #include <SDL3/SDL.h>
-#include <SDL3/SDL_syswm.h>
 
-EmuWindow_SDL2_VK::EmuWindow_SDL2_VK(InputCommon::InputSubsystem* input_subsystem_,
+EmuWindow_SDL3_VK::EmuWindow_SDL3_VK(InputCommon::InputSubsystem* input_subsystem_,
                                      Core::System& system_, bool fullscreen)
-    : EmuWindow_SDL2{input_subsystem_, system_} {
-    const std::string window_title = fmt::format("Eden {} | {}-{} (Vulkan)",
-                                                 Common::g_build_name,
-                                                 Common::g_scm_branch,
-                                                 Common::g_scm_desc);
-    render_window =
-        SDL_CreateWindow(window_title.c_str(), SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED,
-                         Layout::ScreenUndocked::Width, Layout::ScreenUndocked::Height,
-                         SDL_WINDOW_RESIZABLE | SDL_WINDOW_HIGH_PIXEL_DENSITY);
-
-    SDL_SysWMinfo wm;
-    SDL_VERSION(&wm.version);
-    if (SDL_GetWindowWMInfo(render_window, &wm) == false) {
-        LOG_CRITICAL(Frontend, "Failed to get information from the window manager: {}",
-                     SDL_GetError());
-        std::exit(EXIT_FAILURE);
-    }
+    : EmuWindow_SDL3{input_subsystem_, system_} {
+    const std::string window_title = fmt::format("Eden {} | {}-{} (Vulkan)", Common::g_build_name,
+                                                 Common::g_scm_branch, Common::g_scm_desc);
+    render_window = SDL_CreateWindow(window_title.c_str(), Layout::ScreenUndocked::Width,
+                                     Layout::ScreenUndocked::Height,
+                                     SDL_WINDOW_RESIZABLE | SDL_WINDOW_HIGH_PIXEL_DENSITY);
 
     SetWindowIcon();
 
@@ -42,43 +29,43 @@ EmuWindow_SDL2_VK::EmuWindow_SDL2_VK(InputCommon::InputSubsystem* input_subsyste
         ShowCursor(false);
     }
 
-    switch (wm.subsystem) {
-#ifdef SDL_VIDEO_DRIVER_WINDOWS
-    case SDL_SYSWM_TYPE::SDL_SYSWM_WINDOWS:
+    {
+        SDL_PropertiesID props = SDL_GetWindowProperties(render_window);
+
+#if defined(SDL_PLATFORM_WIN32)
         window_info.type = Core::Frontend::WindowSystemType::Windows;
-        window_info.render_surface = reinterpret_cast<void*>(wm.info.win.window);
-        break;
-#endif
-#ifdef SDL_VIDEO_DRIVER_X11
-    case SDL_SYSWM_TYPE::SDL_SYSWM_X11:
-        window_info.type = Core::Frontend::WindowSystemType::X11;
-        window_info.display_connection = wm.info.x11.display;
-        window_info.render_surface = reinterpret_cast<void*>(wm.info.x11.window);
-        break;
-#endif
-#ifdef SDL_VIDEO_DRIVER_WAYLAND
-    case SDL_SYSWM_TYPE::SDL_SYSWM_WAYLAND:
-        window_info.type = Core::Frontend::WindowSystemType::Wayland;
-        window_info.display_connection = wm.info.wl.display;
-        window_info.render_surface = wm.info.wl.surface;
-        break;
-#endif
-#ifdef SDL_VIDEO_DRIVER_COCOA
-    case SDL_SYSWM_TYPE::SDL_SYSWM_COCOA:
+        window_info.render_surface =
+            SDL_GetPointerProperty(props, SDL_PROP_WINDOW_WIN32_HWND_POINTER, nullptr);
+#elif defined(SDL_PLATFORM_MACOS)
         window_info.type = Core::Frontend::WindowSystemType::Cocoa;
         window_info.render_surface = SDL_Metal_CreateView(render_window);
-        break;
-#endif
-#ifdef SDL_VIDEO_DRIVER_ANDROID
-    case SDL_SYSWM_TYPE::SDL_SYSWM_ANDROID:
+#elif defined(SDL_PLATFORM_LINUX)
+        const char* video_driver = SDL_GetCurrentVideoDriver();
+        if (video_driver && SDL_strcmp(video_driver, "x11") == 0) {
+            window_info.type = Core::Frontend::WindowSystemType::X11;
+            window_info.display_connection =
+                SDL_GetPointerProperty(props, SDL_PROP_WINDOW_X11_DISPLAY_POINTER, nullptr);
+            window_info.render_surface = reinterpret_cast<void*>(
+                SDL_GetNumberProperty(props, SDL_PROP_WINDOW_X11_WINDOW_NUMBER, 0));
+        } else if (video_driver && SDL_strcmp(video_driver, "wayland") == 0) {
+            window_info.type = Core::Frontend::WindowSystemType::Wayland;
+            window_info.display_connection =
+                SDL_GetPointerProperty(props, SDL_PROP_WINDOW_WAYLAND_DISPLAY_POINTER, nullptr);
+            window_info.render_surface =
+                SDL_GetPointerProperty(props, SDL_PROP_WINDOW_WAYLAND_SURFACE_POINTER, nullptr);
+        } else {
+            LOG_CRITICAL(Frontend, "Unsupported SDL video driver: {}",
+                         video_driver ? video_driver : "(null)");
+            std::exit(EXIT_FAILURE);
+        }
+#elif defined(SDL_PLATFORM_ANDROID)
         window_info.type = Core::Frontend::WindowSystemType::Android;
-        window_info.render_surface = reinterpret_cast<void*>(wm.info.android.window);
-        break;
-#endif
-    default:
-        LOG_CRITICAL(Frontend, "Window manager subsystem {} not implemented", wm.subsystem);
+        window_info.render_surface =
+            SDL_GetPointerProperty(props, SDL_PROP_WINDOW_ANDROID_WINDOW_POINTER, nullptr);
+#else
+        LOG_CRITICAL(Frontend, "Unsupported platform for SDL window properties");
         std::exit(EXIT_FAILURE);
-        break;
+#endif
     }
 
     OnResize();
@@ -88,8 +75,8 @@ EmuWindow_SDL2_VK::EmuWindow_SDL2_VK(InputCommon::InputSubsystem* input_subsyste
              Common::g_scm_branch, Common::g_scm_desc);
 }
 
-EmuWindow_SDL2_VK::~EmuWindow_SDL2_VK() = default;
+EmuWindow_SDL3_VK::~EmuWindow_SDL3_VK() = default;
 
-std::unique_ptr<Core::Frontend::GraphicsContext> EmuWindow_SDL2_VK::CreateSharedContext() const {
+std::unique_ptr<Core::Frontend::GraphicsContext> EmuWindow_SDL3_VK::CreateSharedContext() const {
     return std::make_unique<DummyContext>();
 }

src/yuzu_cmd/emu_window/emu_window_sdl2_vk.h

@@ -16,11 +16,11 @@ namespace InputCommon {
 class InputSubsystem;
 }
 
-class EmuWindow_SDL2_VK final : public EmuWindow_SDL2 {
+class EmuWindow_SDL3_VK final : public EmuWindow_SDL3 {
 public:
-    explicit EmuWindow_SDL2_VK(InputCommon::InputSubsystem* input_subsystem_, Core::System& system,
+    explicit EmuWindow_SDL3_VK(InputCommon::InputSubsystem* input_subsystem_, Core::System& system,
                                bool fullscreen);
-    ~EmuWindow_SDL2_VK() override;
+    ~EmuWindow_SDL3_VK() override;
 
     std::unique_ptr<Core::Frontend::GraphicsContext> CreateSharedContext() const override;
 };

src/yuzu_cmd/yuzu.cpp

@@ -346,16 +346,16 @@ int main(int argc, char** argv) {
     // Apply the command line arguments
     system.ApplySettings();
 
-    std::unique_ptr<EmuWindow_SDL2> emu_window;
+    std::unique_ptr<EmuWindow_SDL3> emu_window;
     switch (Settings::values.renderer_backend.GetValue()) {
     case Settings::RendererBackend::OpenGL:
-        emu_window = std::make_unique<EmuWindow_SDL2_GL>(&input_subsystem, system, fullscreen);
+        emu_window = std::make_unique<EmuWindow_SDL3_GL>(&input_subsystem, system, fullscreen);
         break;
     case Settings::RendererBackend::Vulkan:
-        emu_window = std::make_unique<EmuWindow_SDL2_VK>(&input_subsystem, system, fullscreen);
+        emu_window = std::make_unique<EmuWindow_SDL3_VK>(&input_subsystem, system, fullscreen);
         break;
     case Settings::RendererBackend::Null:
-        emu_window = std::make_unique<EmuWindow_SDL2_Null>(&input_subsystem, system, fullscreen);
+        emu_window = std::make_unique<EmuWindow_SDL3_Null>(&input_subsystem, system, fullscreen);
         break;
     }