Browse Source

exclude more stuff from vulkan

eden-orbis-ps4
lizzie 3 weeks ago
parent
commit
f87015e5e2
  1. 6
      externals/CMakeLists.txt
  2. 2
      src/video_core/vulkan_common/vulkan_instance.cpp
  3. 2
      src/video_core/vulkan_common/vulkan_surface.cpp
  4. 6
      src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp

6
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)

2
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);

2
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{

6
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<void*>(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<void*>(wm.info.dfb.window);
break;
#endif
default:
LOG_CRITICAL(Frontend, "Window manager subsystem {} not implemented", wm.subsystem);

Loading…
Cancel
Save