From f87015e5e2e40a322a24744a70a80d461f534b99 Mon Sep 17 00:00:00 2001 From: lizzie Date: Mon, 1 Dec 2025 02:51:57 +0000 Subject: [PATCH] exclude more stuff from vulkan --- externals/CMakeLists.txt | 6 +++++- src/video_core/vulkan_common/vulkan_instance.cpp | 2 ++ src/video_core/vulkan_common/vulkan_surface.cpp | 2 ++ src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp | 6 ++++++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 753cd181bb..58967b878a 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -147,7 +147,11 @@ if (ENABLE_SDL2) AddJsonPackage(sdl2) endif() - find_package(SDL2 2.26.4 REQUIRED) + if (PLATFORM_PS4) + set(SDL2_LIBRARY ${CMAKE_SYSROOT}/lib/libSDL2.a) + set(SDL2_INCLUDE_DIR ${CMAKE_SYSROOT}/include/SDL2) + endif() + find_package(SDL2 REQUIRED) endif() set(BUILD_SHARED_LIBS OFF) diff --git a/src/video_core/vulkan_common/vulkan_instance.cpp b/src/video_core/vulkan_common/vulkan_instance.cpp index d9404933cd..833969fff6 100644 --- a/src/video_core/vulkan_common/vulkan_instance.cpp +++ b/src/video_core/vulkan_common/vulkan_instance.cpp @@ -63,6 +63,8 @@ namespace { case Core::Frontend::WindowSystemType::Xcb: extensions.push_back(VK_KHR_XCB_SURFACE_EXTENSION_NAME); break; +#elif defined(__OPENORBIS__) + // No vulkan #else case Core::Frontend::WindowSystemType::X11: extensions.push_back(VK_KHR_XLIB_SURFACE_EXTENSION_NAME); diff --git a/src/video_core/vulkan_common/vulkan_surface.cpp b/src/video_core/vulkan_common/vulkan_surface.cpp index f1b56cc0a8..78f35a2970 100644 --- a/src/video_core/vulkan_common/vulkan_surface.cpp +++ b/src/video_core/vulkan_common/vulkan_surface.cpp @@ -74,6 +74,8 @@ vk::SurfaceKHR CreateSurface( throw vk::Exception(VK_ERROR_INITIALIZATION_FAILED); } } +#elif defined(__OPENORBIS__) + // No native #else if (window_info.type == Core::Frontend::WindowSystemType::X11) { const VkXlibSurfaceCreateInfoKHR xlib_ci{ 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 f509652bf6..a21eea1219 100644 --- a/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp +++ b/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp @@ -74,6 +74,12 @@ EmuWindow_SDL2_VK::EmuWindow_SDL2_VK(InputCommon::InputSubsystem* input_subsyste window_info.type = Core::Frontend::WindowSystemType::Android; window_info.render_surface = reinterpret_cast(wm.info.android.window); break; +#endif +#ifdef SDL_VIDEO_DRIVER_DIRECTFB + case SDL_SYSWM_TYPE::SDL_SYSWM_DIRECTFB: + window_info.type = Core::Frontend::WindowSystemType::Headless; + window_info.render_surface = reinterpret_cast(wm.info.dfb.window); + break; #endif default: LOG_CRITICAL(Frontend, "Window manager subsystem {} not implemented", wm.subsystem);