BramReuling/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-06-05 22:30:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge 1e9aa6af2b into 8549aae829

Browse source
This commit is contained in:
Anonymous Maarten 2026-06-04 13:36:23 -04:00 • committed by GitHub
commit ad72dd7e24
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 173 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

26
CMakeLists.txt
View file

@ -327,6 +327,7 @@ set_option(SDL_LIBICONV "Prefer iconv() from libiconv, if available,
set_option(SDL_GCC_ATOMICS "Use gcc builtin atomics" ${SDL_GCC_ATOMICS_DEFAULT})
dep_option(SDL_DBUS "Enable D-Bus support" ON "${UNIX_SYS}" OFF)
dep_option(SDL_LIBURING "Enable liburing support" ON "${UNIX_SYS}" OFF)
dep_option(SDL_LIBURING_SHARED "Dynamically load liburing support" ON "SDL_LIBURING;SDL_DEPS_SHARED" OFF)
dep_option(SDL_DISKAUDIO "Support the disk writer audio driver" ON "SDL_AUDIO" OFF)
dep_option(SDL_DUMMYAUDIO "Support the dummy audio driver" ON "SDL_AUDIO" OFF)
dep_option(SDL_DUMMYVIDEO "Use dummy video driver" ON "SDL_VIDEO" OFF)
@ -394,7 +395,8 @@ dep_option(SDL_HIDAPI_LIBUSB "Use libusb for low level joystick drivers" O
dep_option(SDL_HIDAPI_LIBUSB_SHARED "Dynamically load libusb support" ON "SDL_HIDAPI_LIBUSB;SDL_DEPS_SHARED" OFF)
dep_option(SDL_HIDAPI_JOYSTICK "Use HIDAPI for low level joystick drivers" ON SDL_HIDAPI OFF)
dep_option(SDL_VIRTUAL_JOYSTICK "Enable the virtual-joystick driver" ON SDL_HIDAPI OFF)
set_option(SDL_LIBUDEV "Enable libudev support" ON)
dep_option(SDL_LIBUDEV "Enable libudev support" ON ${UNIX_SYS} OFF)
dep_option(SDL_LIBUDEV_SHARED "Dynamically load libudev support" ON "SDL_LIBUDEV;SDL_DEPS_SHARED" OFF)
set_option(SDL_ASAN "Use AddressSanitizer to detect memory errors" OFF)
set_option(SDL_CCACHE "Use Ccache to speed up build" OFF)
set_option(SDL_CLANG_TIDY "Run clang-tidy static analysis" OFF)
@ -1999,8 +2001,9 @@ elseif(UNIX AND NOT (APPLE OR RISCOS OR HAIKU OR CYGWIN))
set(HAVE_INOTIFY 1)
endif()
set(HAVE_DBUS FALSE)
if(PKG_CONFIG_FOUND)
if(SDL_DBUS)
if(SDL_DBUS AND HAVE_SDL_LOADSO)
pkg_search_module(DBUS dbus-1 dbus)
if(DBUS_FOUND)
set(HAVE_DBUS_DBUS_H TRUE)
@ -2011,7 +2014,7 @@ elseif(UNIX AND NOT (APPLE OR RISCOS OR HAIKU OR CYGWIN))
endif()
endif()
if(SDL_IBUS)
if(HAVE_DBUS)
pkg_search_module(IBUS ibus-1.0 ibus)
find_path(HAVE_SYS_INOTIFY_H NAMES sys/inotify.h)
if(IBUS_FOUND AND HAVE_SYS_INOTIFY_H)
@ -2021,19 +2024,12 @@ elseif(UNIX AND NOT (APPLE OR RISCOS OR HAIKU OR CYGWIN))
endif()
endif()
if (HAVE_IBUS_IBUS_H OR HAVE_FCITX)
if (HAVE_IBUS OR HAVE_FCITX)
set(SDL_USE_IME 1)
endif()
if(SDL_LIBURING)
pkg_search_module(LIBURING liburing-ffi)
find_path(HAVE_LIBURING_H NAMES liburing.h)
if(LIBURING_FOUND AND HAVE_LIBURING_H)
set(HAVE_LIBURING_LIBURING_H TRUE)
sdl_include_directories(PRIVATE SYSTEM ${LIBURING_INCLUDE_DIRS})
set(HAVE_LIBURING TRUE)
endif()
endif()
CheckLiburing()
if((FREEBSD OR NETBSD) AND NOT HAVE_INOTIFY)
set(LibInotify_PKG_CONFIG_SPEC libinotify)
pkg_check_modules(PC_LIBINOTIFY IMPORTED_TARGET ${LibInotify_PKG_CONFIG_SPEC})
@ -2174,7 +2170,7 @@ elseif(UNIX AND NOT (APPLE OR RISCOS OR HAIKU OR CYGWIN))
set(SDL_STORAGE_GENERIC 1)
sdl_glob_sources("${SDL3_SOURCE_DIR}/src/storage/generic/*.c")
if(LINUX)
if(LINUX AND HAVE_SDL_LOADSO)
set(SDL_STORAGE_STEAM 1)
sdl_glob_sources(
"${SDL3_SOURCE_DIR}/src/storage/steam/*.c"
@ -3648,7 +3644,7 @@ if(SDL_GPU)
set(SDL_VIDEO_RENDER_GPU 1)
set(HAVE_RENDER_GPU TRUE)
endif()
if(SDL_GPU_OPENXR)
if(SDL_GPU_OPENXR AND HAVE_SDL_LOADSO)
set(HAVE_GPU_OPENXR 1)
endif()
endif()

87
cmake/sdlchecks.cmake
View file

@ -50,6 +50,7 @@ macro(FindLibraryAndSONAME _LIB)
endmacro()
macro(CheckDLOPEN)
set(dl_libs )
check_symbol_exists(dlopen "dlfcn.h" HAVE_DLOPEN_IN_LIBC)
if(NOT HAVE_DLOPEN_IN_LIBC)
cmake_push_check_state()
@ -57,12 +58,35 @@ macro(CheckDLOPEN)
check_symbol_exists(dlopen "dlfcn.h" HAVE_DLOPEN_IN_LIBDL)
cmake_pop_check_state()
if(HAVE_DLOPEN_IN_LIBDL)
set(dl_libs dl)
sdl_link_dependency(dl LIBS dl)
endif()
endif()
if(HAVE_DLOPEN_IN_LIBC OR HAVE_DLOPEN_IN_LIBDL)
set(working_dl TRUE)
check_linker_flag(C "-Wl,--fatal-warnings" LINKER_FATAL_WARNINGS)
if(LINKER_FATAL_WARNINGS)
# Check we're not linking against a static runtime which does not support dlopen
cmake_push_check_state()
string(APPEND CMAKE_REQUIRED_LINK_OPTIONS "-Wl,--fatal-warnings")
list(APPEND CMAKE_REQUIRED_LIBRARIES ${dl_libs})
check_c_source_compiles([===[
#include <dlfcn.h>
int main(int argc, char *argv[]) {
void *handle = dlopen("libc.so.6", RTLD_NOW | RTLD_GLOBAL);
void(*ptr_puts)(const char*)=dlsym(handle, "puts");
dlclose(handle);
(void) argc; (void) argv;
return 0;
}
]===] HAVE_LINKING_DLOPEN)
set(working_dl ${HAVE_LINKING_DLOPEN})
cmake_pop_check_state()
endif()
if(working_dl)
set(HAVE_DLOPEN TRUE)
endif()
endif()
endmacro()
macro(CheckO_CLOEXEC)
@ -647,7 +671,7 @@ endmacro()
# - SDL_WAYLAND_SHARED opt
# - HAVE_SDL_LOADSO opt
macro(CheckWayland)
if(SDL_WAYLAND)
if(SDL_WAYLAND AND SDL_VIDEO_OPENGL_EGL)
set(WAYLAND_PKG_CONFIG_SPEC "wayland-client>=1.18" wayland-egl wayland-cursor egl "xkbcommon>=0.5.0")
if(PKG_CONFIG_FOUND)
pkg_check_modules(PC_WAYLAND IMPORTED_TARGET ${WAYLAND_PKG_CONFIG_SPEC})
@ -864,7 +888,7 @@ endmacro()
# Requires:
# - PkgCheckModules
macro(CheckEGL)
if(SDL_OPENGL OR SDL_OPENGLES)
if((SDL_OPENGL OR SDL_OPENGLES) AND HAVE_SDL_LOADSO)
cmake_push_check_state()
find_package(OpenGL MODULE)
list(APPEND CMAKE_REQUIRED_INCLUDES ${OPENGL_EGL_INCLUDE_DIRS})
@ -932,7 +956,7 @@ macro(CheckOpenGLES)
endmacro()
macro(CheckVulkan)
if(SDL_VULKAN)
if(SDL_VULKAN AND HAVE_SDL_LOADSO)
set(SDL_VIDEO_VULKAN 1)
set(HAVE_VULKAN TRUE)
if(SDL_RENDER_VULKAN)
@ -1279,6 +1303,10 @@ macro(CheckHIDAPI)
if(HAVE_LIBUSB_H)
set(HAVE_LIBUSB TRUE)
if(SDL_HIDAPI_LIBUSB_SHARED)
if(NOT HAVE_SDL_LOADSO)
message(WARNING "You must have SDL_LoadObject() support for dynamic hidapi libusb loading")
set(HAVE_HIDAPI_LIBUSB_SHARED OFF)
else()
target_get_dynamic_library(dynamic_libusb LibUSB::LibUSB)
if(dynamic_libusb)
set(HAVE_HIDAPI_LIBUSB_SHARED ON)
@ -1286,6 +1314,7 @@ macro(CheckHIDAPI)
sdl_link_dependency(hidapi INCLUDES $<TARGET_PROPERTY:LibUSB::LibUSB,INTERFACE_INCLUDE_DIRECTORIES>)
endif()
endif()
endif()
if(NOT HAVE_HIDAPI_LIBUSB_SHARED)
sdl_link_dependency(hidapi LIBS LibUSB::LibUSB PKG_CONFIG_SPECS "${LibUSB_PKG_CONFIG_SPEC}" CMAKE_MODULE LibUSB)
endif()
@ -1376,7 +1405,7 @@ macro(CheckKMSDRM)
set(PC_LIBDRM_FOUND FALSE)
set(PC_GBM_FOUND FALSE)
endif()
if(PC_LIBDRM_FOUND AND PC_GBM_FOUND AND HAVE_OPENGL_EGL)
if(PC_LIBDRM_FOUND AND PC_GBM_FOUND AND SDL_VIDEO_OPENGL_EGL)
set(HAVE_KMSDRM TRUE)
set(HAVE_SDL_VIDEO TRUE)
@ -1408,14 +1437,27 @@ macro(CheckKMSDRM)
endmacro()
macro(CheckLibUDev)
set(HAVE_LIBUDEV_H FALSE)
set(HAVE_LIBUDEV FALSE)
set(HAVE_LIBUDEV_SHARED OFF)
if(SDL_LIBUDEV)
check_include_file("libudev.h" HAVE_LIBUDEV_HEADER)
if(HAVE_LIBUDEV_HEADER)
set(HAVE_LIBUDEV_H TRUE)
set(HAVE_LIBUDEV TRUE)
if(SDL_LIBUDEV_SHARED)
if(NOT HAVE_SDL_LOADSO)
message(WARNING "You must have SDL_LoadObject() support for dynamic libudev support")
else()
FindLibraryAndSONAME(udev)
if(UDEV_LIB_SONAME)
set(SDL_UDEV_DYNAMIC "\"${UDEV_LIB_SONAME}\"")
set(HAVE_LIBUDEV TRUE)
set(HAVE_LIBUDEV_SHARED TRUE)
endif()
endif()
endif()
if(NOT HAVE_LIBUDEV_SHARED)
sdl_link_dependency(udev PRIVATE LIBS udev)
endif()
endif()
endif()
@ -1486,3 +1528,38 @@ macro(CheckLibUnwind)
endif()
endif()
endmacro()
macro(CheckLiburing)
set(HAVE_LIBURING_H FALSE)
set(HAVE_LIBURING_SHARED OFF)
set(HAVE_LIBURING OFF)
if(SDL_LIBURING)
find_path(LIBURING_H_INCLUDE_PATH NAMES liburing.h)
if(LIBURING_H_INCLUDE_PATH)
if(SDL_LIBURING_SHARED)
if(NOT HAVE_SDL_LOADSO)
message(WARNING "You must have SDL_LoadObject() support for dynamic liburing support")
else()
FindLibraryAndSONAME(uring-ffi)
if(URING_FFI_LIB_SONAME)
sdl_include_directories(PRIVATE SYSTEM ${LIBURING_H_INCLUDE_PATH})
set(SDL_LIBURING_DYNAMIC "\"${URING_FFI_LIB_SONAME}\"")
set(HAVE_LIBURING TRUE)
set(HAVE_LIBURING_SHARED TRUE)
endif()
endif()
endif()
if(NOT HAVE_LIBURING)
set(liburing_PKG_CONFIG_SPEC liburing)
pkg_check_modules(PC_LIBURING IMPORTED_TARGET ${liburing_PKG_CONFIG_SPEC})
if(PC_LIBURING_FOUND)
set(HAVE_LIBURING TRUE)
sdl_link_dependency(liburing LIBS PkgConfig::PC_LIBURING PKG_CONFIG_PREFIX PC_LIBURING PKG_CONFIG_SPECS ${liburing_PKG_CONFIG_SPEC})
endif()
endif()
endif()
if(HAVE_LIBURING)
set(HAVE_LIBURING_H TRUE)
endif()
endif()
endmacro()

1
include/build_config/SDL_build_config.h.cmake
View file

@ -217,6 +217,7 @@
#cmakedefine HAVE_LIBUDEV_H 1
#cmakedefine HAVE_LIBDECOR_H 1
#cmakedefine HAVE_LIBURING_H 1
#cmakedefine SDL_LIBURING_DYNAMIC @SDL_LIBURING_DYNAMIC@
#cmakedefine HAVE_FRIBIDI_H 1
#cmakedefine SDL_FRIBIDI_DYNAMIC @SDL_FRIBIDI_DYNAMIC@
#cmakedefine HAVE_LIBTHAI_H 1

18
src/core/linux/SDL_udev.c
View file

@ -41,10 +41,8 @@
static const char *SDL_UDEV_LIBS[] = { SDL_UDEV_FALLBACK_LIBS };
#ifdef SDL_UDEV_DYNAMIC
#define SDL_UDEV_DLNOTE_LIBS SDL_UDEV_DYNAMIC, SDL_UDEV_FALLBACK_LIBS
#else
#define SDL_UDEV_DLNOTE_LIBS SDL_UDEV_FALLBACK_LIBS
#endif
SDL_ELF_NOTE_DLOPEN(
"events-udev",
@ -52,17 +50,21 @@ SDL_ELF_NOTE_DLOPEN(
SDL_ELF_NOTE_DLOPEN_PRIORITY_RECOMMENDED,
SDL_UDEV_DLNOTE_LIBS
)
#endif
static SDL_UDEV_PrivateData *_this = NULL;
#ifdef SDL_UDEV_DYNAMIC
static bool SDL_UDEV_load_sym(const char *fn, void **addr);
static bool SDL_UDEV_load_syms(void);
#endif
static bool SDL_UDEV_hotplug_update_available(void);
static void get_caps(struct udev_device *dev, struct udev_device *pdev, const char *attr, unsigned long *bitmask, size_t bitmask_len);
static int guess_device_class(struct udev_device *dev);
static int device_class(struct udev_device *dev);
static void device_event(SDL_UDEV_deviceevent type, struct udev_device *dev);
#ifdef SDL_UDEV_DYNAMIC
static bool SDL_UDEV_load_sym(const char *fn, void **addr)
{
*addr = SDL_LoadFunction(_this->udev_handle, fn);
@ -73,9 +75,12 @@ static bool SDL_UDEV_load_sym(const char *fn, void **addr)
return true;
}
#endif
static bool SDL_UDEV_load_syms(void)
{
#ifdef SDL_UDEV_DYNAMIC
/* cast funcs to char* first, to please GCC's strict aliasing rules. */
#define SDL_UDEV_SYM(x) \
if (!SDL_UDEV_load_sym(#x, (void **)(char *)&_this->syms.x)) \
@ -83,6 +88,13 @@ static bool SDL_UDEV_load_syms(void)
#define SDL_UDEV_SYM_OPTIONAL(x) \
SDL_UDEV_load_sym(#x, (void **)(char *)&_this->syms.x);
#else
#define SDL_UDEV_SYM(x) \
_this->syms.x = x;
#define SDL_UDEV_SYM_OPTIONAL(x) \
_this->syms.x = x;
#endif
SDL_UDEV_SYM(udev_device_get_action);
SDL_UDEV_SYM(udev_device_get_devnode);

8
src/core/linux/SDL_udev.h
View file

@ -64,13 +64,13 @@ typedef struct SDL_UDEV_Symbols
const char *(*udev_device_get_property_value)(struct udev_device *, const char *);
const char *(*udev_device_get_sysattr_value)(struct udev_device *udev_device, const char *sysattr);
struct udev_device *(*udev_device_new_from_syspath)(struct udev *, const char *);
void (*udev_device_unref)(struct udev_device *);
struct udev_device *(*udev_device_unref)(struct udev_device *);
int (*udev_enumerate_add_match_property)(struct udev_enumerate *, const char *, const char *);
int (*udev_enumerate_add_match_subsystem)(struct udev_enumerate *, const char *);
struct udev_list_entry *(*udev_enumerate_get_list_entry)(struct udev_enumerate *);
struct udev_enumerate *(*udev_enumerate_new)(struct udev *);
int (*udev_enumerate_scan_devices)(struct udev_enumerate *);
void (*udev_enumerate_unref)(struct udev_enumerate *);
struct udev_enumerate *(*udev_enumerate_unref)(struct udev_enumerate *);
const char *(*udev_list_entry_get_name)(struct udev_list_entry *);
const char *(*udev_list_entry_get_value)(struct udev_list_entry *);
struct udev_list_entry *(*udev_list_entry_get_next)(struct udev_list_entry *);
@ -79,9 +79,9 @@ typedef struct SDL_UDEV_Symbols
int (*udev_monitor_get_fd)(struct udev_monitor *);
struct udev_monitor *(*udev_monitor_new_from_netlink)(struct udev *, const char *);
struct udev_device *(*udev_monitor_receive_device)(struct udev_monitor *);
void (*udev_monitor_unref)(struct udev_monitor *);
struct udev_monitor *(*udev_monitor_unref)(struct udev_monitor *);
struct udev *(*udev_new)(void);
void (*udev_unref)(struct udev *);
struct udev *(*udev_unref)(struct udev *);
struct udev_device *(*udev_device_new_from_devnum)(struct udev *udev, char type, dev_t devnum);
dev_t (*udev_device_get_devnum)(struct udev_device *udev_device);

36
src/io/io_uring/SDL_asyncio_liburing.c
View file

@ -41,19 +41,17 @@ static bool (*CreateAsyncIOQueue)(SDL_AsyncIOQueue *queue);
static void (*QuitAsyncIO)(void);
static bool (*AsyncIOFromFile)(const char *file, const char *mode, SDL_AsyncIO *asyncio);
// we never link directly to liburing.
// (this says "-ffi" which sounds like a scripting language binding thing, but the non-ffi version
// is static-inline code we can't lookup with dlsym. This is by design.)
#define SDL_DRIVER_LIBURING_DYNAMIC "liburing-ffi.so.2"
static const char *liburing_library = SDL_DRIVER_LIBURING_DYNAMIC;
#ifdef SDL_LIBURING_DYNAMIC
static const char liburing_library[] = SDL_LIBURING_DYNAMIC;
static void *liburing_handle = NULL;
SDL_ELF_NOTE_DLOPEN(
"io-io_uring",
"Support for async IO through liburing",
SDL_ELF_NOTE_DLOPEN_PRIORITY_SUGGESTED,
SDL_DRIVER_LIBURING_DYNAMIC
SDL_LIBURING_DYNAMIC
)
#endif
#define SDL_LIBURING_FUNCS \
SDL_LIBURING_FUNC(int, io_uring_queue_init, (unsigned entries, struct io_uring *ring, unsigned flags)) \
@ -65,8 +63,8 @@ SDL_ELF_NOTE_DLOPEN(
SDL_LIBURING_FUNC(void, io_uring_prep_write,(struct io_uring_sqe *sqe, int fd, const void *buf, unsigned nbytes, __u64 offset)) \
SDL_LIBURING_FUNC(void, io_uring_prep_close, (struct io_uring_sqe *sqe, int fd)) \
SDL_LIBURING_FUNC(void, io_uring_prep_fsync, (struct io_uring_sqe *sqe, int fd, unsigned fsync_flags)) \
SDL_LIBURING_FUNC(void, io_uring_prep_cancel, (struct io_uring_sqe *sqe, void *user_data, int flags)) \
SDL_LIBURING_FUNC(void, io_uring_prep_timeout, (struct io_uring_sqe *sqe, struct __kernel_timespec *ts, unsigned count, unsigned flags)) \
SDL_LIBURING_FUNC(void, io_uring_prep_cancel, (struct io_uring_sqe *sqe, const void *user_data, int flags)) \
SDL_LIBURING_FUNC(void, io_uring_prep_timeout, (struct io_uring_sqe *sqe, const struct __kernel_timespec *ts, unsigned count, unsigned flags)) \
SDL_LIBURING_FUNC(void, io_uring_prep_nop, (struct io_uring_sqe *sqe)) \
SDL_LIBURING_FUNC(void, io_uring_sqe_set_data, (struct io_uring_sqe *sqe, void *data)) \
SDL_LIBURING_FUNC(void, io_uring_sqe_set_flags, (struct io_uring_sqe *sqe, unsigned flags)) \
@ -103,21 +101,28 @@ typedef struct LibUringAsyncIOQueueData
static void UnloadLibUringLibrary(void)
{
if (liburing_library) {
#ifdef SDL_LIBURING_DYNAMIC
if (liburing_handle) {
SDL_UnloadObject(liburing_handle);
liburing_library = NULL;
liburing_handle = NULL;
}
#endif
SDL_zero(liburing);
}
static bool LoadLibUringSyms(void)
{
#ifdef SDL_LIBURING_DYNAMIC
#define SDL_LIBURING_FUNC(ret, fn, args) { \
liburing.fn = (SDL_fntype_##fn) SDL_LoadFunction(liburing_handle, #fn); \
if (!liburing.fn) { \
return false; \
} \
}
#else
#define SDL_LIBURING_FUNC(ret, fn, args) \
liburing.fn = fn;
#endif
SDL_LIBURING_FUNCS
#undef SDL_LIBURING_FUNC
return true;
@ -130,12 +135,15 @@ static bool LoadLibUring(void)
{
bool result = true;
#ifdef SDL_LIBURING_DYNAMIC
if (!liburing_handle) {
liburing_handle = SDL_LoadObject(liburing_library);
if (!liburing_handle) {
result = false;
// Don't call SDL_SetError(): SDL_LoadObject already did.
} else {
return false;
}
}
#endif
result = LoadLibUringSyms();
if (result) {
static const int needed_ops[] = {
@ -162,11 +170,11 @@ static bool LoadLibUring(void)
}
}
#ifdef SDL_LIBURING_DYNAMIC
if (!result) {
UnloadLibUringLibrary();
}
}
}
#endif
return result;
}

4
test/CMakeLists.txt
View file

@ -271,8 +271,8 @@ if(LIBC_HAS_SIGNAL_H)
add_definitions(-DHAVE_SIGNAL_H)
endif()
check_include_file(libudev.h HAVE_LIBUDEV_H)
if(HAVE_LIBUDEV_H)
check_include_file(libudev.h HAVE_LIBUDEV_HEADER)
if(HAVE_LIBUDEV_HEADER)
add_definitions(-DHAVE_LIBUDEV_H)
endif()