Plexi09/eden-miror
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden synced 2026-04-26 02:58:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

exclude more stuff from vulkan

Browse source
This commit is contained in:
lizzie 2025-12-01 02:51:57 +00:00
parent 86ffa7932e
commit 564aac846a
4 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
externals/CMakeLists.txt vendored
View file

@ -170,7 +170,11 @@ if (NOT ANDROID)
AddJsonPackage(sdl2) AddJsonPackage(sdl2)
endif() 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() endif()
set(BUILD_SHARED_LIBS OFF) set(BUILD_SHARED_LIBS OFF)

2
src/video_core/vulkan_common/vulkan_instance.cpp
View file

@ -59,6 +59,8 @@ namespace {
case Core::Frontend::WindowSystemType::Xcb: case Core::Frontend::WindowSystemType::Xcb:
extensions.push_back(VK_KHR_XCB_SURFACE_EXTENSION_NAME); extensions.push_back(VK_KHR_XCB_SURFACE_EXTENSION_NAME);
break; break;
#elif defined(__OPENORBIS__)
// No vulkan
#else #else
case Core::Frontend::WindowSystemType::X11: case Core::Frontend::WindowSystemType::X11:
extensions.push_back(VK_KHR_XLIB_SURFACE_EXTENSION_NAME); extensions.push_back(VK_KHR_XLIB_SURFACE_EXTENSION_NAME);

2
src/video_core/vulkan_common/vulkan_surface.cpp
View file

@ -76,6 +76,8 @@ vk::SurfaceKHR CreateSurface(
throw vk::Exception(VK_ERROR_INITIALIZATION_FAILED); throw vk::Exception(VK_ERROR_INITIALIZATION_FAILED);
} }
} }
#elif defined(__OPENORBIS__)
// No native
#else #else
if (window_info.type == Core::Frontend::WindowSystemType::X11) { if (window_info.type == Core::Frontend::WindowSystemType::X11) {
const VkXlibSurfaceCreateInfoKHR xlib_ci{ const VkXlibSurfaceCreateInfoKHR xlib_ci{

6
src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp
View file

@ -74,6 +74,12 @@ EmuWindow_SDL2_VK::EmuWindow_SDL2_VK(InputCommon::InputSubsystem* input_subsyste
window_info.type = Core::Frontend::WindowSystemType::Android; window_info.type = Core::Frontend::WindowSystemType::Android;
window_info.render_surface = reinterpret_cast<void*>(wm.info.android.window); window_info.render_surface = reinterpret_cast<void*>(wm.info.android.window);
break; 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<void*>(wm.info.dfb.window);
break;
#endif #endif
default: default:
LOG_CRITICAL(Frontend, "Window manager subsystem {} not implemented", wm.subsystem); LOG_CRITICAL(Frontend, "Window manager subsystem {} not implemented", wm.subsystem);