Updated to version 2.30.6 for release

Fixed macOS build
(cherry picked from commit 230f1debd0)
2024-08-01 14:16:41 -07:00 · 2024-08-01 14:15:16 -07:00 · 2024-08-01 14:04:27 -07:00 · 2024-07-29 13:51:22 -07:00 · 2024-07-29 12:52:54 -07:00 · 2024-07-29 07:22:29 -07:00
142 changed files with 1059 additions and 678 deletions
@@ -10,10 +10,10 @@ jobs:
    steps:
    - uses: actions/checkout@v4
    - name: Build
-      uses: cross-platform-actions/action@v0.23.0
+      uses: cross-platform-actions/action@v0.24.0
      with:
        operating_system: freebsd
-        version: '13.2'
+        version: '13.3'
        shell: bash
        run: |
          sudo pkg update
@@ -87,7 +87,7 @@ endif()
 # See docs/release_checklist.md
 set(SDL_MAJOR_VERSION 2)
 set(SDL_MINOR_VERSION 30)
-set(SDL_MICRO_VERSION 4)
+set(SDL_MICRO_VERSION 6)
 set(SDL_VERSION "${SDL_MAJOR_VERSION}.${SDL_MINOR_VERSION}.${SDL_MICRO_VERSION}")

 # Set defaults preventing destination file conflicts
@@ -1674,7 +1674,7 @@ elseif(UNIX AND NOT APPLE AND NOT RISCOS AND NOT HAIKU)
    if(FREEBSD OR NETBSD OR OPENBSD OR BSDI)
      CheckUSBHID()
    endif()
-    if(LINUX AND HAVE_LINUX_INPUT_H AND NOT ANDROID)
+    if((LINUX OR FREEBSD) AND HAVE_LINUX_INPUT_H AND NOT ANDROID)
      set(SDL_JOYSTICK_LINUX 1)
      file(GLOB JOYSTICK_SOURCES ${SDL2_SOURCE_DIR}/src/joystick/linux/*.c ${SDL2_SOURCE_DIR}/src/joystick/steam/*.c)
      list(APPEND SOURCE_FILES ${JOYSTICK_SOURCES})
@@ -1777,14 +1777,6 @@ elseif(WINDOWS)
    list(APPEND SOURCE_FILES ${WINRT_SOURCE_FILES})
  endif()

-  if(MSVC AND NOT SDL_LIBC)
-    # Prevent codegen that would use the VC runtime libraries.
-    set_property(DIRECTORY . APPEND PROPERTY COMPILE_OPTIONS "/GS-;/Gs1048576")
-    if(NOT ARCH_64 AND NOT CMAKE_GENERATOR_PLATFORM STREQUAL "ARM")
-      set_property(DIRECTORY . APPEND PROPERTY COMPILE_OPTIONS "/arch:SSE")
-    endif()
-  endif()
-
  if(SDL_MISC)
    if(WINDOWS_STORE)
      file(GLOB MISC_SOURCES ${SDL2_SOURCE_DIR}/src/misc/winrt/*.cpp)
@@ -3527,6 +3519,20 @@ if(SDL_TEST)
  set_property(TARGET SDL2_test PROPERTY INTERFACE_SDL_VERSION "SDL2")
 endif()

+if(MSVC AND NOT SDL_LIBC)
+  set(targets SDL2)
+  if(TARGET SDL2-static)
+    list(APPEND targets SDL2-static)
+  endif()
+  if(TARGET SDL2_test)
+    list(APPEND targets SDL2_test)
+  endif()
+  set_property(TARGET ${targets} APPEND PROPERTY COMPILE_OPTIONS "/GS-;/Gs1048576")
+  if(NOT ARCH_64 AND NOT CMAKE_GENERATOR_PLATFORM STREQUAL "ARM")
+    set_property(TARGET ${targets} APPEND PROPERTY COMPILE_OPTIONS "/arch:SSE")
+  endif()
+endif()
+
 ##### Installation targets #####
 if(NOT SDL2_DISABLE_INSTALL)
  if(SDL_SHARED)
@@ -15,7 +15,7 @@
 LIBNAME = SDL2
 MAJOR_VERSION = 2
 MINOR_VERSION = 30
-MICRO_VERSION = 4
+MICRO_VERSION = 6
 VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION)
 DESCRIPTION = Simple DirectMedia Layer 2

@@ -6,7 +6,7 @@
 LIBNAME = SDL2
 MAJOR_VERSION = 2
 MINOR_VERSION = 30
-MICRO_VERSION = 4
+MICRO_VERSION = 6
 VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION)

 LIBHOME = .
@@ -52,9 +52,9 @@ void spawnTrailFromEmitter(struct particle *emitter);
 void spawnEmitterParticle(GLfloat x, GLfloat y);
 void explodeEmitter(struct particle *emitter);
 void initializeParticles(void);
-void initializeTexture();
+void initializeTexture(void);
 int nextPowerOfTwo(int x);
-void drawParticles();
+void drawParticles(void);
 void stepParticles(double deltaTime);

 /*  helper function (used in texture loading)
@@ -159,7 +159,7 @@ stepParticles(double deltaTime)
    This draws all the particles shown on screen
 */
 void
-drawParticles()
+drawParticles(void)
 {

    /* draw the background */
@@ -324,7 +324,7 @@ initializeParticles(void)
    loads the particle texture
 */
 void
-initializeTexture()
+initializeTexture(void)
 {

    int bpp;                    /* texture bits per pixel */
@@ -196,7 +196,7 @@ loadFont(void)
 }

 void
-draw()
+draw(void)
 {
    SDL_SetRenderDrawColor(renderer, bg_color.r, bg_color.g, bg_color.b, bg_color.a);
    SDL_RenderClear(renderer);
@@ -19,10 +19,10 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.30.4</string>
+	<string>2.30.6</string>
 	<key>CFBundleSignature</key>
 	<string>SDLX</string>
 	<key>CFBundleVersion</key>
-	<string>2.30.4</string>
+	<string>2.30.6</string>
 </dict>
 </plist>
@@ -9729,7 +9729,7 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEPLOYMENT_POSTPROCESSING = YES;
 				DYLIB_COMPATIBILITY_VERSION = 3001.0.0;
-				DYLIB_CURRENT_VERSION = 3001.4.0;
+				DYLIB_CURRENT_VERSION = 3001.6.0;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_ALTIVEC_EXTENSIONS = YES;
@@ -9770,7 +9770,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_LINK_OBJC_RUNTIME = NO;
-				MARKETING_VERSION = 2.30.4;
+				MARKETING_VERSION = 2.30.6;
 				OTHER_LDFLAGS = "-liconv";
 			};
 			name = Release;
@@ -9814,7 +9814,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DYLIB_COMPATIBILITY_VERSION = 3001.0.0;
-				DYLIB_CURRENT_VERSION = 3001.4.0;
+				DYLIB_CURRENT_VERSION = 3001.6.0;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -9856,7 +9856,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_LINK_OBJC_RUNTIME = NO;
-				MARKETING_VERSION = 2.30.4;
+				MARKETING_VERSION = 2.30.6;
 				OTHER_LDFLAGS = "-liconv";
 			};
 			name = Debug;
@@ -10063,7 +10063,7 @@
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 3001.0.0;
-				DYLIB_CURRENT_VERSION = 3001.4.0;
+				DYLIB_CURRENT_VERSION = 3001.6.0;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
@@ -10115,7 +10115,7 @@
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 3001.0.0;
-				DYLIB_CURRENT_VERSION = 3001.4.0;
+				DYLIB_CURRENT_VERSION = 3001.6.0;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				ENABLE_NS_ASSERTIONS = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -1,4 +1,4 @@
-Title SDL 2.30.4
+Title SDL 2.30.6
 Version 1
 Description SDL Library for Mac OS X (http://www.libsdl.org)
 DefaultLocation /Library/Frameworks
@@ -277,6 +277,7 @@ public class HIDDeviceManager {
            0x044f, // Thrustmaster
            0x045e, // Microsoft
            0x0738, // Mad Catz
+            0x0b05, // ASUS
            0x0e6f, // PDP
            0x0f0d, // Hori
            0x10f5, // Turtle Beach
@@ -590,7 +591,13 @@ public class HIDDeviceManager {
                } else {
                    flags = 0;
                }
-                mUsbManager.requestPermission(usbDevice, PendingIntent.getBroadcast(mContext, 0, new Intent(HIDDeviceManager.ACTION_USB_PERMISSION), flags));
+                if (Build.VERSION.SDK_INT >= 33 /* Android 14.0 (U) */) {
+                   Intent intent = new Intent(HIDDeviceManager.ACTION_USB_PERMISSION);
+                   intent.setPackage(mContext.getPackageName());
+                   mUsbManager.requestPermission(usbDevice, PendingIntent.getBroadcast(mContext, 0, intent, flags));
+               } else {
+                   mUsbManager.requestPermission(usbDevice, PendingIntent.getBroadcast(mContext, 0, new Intent(HIDDeviceManager.ACTION_USB_PERMISSION), flags));
+               }
            } catch (Exception e) {
                Log.v(TAG, "Couldn't request permission for USB device " + usbDevice);
                HIDDeviceOpenResult(deviceID, false);
@@ -38,6 +38,10 @@ public class SDL {
    }

    public static void loadLibrary(String libraryName) throws UnsatisfiedLinkError, SecurityException, NullPointerException {
+        loadLibrary(libraryName, mContext);
+    }
+
+    public static void loadLibrary(String libraryName, Context context) throws UnsatisfiedLinkError, SecurityException, NullPointerException {

        if (libraryName == null) {
            throw new NullPointerException("No library name provided.");
@@ -53,10 +57,10 @@ public class SDL {
            // To use ReLinker, just add it as a dependency.  For more information, see 
            // https://github.com/KeepSafe/ReLinker for ReLinker's repository.
            //
-            Class<?> relinkClass = mContext.getClassLoader().loadClass("com.getkeepsafe.relinker.ReLinker");
-            Class<?> relinkListenerClass = mContext.getClassLoader().loadClass("com.getkeepsafe.relinker.ReLinker$LoadListener");
-            Class<?> contextClass = mContext.getClassLoader().loadClass("android.content.Context");
-            Class<?> stringClass = mContext.getClassLoader().loadClass("java.lang.String");
+            Class<?> relinkClass = context.getClassLoader().loadClass("com.getkeepsafe.relinker.ReLinker");
+            Class<?> relinkListenerClass = context.getClassLoader().loadClass("com.getkeepsafe.relinker.ReLinker$LoadListener");
+            Class<?> contextClass = context.getClassLoader().loadClass("android.content.Context");
+            Class<?> stringClass = context.getClassLoader().loadClass("java.lang.String");

            // Get a 'force' instance of the ReLinker, so we can ensure libraries are reinstalled if 
            // they've changed during updates.
@@ -66,7 +70,7 @@ public class SDL {

            // Actually load the library!
            Method loadMethod = relinkInstanceClass.getDeclaredMethod("loadLibrary", contextClass, stringClass, stringClass, relinkListenerClass);
-            loadMethod.invoke(relinkInstance, mContext, libraryName, null, null);
+            loadMethod.invoke(relinkInstance, context, libraryName, null, null);
        }
        catch (final Throwable e) {
            // Fall back
@@ -61,7 +61,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
    private static final String TAG = "SDL";
    private static final int SDL_MAJOR_VERSION = 2;
    private static final int SDL_MINOR_VERSION = 30;
-    private static final int SDL_MICRO_VERSION = 4;
+    private static final int SDL_MICRO_VERSION = 6;
 /*
    // Display InputType.SOURCE/CLASS of events and devices
    //
@@ -281,7 +281,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
    // Load the .so
    public void loadLibraries() {
       for (String lib : getLibraries()) {
-          SDL.loadLibrary(lib);
+          SDL.loadLibrary(lib, this);
       }
    }

@@ -1352,12 +1352,13 @@ endmacro()

 macro(CheckLibUDev)
  if(SDL_LIBUDEV)
-    check_include_file("libudev.h" have_libudev_header)
-    if(have_libudev_header)
+    check_include_file("libudev.h" HAVE_LIBUDEV_HEADER)
+    if(HAVE_LIBUDEV_HEADER)
      set(HAVE_LIBUDEV_H TRUE)
      FindLibraryAndSONAME(udev)
      if(UDEV_LIB_SONAME)
        set(SDL_UDEV_DYNAMIC "\"${UDEV_LIB_SONAME}\"")
+        set(HAVE_LIBUDEV TRUE)
      endif()
    endif()
  endif()
@@ -3508,7 +3508,7 @@ orig_CFLAGS="$CFLAGS"
 # See docs/release_checklist.md
 SDL_MAJOR_VERSION=2
 SDL_MINOR_VERSION=30
-SDL_MICRO_VERSION=4
+SDL_MICRO_VERSION=6
 SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION

 SDL_BINARY_AGE=`expr $SDL_MINOR_VERSION \* 100 + $SDL_MICRO_VERSION`
@@ -13,7 +13,7 @@ dnl Set various version strings - taken gratefully from the GTk sources
 # See docs/release_checklist.md
 SDL_MAJOR_VERSION=2
 SDL_MINOR_VERSION=30
-SDL_MICRO_VERSION=4
+SDL_MICRO_VERSION=6
 SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION

 SDL_BINARY_AGE=`expr $SDL_MINOR_VERSION \* 100 + $SDL_MICRO_VERSION`
@@ -261,10 +261,10 @@ Some things that may be of interest about how it all works...
 ## Working directory

 In SDL 1.2, the working directory of your SDL app is by default set to its
-parent, but this is no longer the case in SDL 2.0. SDL2 does change the
-working directory, which means it'll be whatever the command line prompt
-that launched the program was using, or if launched by double-clicking in
-the finger, it will be "/", the _root of the filesystem_. Plan accordingly!
+parent, but this is no longer the case in SDL 2.0 and later. SDL2 does not
+change the working directory, which means it'll be whatever the command line
+prompt that launched the program was using, or if launched by double-clicking
+in the Finder, it will be "/", the _root of the filesystem_. Plan accordingly!
 You can use SDL_GetBasePath() to find where the program is running from and
 chdir() there directly.

@@ -1424,7 +1424,19 @@ extern "C" {
 #define SDL_HINT_MOUSE_RELATIVE_WARP_MOTION  "SDL_MOUSE_RELATIVE_WARP_MOTION"

 /**
- *  \brief  A variable controlling whether mouse events should generate synthetic touch events
+ *  \brief  A variable controlling whether the hardware cursor stays visible when relative mode is active.
+ *
+ *  This variable can be set to the following values:
+ *    "0"       - The cursor will be hidden while relative mode is active (default)
+ *    "1"       - The cursor will remain visible while relative mode is active
+ *
+ *  Note that for systems without raw hardware inputs, relative mode is implemented using warping, so the hardware cursor will visibly warp between frames if this is enabled on those systems.
+ */
+#define SDL_HINT_MOUSE_RELATIVE_CURSOR_VISIBLE  "SDL_MOUSE_RELATIVE_CURSOR_VISIBLE"
+
+/**
+ * A variable controlling whether mouse events should generate synthetic touch
+ * events
 *
 *  This variable can be set to the following values:
 *    "0"       - Mouse events will not generate touch events (default for desktop platforms)
@@ -790,12 +790,17 @@ extern DECLSPEC void SDLCALL SDL_JoystickUpdate(void);
 * **WARNING**: Calling this function may delete all events currently in SDL's
 * event queue.
 *
- * \param state can be one of `SDL_QUERY`, `SDL_IGNORE`, or `SDL_ENABLE`
- * \returns 1 if enabled, 0 if disabled, or a negative error code on failure;
- *          call SDL_GetError() for more information.
+ * While `param` is meant to be one of `SDL_QUERY`, `SDL_IGNORE`, or
+ * `SDL_ENABLE`, this function accepts any value, with any non-zero value that
+ * isn't `SDL_QUERY` being treated as `SDL_ENABLE`.
 *
- *          If `state` is `SDL_QUERY` then the current state is returned,
- *          otherwise the new processing state is returned.
+ * If SDL was built with events disabled (extremely uncommon!), this will
+ * do nothing and always return `SDL_IGNORE`.
+ *
+ * \param state can be one of `SDL_QUERY`, `SDL_IGNORE`, or `SDL_ENABLE`
+ * \returns If `state` is `SDL_QUERY` then the current state is returned,
+ *          otherwise `state` is returned (even if it was not one of the
+ *          allowed values).
 *
 * \since This function is available since SDL 2.0.0.
 *
@@ -377,9 +377,12 @@ typedef uint64_t Uint64;

 #ifndef SDL_COMPILE_TIME_ASSERT
 #if defined(__cplusplus)
+/* Keep C++ case alone: Some versions of gcc will define __STDC_VERSION__ even when compiling in C++ mode. */
 #if (__cplusplus >= 201103L)
 #define SDL_COMPILE_TIME_ASSERT(name, x)  static_assert(x, #x)
 #endif
+#elif defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 202311L)
+#define SDL_COMPILE_TIME_ASSERT(name, x)  static_assert(x, #x)
 #elif defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)
 #define SDL_COMPILE_TIME_ASSERT(name, x) _Static_assert(x, #x)
 #endif
@@ -59,7 +59,7 @@ typedef struct SDL_version
 */
 #define SDL_MAJOR_VERSION   2
 #define SDL_MINOR_VERSION   30
-#define SDL_PATCHLEVEL      4
+#define SDL_PATCHLEVEL      6

 /**
 * Macro to determine SDL version program was compiled against.
@@ -29,9 +29,6 @@
 #endif
 #if defined(__OS2__)
 #include "core/os2/SDL_os2.h"
-#ifdef SDL_THREAD_OS2
-#include "thread/os2/SDL_systls_c.h"
-#endif
 #endif

 /* this checks for HAVE_DBUS_DBUS_H internally. */
@@ -52,6 +49,7 @@
 #include "haptic/SDL_haptic_c.h"
 #include "joystick/SDL_joystick_c.h"
 #include "sensor/SDL_sensor_c.h"
+#include "thread/SDL_thread_c.h"

 /* Initialization/Cleanup routines */
 #ifndef SDL_TIMERS_DISABLED
@@ -116,6 +114,7 @@ static SDL_bool SDL_MainIsReady = SDL_FALSE;
 #else
 static SDL_bool SDL_MainIsReady = SDL_TRUE;
 #endif
+static SDL_bool SDL_main_thread_initialized = SDL_FALSE;
 static SDL_bool SDL_bInMainQuit = SDL_FALSE;
 static Uint8 SDL_SubsystemRefCount[32];

@@ -181,6 +180,36 @@ void SDL_SetMainReady(void)
    SDL_MainIsReady = SDL_TRUE;
 }

+void SDL_InitMainThread(void)
+{
+    if (SDL_main_thread_initialized) {
+        return;
+    }
+
+    SDL_InitTLSData();
+#ifndef SDL_TIMERS_DISABLED
+    SDL_TicksInit();
+#endif
+    SDL_LogInit();
+
+    SDL_main_thread_initialized = SDL_TRUE;
+}
+
+static void SDL_QuitMainThread(void)
+{
+    if (!SDL_main_thread_initialized) {
+        return;
+    }
+
+    SDL_LogQuit();
+#ifndef SDL_TIMERS_DISABLED
+    SDL_TicksQuit();
+#endif
+    SDL_QuitTLSData();
+
+    SDL_main_thread_initialized = SDL_FALSE;
+}
+
 int SDL_InitSubSystem(Uint32 flags)
 {
    Uint32 flags_initialized = 0;
@@ -189,8 +218,6 @@ int SDL_InitSubSystem(Uint32 flags)
        return SDL_SetError("Application didn't initialize properly, did you include SDL_main.h in the file containing your main() function?");
    }

-    SDL_LogInit();
-
    /* Clear the error message */
    SDL_ClearError();

@@ -198,10 +225,6 @@ int SDL_InitSubSystem(Uint32 flags)
    SDL_DBus_Init();
 #endif

-#ifdef SDL_THREAD_OS2
-    SDL_OS2TLSAlloc(); /* thread/os2/SDL_systls.c */
-#endif
-
 #ifdef SDL_VIDEO_DRIVER_WINDOWS
    if (flags & (SDL_INIT_HAPTIC | SDL_INIT_JOYSTICK)) {
        if (SDL_HelperWindowCreate() < 0) {
@@ -210,10 +233,6 @@ int SDL_InitSubSystem(Uint32 flags)
    }
 #endif

-#ifndef SDL_TIMERS_DISABLED
-    SDL_TicksInit();
-#endif
-
    /* Initialize the event subsystem */
    if (flags & SDL_INIT_EVENTS) {
 #ifndef SDL_EVENTS_DISABLED
@@ -378,9 +397,6 @@ int SDL_Init(Uint32 flags)
 void SDL_QuitSubSystem(Uint32 flags)
 {
 #if defined(__OS2__)
-#ifdef SDL_THREAD_OS2
-    SDL_OS2TLSFree(); /* thread/os2/SDL_systls.c */
-#endif
    SDL_OS2Quit();
 #endif

@@ -504,10 +520,6 @@ void SDL_Quit(void)
 #endif
    SDL_QuitSubSystem(SDL_INIT_EVERYTHING);

-#ifndef SDL_TIMERS_DISABLED
-    SDL_TicksQuit();
-#endif
-
 #ifdef SDL_USE_LIBDBUS
    SDL_DBus_Quit();
 #endif
@@ -515,14 +527,12 @@ void SDL_Quit(void)
    SDL_ClearHints();
    SDL_AssertionsQuit();

-    SDL_LogQuit();
-
    /* Now that every subsystem has been quit, we reset the subsystem refcount
     * and the list of initialized subsystems.
     */
    SDL_memset(SDL_SubsystemRefCount, 0x0, sizeof(SDL_SubsystemRefCount));

-    SDL_TLSCleanup();
+    SDL_QuitMainThread();

    SDL_bInMainQuit = SDL_FALSE;
 }
@@ -208,6 +208,8 @@
 #include "SDL_assert.h"
 #include "SDL_log.h"

+extern void SDL_InitMainThread(void);
+
 #endif /* SDL_internal_h_ */

 /* vi: set ts=4 sw=4 expandtab: */
@@ -86,7 +86,7 @@ static struct

 #undef SDL_ARTS_SYM

-static void UnloadARTSLibrary()
+static void UnloadARTSLibrary(void)
 {
    if (arts_handle) {
        SDL_UnloadObject(arts_handle);
@@ -119,7 +119,7 @@ static int LoadARTSLibrary(void)

 #else

-static void UnloadARTSLibrary()
+static void UnloadARTSLibrary(void)
 {
    return;
 }
@@ -64,7 +64,7 @@ static struct

 #undef SDL_ESD_SYM

-static void UnloadESDLibrary()
+static void UnloadESDLibrary(void)
 {
    if (esd_handle) {
        SDL_UnloadObject(esd_handle);
@@ -96,7 +96,7 @@ static int LoadESDLibrary(void)

 #else

-static void UnloadESDLibrary()
+static void UnloadESDLibrary(void)
 {
    return;
 }
@@ -77,7 +77,7 @@ static struct

 #undef SDL_FS_SYM

-static void UnloadFusionSoundLibrary()
+static void UnloadFusionSoundLibrary(void)
 {
    if (fs_handle) {
        SDL_UnloadObject(fs_handle);
@@ -110,7 +110,7 @@ static int LoadFusionSoundLibrary(void)

 #else

-static void UnloadFusionSoundLibrary()
+static void UnloadFusionSoundLibrary(void)
 {
    return;
 }
@@ -142,13 +142,13 @@ static int pipewire_dlsym(const char *fn, void **addr)
        return -1;                                             \
    }

-static int load_pipewire_library()
+static int load_pipewire_library(void)
 {
    pipewire_handle = SDL_LoadObject(pipewire_library);
    return pipewire_handle ? 0 : -1;
 }

-static void unload_pipewire_library()
+static void unload_pipewire_library(void)
 {
    if (pipewire_handle) {
        SDL_UnloadObject(pipewire_handle);
@@ -160,18 +160,18 @@ static void unload_pipewire_library()

 #define SDL_PIPEWIRE_SYM(x) PIPEWIRE_##x = x

-static int load_pipewire_library()
+static int load_pipewire_library(void)
 {
    return 0;
 }

-static void unload_pipewire_library()
+static void unload_pipewire_library(void)
 { /* Nothing to do */
 }

 #endif /* SDL_AUDIO_DRIVER_PIPEWIRE_DYNAMIC */

-static int load_pipewire_syms()
+static int load_pipewire_syms(void)
 {
    SDL_PIPEWIRE_SYM(pw_get_library_version);
    SDL_PIPEWIRE_SYM(pw_init);
@@ -212,7 +212,7 @@ SDL_FORCE_INLINE SDL_bool pipewire_version_at_least(int major, int minor, int pa
           (pipewire_version_major > major || pipewire_version_minor > minor || pipewire_version_patch >= patch);
 }

-static int init_pipewire_library()
+static int init_pipewire_library(void)
 {
    if (!load_pipewire_library()) {
        if (!load_pipewire_syms()) {
@@ -234,7 +234,7 @@ static int init_pipewire_library()
    return -1;
 }

-static void deinit_pipewire_library()
+static void deinit_pipewire_library(void)
 {
    PIPEWIRE_pw_deinit();
    unload_pipewire_library();
@@ -340,7 +340,7 @@ static void io_list_remove(Uint32 id)
    }
 }

-static void io_list_sort()
+static void io_list_sort(void)
 {
    struct io_node *default_sink = NULL, *default_source = NULL;
    struct io_node *n, *temp;
@@ -365,7 +365,7 @@ static void io_list_sort()
    }
 }

-static void io_list_clear()
+static void io_list_clear(void)
 {
    struct io_node *n, *temp;

@@ -426,7 +426,7 @@ static void pending_list_remove(Uint32 id)
    }
 }

-static void pending_list_clear()
+static void pending_list_clear(void)
 {
    struct node_object *node, *temp;

@@ -751,7 +751,7 @@ static const struct pw_registry_events registry_events = { PW_VERSION_REGISTRY_E
                                                           .global_remove = registry_event_remove_callback };

 /* The hotplug thread */
-static int hotplug_loop_init()
+static int hotplug_loop_init(void)
 {
    int res;

@@ -794,7 +794,7 @@ static int hotplug_loop_init()
    return 0;
 }

-static void hotplug_loop_destroy()
+static void hotplug_loop_destroy(void)
 {
    if (hotplug_loop) {
        PIPEWIRE_pw_thread_loop_stop(hotplug_loop);
@@ -836,7 +836,7 @@ static void hotplug_loop_destroy()
    }
 }

-static void PIPEWIRE_DetectDevices()
+static void PIPEWIRE_DetectDevices(void)
 {
    struct io_node *io;

@@ -1342,7 +1342,7 @@ failed:
    return ret;
 }

-static void PIPEWIRE_Deinitialize()
+static void PIPEWIRE_Deinitialize(void)
 {
    if (pipewire_initialized) {
        hotplug_loop_destroy();
@@ -885,7 +885,7 @@ static int SDLCALL HotplugThread(void *data)
    return 0;
 }

-static void PULSEAUDIO_DetectDevices()
+static void PULSEAUDIO_DetectDevices(void)
 {
    SDL_sem *ready_sem = SDL_CreateSemaphore(0);

@@ -842,18 +842,18 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeDropFile)(
 }

 /* Lock / Unlock Mutex */
-void Android_ActivityMutex_Lock()
+void Android_ActivityMutex_Lock(void)
 {
    SDL_LockMutex(Android_ActivityMutex);
 }

-void Android_ActivityMutex_Unlock()
+void Android_ActivityMutex_Unlock(void)
 {
    SDL_UnlockMutex(Android_ActivityMutex);
 }

 /* Lock the Mutex when the Activity is in its 'Running' state */
-void Android_ActivityMutex_Lock_Running()
+void Android_ActivityMutex_Lock_Running(void)
 {
    int pauseSignaled = 0;
    int resumeSignaled = 0;
@@ -1439,13 +1439,13 @@ void Android_JNI_SetOrientation(int w, int h, int resizable, const char *hint)
    (*env)->DeleteLocalRef(env, jhint);
 }

-void Android_JNI_MinizeWindow()
+void Android_JNI_MinizeWindow(void)
 {
    JNIEnv *env = Android_JNI_GetEnv();
    (*env)->CallStaticVoidMethod(env, mActivityClass, midMinimizeWindow);
 }

-SDL_bool Android_JNI_ShouldMinimizeOnFocusLoss()
+SDL_bool Android_JNI_ShouldMinimizeOnFocusLoss(void)
 {
    JNIEnv *env = Android_JNI_GetEnv();
    return (*env)->CallStaticBooleanMethod(env, mActivityClass, midShouldMinimizeOnFocusLoss);
@@ -1879,7 +1879,7 @@ static SDL_bool Android_JNI_ExceptionOccurred(SDL_bool silent)
    return SDL_FALSE;
 }

-static void Internal_Android_Create_AssetManager()
+static void Internal_Android_Create_AssetManager(void)
 {

    struct LocalReferenceHolder refs = LocalReferenceHolder_Setup(__FUNCTION__);
@@ -1918,7 +1918,7 @@ static void Internal_Android_Create_AssetManager()
    LocalReferenceHolder_Cleanup(&refs);
 }

-static void Internal_Android_Destroy_AssetManager()
+static void Internal_Android_Destroy_AssetManager(void)
 {
    JNIEnv *env = Android_JNI_GetEnv();

@@ -2153,7 +2153,7 @@ int Android_JNI_GetPowerInfo(int *plugged, int *charged, int *battery, int *seco
 }

 /* Add all touch devices */
-void Android_JNI_InitTouch()
+void Android_JNI_InitTouch(void)
 {
    JNIEnv *env = Android_JNI_GetEnv();
    (*env)->CallStaticVoidMethod(env, mActivityClass, midInitTouch);
@@ -134,7 +134,7 @@ static void kbd_cleanup_signal_action(int signum, siginfo_t *info, void *ucontex
    SDL_EVDEV_kbd_reraise_signal(signum);
 }

-static void kbd_unregister_emerg_cleanup()
+static void kbd_unregister_emerg_cleanup(void)
 {
    int tabidx, signum;

@@ -214,7 +214,7 @@ static void kbd_cleanup_signal_action(int signum, siginfo_t *info, void *ucontex
    SDL_EVDEV_kbd_reraise_signal(signum);
 }

-static void kbd_unregister_emerg_cleanup()
+static void kbd_unregister_emerg_cleanup(void)
 {
    int tabidx, signum;

@@ -55,7 +55,7 @@ typedef struct _FcitxClient

 static FcitxClient fcitx_client;

-static char *GetAppName()
+static char *GetAppName(void)
 {
 #if defined(__LINUX__) || defined(__FREEBSD__)
    char *spot;
@@ -368,7 +368,7 @@ static Uint32 Fcitx_ModState(void)
    return fcitx_mods;
 }

-SDL_bool SDL_Fcitx_Init()
+SDL_bool SDL_Fcitx_Init(void)
 {
    fcitx_client.dbus = SDL_DBus_GetContext();

@@ -380,7 +380,7 @@ SDL_bool SDL_Fcitx_Init()
    return FcitxClientCreateIC(&fcitx_client);
 }

-void SDL_Fcitx_Quit()
+void SDL_Fcitx_Quit(void)
 {
    FcitxClientICCallMethod(&fcitx_client, "DestroyIC");
    if (fcitx_client.ic_path) {
@@ -485,7 +485,6 @@ void SDL_Fcitx_PumpEvents(void)

    while (dbus->connection_dispatch(conn) == DBUS_DISPATCH_DATA_REMAINS) {
        /* Do nothing, actual work happens in DBus_MessageFilter */
-        usleep(10);
    }
 }

@@ -40,7 +40,7 @@ static _SDL_IME_ProcessKeyEvent SDL_IME_ProcessKeyEvent_Real = NULL;
 static _SDL_IME_UpdateTextRect SDL_IME_UpdateTextRect_Real = NULL;
 static _SDL_IME_PumpEvents SDL_IME_PumpEvents_Real = NULL;

-static void InitIME()
+static void InitIME(void)
 {
    static SDL_bool inited = SDL_FALSE;
 #ifdef HAVE_FCITX
@@ -142,7 +142,7 @@ void SDL_IME_UpdateTextRect(const SDL_Rect *rect)
    }
 }

-void SDL_IME_PumpEvents()
+void SDL_IME_PumpEvents(void)
 {
    if (SDL_IME_PumpEvents_Real) {
        SDL_IME_PumpEvents_Real();
@@ -79,7 +79,7 @@ static SDL_bool realtime_portal_supported(DBusConnection *conn)
                                              "RTTimeUSecMax", DBUS_TYPE_INT64, &res);
 }

-static void set_rtkit_interface()
+static void set_rtkit_interface(void)
 {
    SDL_DBusContext *dbus = SDL_DBus_GetContext();

@@ -108,7 +108,7 @@ static DBusConnection *get_rtkit_dbus_connection()
    return NULL;
 }

-static void rtkit_initialize()
+static void rtkit_initialize(void)
 {
    DBusConnection *dbus_conn;

@@ -134,7 +134,7 @@ static void rtkit_initialize()
    }
 }

-static SDL_bool rtkit_initialize_realtime_thread()
+static SDL_bool rtkit_initialize_realtime_thread(void)
 {
    // Following is an excerpt from rtkit README that outlines the requirements
    // a thread must meet before making rtkit requests:
@@ -449,7 +449,7 @@ static SDL_WSCONS_input_data *SDL_WSCONS_Init_Keyboard(const char *dev)
    return input;
 }

-void SDL_WSCONS_Init()
+void SDL_WSCONS_Init(void)
 {
    inputs[0] = SDL_WSCONS_Init_Keyboard("/dev/wskbd0");
    inputs[1] = SDL_WSCONS_Init_Keyboard("/dev/wskbd1");
@@ -460,7 +460,7 @@ void SDL_WSCONS_Init()
    return;
 }

-void SDL_WSCONS_Quit()
+void SDL_WSCONS_Quit(void)
 {
    int i = 0;
    SDL_WSCONS_input_data *input = NULL;
@@ -921,7 +921,7 @@ static void updateKeyboard(SDL_WSCONS_input_data *input)
    }
 }

-void SDL_WSCONS_PumpEvents()
+void SDL_WSCONS_PumpEvents(void)
 {
    int i = 0;
    for (i = 0; i < 4; i++) {
@@ -1239,7 +1239,7 @@ void SDL_SIMDFree(void *ptr)

 #include <stdio.h>

-int main()
+int main(void)
 {
    printf("CPU count: %d\n", SDL_GetCPUCount());
    printf("CPU type: %s\n", SDL_GetCPUType());
@@ -170,6 +170,13 @@ static void SDLCALL SDL_MouseRelativeWarpMotionChanged(void *userdata, const cha
    mouse->relative_mode_warp_motion = SDL_GetStringBoolean(hint, SDL_FALSE);
 }

+static void SDLCALL SDL_MouseRelativeCursorVisibleChanged(void *userdata, const char *name, const char *oldValue, const char *hint)
+{
+    SDL_Mouse *mouse = (SDL_Mouse *)userdata;
+
+    mouse->relative_mode_cursor_visible = SDL_GetStringBoolean(hint, SDL_FALSE);
+}
+
 /* Public functions */
 int SDL_MousePreInit(void)
 {
@@ -209,6 +216,9 @@ int SDL_MousePreInit(void)
    SDL_AddHintCallback(SDL_HINT_MOUSE_RELATIVE_WARP_MOTION,
                        SDL_MouseRelativeWarpMotionChanged, mouse);

+    SDL_AddHintCallback(SDL_HINT_MOUSE_RELATIVE_CURSOR_VISIBLE,
+                        SDL_MouseRelativeCursorVisibleChanged, mouse);
+
    mouse->was_touch_mouse_events = SDL_FALSE; /* no touch to mouse movement event pending */

    mouse->cursor_shown = SDL_TRUE;
@@ -992,6 +1002,9 @@ void SDL_MouseQuit(void)

    SDL_DelHintCallback(SDL_HINT_MOUSE_RELATIVE_WARP_MOTION,
                        SDL_MouseRelativeWarpMotionChanged, mouse);
+
+    SDL_DelHintCallback(SDL_HINT_MOUSE_RELATIVE_CURSOR_VISIBLE,
+                        SDL_MouseRelativeCursorVisibleChanged, mouse);
 }

 Uint32 SDL_GetMouseState(int *x, int *y)
@@ -1412,7 +1425,7 @@ void SDL_SetCursor(SDL_Cursor *cursor)
        }
    }

-    if (cursor && mouse->cursor_shown && !mouse->relative_mode) {
+    if (cursor && mouse->cursor_shown && (!mouse->relative_mode || mouse->relative_mode_cursor_visible)) {
        if (mouse->ShowCursor) {
            mouse->ShowCursor(cursor);
        }
@@ -92,6 +92,7 @@ typedef struct
    SDL_bool relative_mode;
    SDL_bool relative_mode_warp;
    SDL_bool relative_mode_warp_motion;
+    SDL_bool relative_mode_cursor_visible;
    SDL_bool enable_normal_speed_scale;
    float normal_speed_scale;
    SDL_bool enable_relative_speed_scale;
@@ -906,9 +906,9 @@ IsInWhitelist(Uint16 vendor, Uint16 product)
 }

 #if defined(HAVE_PLATFORM_BACKEND) || HAVE_DRIVER_BACKEND
-static const SDL_bool use_libusb_whitelist_default = SDL_TRUE;
+ #define use_libusb_whitelist_default  SDL_TRUE
 #else
-static const SDL_bool use_libusb_whitelist_default = SDL_FALSE;
+ #define use_libusb_whitelist_default SDL_FALSE
 #endif /* HAVE_PLATFORM_BACKEND || HAVE_DRIVER_BACKEND */
 static SDL_bool use_libusb_whitelist = use_libusb_whitelist_default;

@@ -519,7 +519,7 @@ static struct usb_string_cache_entry *usb_string_cache = NULL;
 static size_t usb_string_cache_size = 0;
 static size_t usb_string_cache_insert_pos = 0;

-static int usb_string_cache_grow()
+static int usb_string_cache_grow(void)
 {
 	struct usb_string_cache_entry *new_cache;
 	size_t allocSize;
@@ -537,7 +537,7 @@ static int usb_string_cache_grow()
 	return 0;
 }

-static void usb_string_cache_destroy()
+static void usb_string_cache_destroy(void)
 {
 	size_t i;
 	for (i = 0; i < usb_string_cache_insert_pos; i++) {
@@ -715,6 +715,7 @@ static int is_xboxone(unsigned short vendor_id, const struct libusb_interface_de
 		0x044f, /* Thrustmaster */
 		0x045e, /* Microsoft */
 		0x0738, /* Mad Catz */
+		0x0b05, /* ASUS */
 		0x0e6f, /* PDP */
 		0x0f0d, /* Hori */
        0x10f5, /* Turtle Beach */
@@ -504,7 +504,7 @@ int HID_API_EXPORT hid_exit(void)
 	return 0;
 }

-static void process_pending_events() {
+static void process_pending_events(void) {
 	SInt32 res;
 	do {
 		res = CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0.001, FALSE);
@@ -264,7 +264,7 @@ static void register_error(hid_device *device, const char *op)
 }

 #ifndef HIDAPI_USE_DDK
-static int lookup_functions()
+static int lookup_functions(void)
 {
 	lib_handle = LoadLibrary(TEXT("hid.dll"));
 	if (lib_handle) {
@@ -688,16 +688,14 @@ static ControllerMapping_t *SDL_CreateMappingForWGIController(SDL_JoystickGUID g
 /*
 * Helper function to scan the mappings database for a controller with the specified GUID
 */
-static ControllerMapping_t *SDL_PrivateMatchControllerMappingForGUID(SDL_JoystickGUID guid, SDL_bool match_crc, SDL_bool match_version)
+static ControllerMapping_t *SDL_PrivateMatchControllerMappingForGUID(SDL_JoystickGUID guid, SDL_bool match_version)
 {
-    ControllerMapping_t *mapping;
+    ControllerMapping_t *mapping, *best_match = NULL;
    Uint16 crc = 0;

    SDL_AssertJoysticksLocked();

-    if (match_crc) {
-        SDL_GetJoystickGUIDInfo(guid, NULL, NULL, NULL, &crc);
-    }
+    SDL_GetJoystickGUIDInfo(guid, NULL, NULL, NULL, &crc);

    /* Clear the CRC from the GUID for matching, the mappings never include it in the GUID */
    SDL_SetJoystickGUIDCRC(&guid, 0);
@@ -719,20 +717,26 @@ static ControllerMapping_t *SDL_PrivateMatchControllerMappingForGUID(SDL_Joystic
        }

        if (SDL_memcmp(&guid, &mapping_guid, sizeof(guid)) == 0) {
-            Uint16 mapping_crc = 0;
+            const char *crc_string = SDL_strstr(mapping->mapping, SDL_CONTROLLER_CRC_FIELD);
+            if (crc_string) {
+                Uint16 mapping_crc = (Uint16)SDL_strtol(crc_string + SDL_CONTROLLER_CRC_FIELD_SIZE, NULL, 16);

-            if (match_crc) {
-                const char *crc_string = SDL_strstr(mapping->mapping, SDL_CONTROLLER_CRC_FIELD);
-                if (crc_string) {
-                    mapping_crc = (Uint16)SDL_strtol(crc_string + SDL_CONTROLLER_CRC_FIELD_SIZE, NULL, 16);
+                if (mapping_crc != crc) {
+                    /* This mapping specified a CRC and they don't match */
+                    continue;
                }
-            }
-            if (crc == mapping_crc) {
+
+                /* An exact match, including CRC */
                return mapping;
            }
+
+
+            if (!best_match) {
+                best_match = mapping;
+            }
        }
    }
-    return NULL;
+    return best_match;
 }

 /*
@@ -741,19 +745,8 @@ static ControllerMapping_t *SDL_PrivateMatchControllerMappingForGUID(SDL_Joystic
 static ControllerMapping_t *SDL_PrivateGetControllerMappingForGUID(SDL_JoystickGUID guid, SDL_bool adding_mapping)
 {
    ControllerMapping_t *mapping;
-    Uint16 vendor, product, crc;

-    SDL_GetJoystickGUIDInfo(guid, &vendor, &product, NULL, &crc);
-    if (crc) {
-        /* First check for exact CRC matching */
-        mapping = SDL_PrivateMatchControllerMappingForGUID(guid, SDL_TRUE, SDL_TRUE);
-        if (mapping) {
-            return mapping;
-        }
-    }
-
-    /* Now check for a mapping without CRC */
-    mapping = SDL_PrivateMatchControllerMappingForGUID(guid, SDL_FALSE, SDL_TRUE);
+    mapping = SDL_PrivateMatchControllerMappingForGUID(guid, SDL_TRUE);
    if (mapping) {
        return mapping;
    }
@@ -767,14 +760,7 @@ static ControllerMapping_t *SDL_PrivateGetControllerMappingForGUID(SDL_JoystickG

    if (SDL_JoystickGUIDUsesVersion(guid)) {
        /* Try again, ignoring the version */
-        if (crc) {
-            mapping = SDL_PrivateMatchControllerMappingForGUID(guid, SDL_TRUE, SDL_FALSE);
-            if (mapping) {
-                return mapping;
-            }
-        }
-
-        mapping = SDL_PrivateMatchControllerMappingForGUID(guid, SDL_FALSE, SDL_FALSE);
+        mapping = SDL_PrivateMatchControllerMappingForGUID(guid, SDL_FALSE);
        if (mapping) {
            return mapping;
        }
@@ -1391,9 +1377,6 @@ static ControllerMapping_t *SDL_PrivateGetControllerMappingForNameAndGUID(const
    }
 #endif /* __LINUX__ */

-    if (!mapping) {
-        mapping = s_pDefaultMapping;
-    }
    return mapping;
 }

@@ -1506,6 +1489,9 @@ static ControllerMapping_t *SDL_PrivateGetControllerMapping(int device_index)
        }
    }

+    if (!mapping) {
+        mapping = s_pDefaultMapping;
+    }
    return mapping;
 }

@@ -2059,7 +2045,7 @@ SDL_bool SDL_IsGameControllerNameAndGUID(const char *name, SDL_JoystickGUID guid

    SDL_LockJoysticks();
    {
-        if (SDL_PrivateGetControllerMappingForNameAndGUID(name, guid) != NULL) {
+        if (s_pDefaultMapping || SDL_PrivateGetControllerMappingForNameAndGUID(name, guid) != NULL) {
            retval = SDL_TRUE;
        } else {
            retval = SDL_FALSE;
@@ -324,6 +324,7 @@ static const char *s_ControllerMappings[] = {
    "030000009b2800000500000000000000,Saturn_Adapter_2.0,a:b1,b:b2,leftshoulder:b6,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b5,start:b9,x:b0,y:b3,",
    "030000008f0e00000800000000000000,SpeedLink Strike FX,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,",
    "03000000c01100000591000000000000,Speedlink Torid,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,",
+    "030000004c0500006802000000000000,SplitFish Game Controller,crc:5628,a:b0,b:b16,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,leftshoulder:b17,leftstick:b1,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b10,",
    "03000000de280000ff11000000000000,Steam Virtual Gamepad,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:+a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:-a2,rightx:a3,righty:a4,start:b7,x:b2,y:b3,",
    "03000000110100003114000000000000,SteelSeries Stratus Duo,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,",
    "03000000381000001814000000000000,SteelSeries Stratus XL,a:b0,b:b1,back:b18,dpdown:b13,dpleft:b14,dpright:b15,dpup:b12,guide:b19,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b2,y:b3,",
@@ -394,7 +394,7 @@ static Uint32 initial_wheel_devices[] = {
    MAKE_VIDPID(0x2433, 0xf301), /* Asetek SimSports Forte Wheelbase */
    MAKE_VIDPID(0x2433, 0xf303), /* Asetek SimSports La Prima Wheelbase */
    MAKE_VIDPID(0x2433, 0xf306), /* Asetek SimSports Tony Kannan Wheelbase */
-    MAKE_VIDPID(0x3416,	0x0301), /* Cammus C5 Wheelbase */
+    MAKE_VIDPID(0x3416, 0x0301), /* Cammus C5 Wheelbase */
    MAKE_VIDPID(0x346e, 0x0000), /* Moza R16/R21 Wheelbase */
    MAKE_VIDPID(0x346e, 0x0002), /* Moza R9 Wheelbase */
    MAKE_VIDPID(0x346e, 0x0004), /* Moza R5 Wheelbase */
@@ -1412,9 +1412,13 @@ int SDL_JoystickRumble(SDL_Joystick *joystick, Uint16 low_frequency_rumble, Uint
            retval = 0;
        } else {
            retval = joystick->driver->Rumble(joystick, low_frequency_rumble, high_frequency_rumble);
-            joystick->rumble_resend = SDL_GetTicks() + SDL_RUMBLE_RESEND_MS;
-            if (!joystick->rumble_resend) {
-                joystick->rumble_resend = 1;
+            if (retval == 0) {
+                joystick->rumble_resend = SDL_GetTicks() + SDL_RUMBLE_RESEND_MS;
+                if (joystick->rumble_resend == 0) {
+                    joystick->rumble_resend = 1;
+                }
+            } else {
+                joystick->rumble_resend = 0;
            }
        }

@@ -2177,12 +2181,14 @@ void SDL_JoystickUpdate(void)
 #endif /* SDL_JOYSTICK_HIDAPI */

    for (joystick = SDL_joysticks; joystick; joystick = joystick->next) {
-        if (joystick->attached) {
-            joystick->driver->Update(joystick);
+        if (!joystick->attached) {
+            continue;
+        }

-            if (joystick->delayed_guide_button) {
-                SDL_GameControllerHandleDelayedGuideButton(joystick);
-            }
+        joystick->driver->Update(joystick);
+
+        if (joystick->delayed_guide_button) {
+            SDL_GameControllerHandleDelayedGuideButton(joystick);
        }

        now = SDL_GetTicks();
@@ -2220,7 +2226,7 @@ void SDL_JoystickUpdate(void)
 int SDL_JoystickEventState(int state)
 {
 #ifdef SDL_EVENTS_DISABLED
-    return SDL_DISABLE;
+    return SDL_IGNORE;
 #else
    const Uint32 event_list[] = {
        SDL_JOYAXISMOTION, SDL_JOYBALLMOTION, SDL_JOYHATMOTION,
@@ -2748,6 +2754,11 @@ SDL_bool SDL_IsJoystickXboxSeriesX(Uint16 vendor_id, Uint16 product_id)
            return SDL_TRUE;
        }
    }
+    if (vendor_id == USB_VENDOR_ASUS) {
+        if (product_id == USB_PRODUCT_ROG_RAIKIRI) {
+            return SDL_TRUE;
+        }
+    }
    return SDL_FALSE;
 }

@@ -134,119 +134,12 @@ static SDL_bool FeedDeckLizardWatchdog(SDL_hid_device *dev)
    return SDL_TRUE;
 }

-/*****************************************************************************************************/
-
-static void HIDAPI_DriverSteamDeck_RegisterHints(SDL_HintCallback callback, void *userdata)
+static void HIDAPI_DriverSteamDeck_HandleState(SDL_HIDAPI_Device *device,
+                                               SDL_Joystick *joystick,
+                                               ValveInReport_t *pInReport)
 {
-    SDL_AddHintCallback(SDL_HINT_JOYSTICK_HIDAPI_STEAMDECK, callback, userdata);
-}
-
-static void HIDAPI_DriverSteamDeck_UnregisterHints(SDL_HintCallback callback, void *userdata)
-{
-    SDL_DelHintCallback(SDL_HINT_JOYSTICK_HIDAPI_STEAMDECK, callback, userdata);
-}
-
-static SDL_bool HIDAPI_DriverSteamDeck_IsEnabled(void)
-{
-    return SDL_GetHintBoolean(SDL_HINT_JOYSTICK_HIDAPI_STEAMDECK,
-                              SDL_GetHintBoolean(SDL_HINT_JOYSTICK_HIDAPI, SDL_HIDAPI_DEFAULT));
-}
-
-static SDL_bool HIDAPI_DriverSteamDeck_IsSupportedDevice(
-    SDL_HIDAPI_Device *device,
-    const char *name,
-    SDL_GameControllerType type,
-    Uint16 vendor_id,
-    Uint16 product_id,
-    Uint16 version,
-    int interface_number,
-    int interface_class,
-    int interface_subclass,
-    int interface_protocol)
-{
-    return SDL_IsJoystickSteamDeck(vendor_id, product_id);
-}
-
-static SDL_bool HIDAPI_DriverSteamDeck_InitDevice(SDL_HIDAPI_Device *device)
-{
-    int size;
-    Uint8 data[64];
-    SDL_DriverSteamDeck_Context *ctx;
-
-    ctx = (SDL_DriverSteamDeck_Context *)SDL_calloc(1, sizeof(*ctx));
-    if (ctx == NULL) {
-        SDL_OutOfMemory();
-        return SDL_FALSE;
-    }
-
-    // Always 1kHz according to USB descriptor
-    ctx->update_rate_us = 1000;
-
-    device->context = ctx;
-
-    // Read a report to see if this is the correct endpoint.
-    // Mouse, Keyboard and Controller have the same VID/PID but
-    // only the controller hidraw device receives hid reports.
-    size = SDL_hid_read_timeout(device->dev, data, sizeof(data), 16);
-    if (size == 0)
-        return SDL_FALSE;
-
-    if (!DisableDeckLizardMode(device->dev))
-        return SDL_FALSE;
-
-    HIDAPI_SetDeviceName(device, "Steam Deck");
-
-    return HIDAPI_JoystickConnected(device, NULL);
-}
-
-static int HIDAPI_DriverSteamDeck_GetDevicePlayerIndex(SDL_HIDAPI_Device *device, SDL_JoystickID instance_id)
-{
-    return -1;
-}
-
-static void HIDAPI_DriverSteamDeck_SetDevicePlayerIndex(SDL_HIDAPI_Device *device, SDL_JoystickID instance_id, int player_index)
-{
-}
-
-static SDL_bool HIDAPI_DriverSteamDeck_UpdateDevice(SDL_HIDAPI_Device *device)
-{
-    SDL_DriverSteamDeck_Context *ctx = (SDL_DriverSteamDeck_Context *)device->context;
-    SDL_Joystick *joystick = NULL;
-    int r;
-    uint8_t data[64];
    float values[3];
-    ValveInReport_t *pInReport = (ValveInReport_t *)data;
-
-    if (device->num_joysticks > 0) {
-        joystick = SDL_JoystickFromInstanceID(device->joysticks[0]);
-        if (joystick == NULL) {
-            return SDL_FALSE;
-        }
-    } else {
-        return SDL_FALSE;
-    }
-
-    if (ctx->watchdog_counter++ > 200) {
-        ctx->watchdog_counter = 0;
-        if (!FeedDeckLizardWatchdog(device->dev))
-            return SDL_FALSE;
-    }
-
-    SDL_memset(data, 0, sizeof(data));
-    r = SDL_hid_read(device->dev, data, sizeof(data));
-    if (r == 0) {
-        return SDL_FALSE;
-    } else if (r <= 0) {
-        /* Failed to read from controller */
-        HIDAPI_JoystickDisconnected(device, device->joysticks[0]);
-        return SDL_FALSE;
-    }
-
-    if (!(r == 64 && pInReport->header.unReportVersion == k_ValveInReportMsgVersion && pInReport->header.ucType == ID_CONTROLLER_DECK_STATE && pInReport->header.ucLength == 64)) {
-        return SDL_FALSE;
-    }
-
-    // Uint64 timestamp = SDL_GetTicksNS();
+    SDL_DriverSteamDeck_Context *ctx = (SDL_DriverSteamDeck_Context *)device->context;

    if (pInReport->payload.deckState.ulButtons != ctx->last_button_state) {
        SDL_PrivateJoystickButton(joystick, SDL_CONTROLLER_BUTTON_A,
@@ -322,6 +215,121 @@ static SDL_bool HIDAPI_DriverSteamDeck_UpdateDevice(SDL_HIDAPI_Device *device)
    values[1] = (pInReport->payload.deckState.sAccelZ / 32768.0f) * 2.0f * SDL_STANDARD_GRAVITY;
    values[2] = (-pInReport->payload.deckState.sAccelY / 32768.0f) * 2.0f * SDL_STANDARD_GRAVITY;
    SDL_PrivateJoystickSensor(joystick, SDL_SENSOR_ACCEL, ctx->sensor_timestamp_us, values, 3);
+}
+
+/*****************************************************************************************************/
+
+static void HIDAPI_DriverSteamDeck_RegisterHints(SDL_HintCallback callback, void *userdata)
+{
+    SDL_AddHintCallback(SDL_HINT_JOYSTICK_HIDAPI_STEAMDECK, callback, userdata);
+}
+
+static void HIDAPI_DriverSteamDeck_UnregisterHints(SDL_HintCallback callback, void *userdata)
+{
+    SDL_DelHintCallback(SDL_HINT_JOYSTICK_HIDAPI_STEAMDECK, callback, userdata);
+}
+
+static SDL_bool HIDAPI_DriverSteamDeck_IsEnabled(void)
+{
+    return SDL_GetHintBoolean(SDL_HINT_JOYSTICK_HIDAPI_STEAMDECK,
+                              SDL_GetHintBoolean(SDL_HINT_JOYSTICK_HIDAPI, SDL_HIDAPI_DEFAULT));
+}
+
+static SDL_bool HIDAPI_DriverSteamDeck_IsSupportedDevice(
+    SDL_HIDAPI_Device *device,
+    const char *name,
+    SDL_GameControllerType type,
+    Uint16 vendor_id,
+    Uint16 product_id,
+    Uint16 version,
+    int interface_number,
+    int interface_class,
+    int interface_subclass,
+    int interface_protocol)
+{
+    return SDL_IsJoystickSteamDeck(vendor_id, product_id);
+}
+
+static SDL_bool HIDAPI_DriverSteamDeck_InitDevice(SDL_HIDAPI_Device *device)
+{
+    int size;
+    Uint8 data[64];
+    SDL_DriverSteamDeck_Context *ctx;
+
+    ctx = (SDL_DriverSteamDeck_Context *)SDL_calloc(1, sizeof(*ctx));
+    if (ctx == NULL) {
+        SDL_OutOfMemory();
+        return SDL_FALSE;
+    }
+
+    // Always 1kHz according to USB descriptor, but actually about 4 ms.
+    ctx->update_rate_us = 4000;
+
+    device->context = ctx;
+
+    // Read a report to see if this is the correct endpoint.
+    // Mouse, Keyboard and Controller have the same VID/PID but
+    // only the controller hidraw device receives hid reports.
+    size = SDL_hid_read_timeout(device->dev, data, sizeof(data), 16);
+    if (size == 0)
+        return SDL_FALSE;
+
+    if (!DisableDeckLizardMode(device->dev))
+        return SDL_FALSE;
+
+    HIDAPI_SetDeviceName(device, "Steam Deck");
+
+    return HIDAPI_JoystickConnected(device, NULL);
+}
+
+static int HIDAPI_DriverSteamDeck_GetDevicePlayerIndex(SDL_HIDAPI_Device *device, SDL_JoystickID instance_id)
+{
+    return -1;
+}
+
+static void HIDAPI_DriverSteamDeck_SetDevicePlayerIndex(SDL_HIDAPI_Device *device, SDL_JoystickID instance_id, int player_index)
+{
+}
+
+static SDL_bool HIDAPI_DriverSteamDeck_UpdateDevice(SDL_HIDAPI_Device *device)
+{
+    SDL_DriverSteamDeck_Context *ctx = (SDL_DriverSteamDeck_Context *)device->context;
+    SDL_Joystick *joystick = NULL;
+    int r;
+    uint8_t data[64];
+    ValveInReport_t *pInReport = (ValveInReport_t *)data;
+
+    if (device->num_joysticks > 0) {
+        joystick = SDL_JoystickFromInstanceID(device->joysticks[0]);
+        if (joystick == NULL) {
+            return SDL_FALSE;
+        }
+    } else {
+        return SDL_FALSE;
+    }
+
+    if (ctx->watchdog_counter++ > 200) {
+        ctx->watchdog_counter = 0;
+        if (!FeedDeckLizardWatchdog(device->dev))
+            return SDL_FALSE;
+    }
+
+    SDL_memset(data, 0, sizeof(data));
+
+    do {
+        r = SDL_hid_read(device->dev, data, sizeof(data));
+
+        if (r < 0) {
+            /* Failed to read from controller */
+            HIDAPI_JoystickDisconnected(device, device->joysticks[0]);
+            return SDL_FALSE;
+        } else if (r == 64 &&
+                   pInReport->header.unReportVersion == k_ValveInReportMsgVersion &&
+                   pInReport->header.ucType == ID_CONTROLLER_DECK_STATE &&
+                   pInReport->header.ucLength == 64) {
+            HIDAPI_DriverSteamDeck_HandleState(device, joystick, pInReport);
+        }
+    } while (r > 0);

    return SDL_TRUE;
 }
@@ -332,12 +332,28 @@ typedef struct

 static int ReadInput(SDL_DriverSwitch_Context *ctx)
 {
+    int result;
+
    /* Make sure we don't try to read at the same time a write is happening */
    if (SDL_AtomicGet(&ctx->device->rumble_pending) > 0) {
        return 0;
    }

-    return SDL_hid_read_timeout(ctx->device->dev, ctx->m_rgucReadBuffer, sizeof(ctx->m_rgucReadBuffer), 0);
+    result = SDL_hid_read_timeout(ctx->device->dev, ctx->m_rgucReadBuffer, sizeof(ctx->m_rgucReadBuffer), 0);
+
+    /* See if we can guess the initial input mode */
+    if (result > 0 && !ctx->m_bInputOnly && !ctx->m_nInitialInputMode) {
+        switch (ctx->m_rgucReadBuffer[0]) {
+        case k_eSwitchInputReportIDs_FullControllerState:
+        case k_eSwitchInputReportIDs_FullControllerAndMcuState:
+        case k_eSwitchInputReportIDs_SimpleControllerState:
+            ctx->m_nInitialInputMode = ctx->m_rgucReadBuffer[0];
+            break;
+        default:
+            break;
+        }
+    }
+    return result;
 }

 static int WriteOutput(SDL_DriverSwitch_Context *ctx, const Uint8 *data, int size)
@@ -727,14 +743,12 @@ static void SDLCALL SDL_PlayerLEDHintChanged(void *userdata, const char *name, c
    }
 }

-static Uint8 GetInitialInputMode(SDL_DriverSwitch_Context *ctx)
+static void GetInitialInputMode(SDL_DriverSwitch_Context *ctx)
 {
-    Uint8 input_mode = 0;
-
-    if (ReadInput(ctx) > 0) {
-        input_mode = ctx->m_rgucReadBuffer[0];
+    if (!ctx->m_nInitialInputMode) {
+        /* This will set the initial input mode if it can */
+        ReadInput(ctx);
    }
-    return input_mode;
 }

 static Uint8 GetDefaultInputMode(SDL_DriverSwitch_Context *ctx)
@@ -1412,7 +1426,7 @@ static SDL_bool HIDAPI_DriverSwitch_OpenJoystick(SDL_HIDAPI_Device *device, SDL_
    ctx->m_bSyncWrite = SDL_TRUE;

    if (!ctx->m_bInputOnly) {
-        ctx->m_nInitialInputMode = GetInitialInputMode(ctx);
+        GetInitialInputMode(ctx);
        ctx->m_nCurrentInputMode = ctx->m_nInitialInputMode;

        /* Initialize rumble data */
@@ -280,6 +280,7 @@ static SDL_GameControllerType SDL_GetJoystickGameControllerProtocol(const char *
            0x044f, /* Thrustmaster */
            0x045e, /* Microsoft */
            0x0738, /* Mad Catz */
+            0x0b05, /* ASUS */
            0x0e6f, /* PDP */
            0x0f0d, /* Hori */
            0x10f5, /* Turtle Beach */
@@ -1007,7 +1008,7 @@ static void HIDAPI_DelDevice(SDL_HIDAPI_Device *device)
    }
 }

-static SDL_bool HIDAPI_CreateCombinedJoyCons()
+static SDL_bool HIDAPI_CreateCombinedJoyCons(void)
 {
    SDL_HIDAPI_Device *device, *combined;
    SDL_HIDAPI_Device *joycons[2] = { NULL, NULL };
@@ -47,7 +47,14 @@
 #define SDL_JOYSTICK_HIDAPI_SHIELD

 /* Whether HIDAPI is enabled by default */
+#if defined(__ANDROID__) || \
+    defined(__IPHONEOS__) || \
+    defined(__TVOS__)
+/* On Android, HIDAPI prompts for permissions and acquires exclusive access to the device, and on Apple mobile platforms it doesn't do anything except for handling Bluetooth Steam Controllers, so we'll leave it off by default. */
+#define SDL_HIDAPI_DEFAULT SDL_FALSE
+#else
 #define SDL_HIDAPI_DEFAULT SDL_TRUE
+#endif

 /* The maximum size of a USB packet for HID devices */
 #define USB_PACKET_LENGTH 64
@@ -133,13 +133,13 @@ static int PS2_JoystickInit(void)
 }

 /* Function to return the number of joystick devices plugged in right now */
-static int PS2_JoystickGetCount()
+static int PS2_JoystickGetCount(void)
 {
    return (int)enabled_pads;
 }

 /* Function to cause any queued joystick insertions to be processed */
-static void PS2_JoystickDetect()
+static void PS2_JoystickDetect(void)
 {
 }

@@ -96,6 +96,9 @@ static int PSP_JoystickInit(void)
        analog_map[127 - i] = -1 * analog_map[i + 128];
    }

+    /* Fire off a joystick add event */
+    SDL_PrivateJoystickAdded(0);
+
    return 1;
 }

@@ -28,6 +28,7 @@
 #define USB_VENDOR_AMAZON       0x1949
 #define USB_VENDOR_APPLE        0x05ac
 #define USB_VENDOR_ASTRO        0x9886
+#define USB_VENDOR_ASUS         0x0b05
 #define USB_VENDOR_BACKBONE     0x358a
 #define USB_VENDOR_GAMESIR      0x3537
 #define USB_VENDOR_DRAGONRISE   0x0079
@@ -105,6 +106,7 @@
 #define USB_PRODUCT_RAZER_WOLVERINE_V2_PRO_PS5_WIRELESS   0x100c
 #define USB_PRODUCT_RAZER_WOLVERINE_V2_PRO_XBOX_WIRED     0x1010
 #define USB_PRODUCT_RAZER_WOLVERINE_V2_PRO_XBOX_WIRELESS  0x1011
+#define USB_PRODUCT_ROG_RAIKIRI                           0x1a38
 #define USB_PRODUCT_SAITEK_CYBORG_V3                      0xf622
 #define USB_PRODUCT_SHANWAN_DS3                           0x0523
 #define USB_PRODUCT_SONY_DS3                              0x0268
@@ -145,12 +145,12 @@ int VITA_JoystickInit(void)
    return SDL_numjoysticks;
 }

-int VITA_JoystickGetCount()
+int VITA_JoystickGetCount(void)
 {
    return SDL_numjoysticks;
 }

-void VITA_JoystickDetect()
+void VITA_JoystickDetect(void)
 {
 }

@@ -331,7 +331,7 @@ static struct
 static SDL_bool xinput_device_change = SDL_TRUE;
 static SDL_bool xinput_state_dirty = SDL_TRUE;

-static void RAWINPUT_UpdateXInput()
+static void RAWINPUT_UpdateXInput(void)
 {
    DWORD user_index;
    if (xinput_device_change) {
@@ -371,7 +371,7 @@ static void RAWINPUT_MarkXInputSlotFree(Uint8 xinput_slot)
        xinput_state[xinput_slot].used = SDL_FALSE;
    }
 }
-static SDL_bool RAWINPUT_MissingXInputSlot()
+static SDL_bool RAWINPUT_MissingXInputSlot(void)
 {
    int ii;
    for (ii = 0; ii < SDL_arraysize(xinput_state); ii++) {
@@ -556,7 +556,7 @@ static void RAWINPUT_MarkWindowsGamingInputSlotFree(WindowsGamingInputGamepadSta
    wgi_slot->correlated_context = NULL;
 }

-static SDL_bool RAWINPUT_MissingWindowsGamingInputSlot()
+static SDL_bool RAWINPUT_MissingWindowsGamingInputSlot(void)
 {
    int ii;
    for (ii = 0; ii < wgi_state.per_gamepad_count; ii++) {
@@ -567,7 +567,7 @@ static SDL_bool RAWINPUT_MissingWindowsGamingInputSlot()
    return SDL_FALSE;
 }

-static void RAWINPUT_UpdateWindowsGamingInput()
+static void RAWINPUT_UpdateWindowsGamingInput(void)
 {
    int ii;
    if (!wgi_state.gamepad_statics) {
@@ -1050,7 +1050,7 @@ static int RAWINPUT_JoystickGetCount(void)
    return SDL_RAWINPUT_numjoysticks;
 }

-SDL_bool RAWINPUT_IsEnabled()
+SDL_bool RAWINPUT_IsEnabled(void)
 {
    return SDL_RAWINPUT_inited && !SDL_RAWINPUT_remote_desktop;
 }
@@ -2087,7 +2087,7 @@ int RAWINPUT_RegisterNotifications(HWND hWnd)
    return 0;
 }

-int RAWINPUT_UnregisterNotifications()
+int RAWINPUT_UnregisterNotifications(void)
 {
    int i;
    RAWINPUTDEVICE rid[SDL_arraysize(subscribed_devices)];
@@ -216,7 +216,7 @@ static SDL_bool SDL_IsXInputDevice(Uint16 vendor, Uint16 product)
    return SDL_FALSE;
 }

-static void WGI_LoadRawGameControllerStatics()
+static void WGI_LoadRawGameControllerStatics(void)
 {
    WindowsCreateStringReference_t WindowsCreateStringReferenceFunc = NULL;
    RoGetActivationFactory_t RoGetActivationFactoryFunc = NULL;
@@ -247,7 +247,7 @@ static void WGI_LoadRawGameControllerStatics()
    }
 }

-static void WGI_LoadOtherControllerStatics()
+static void WGI_LoadOtherControllerStatics(void)
 {
    WindowsCreateStringReference_t WindowsCreateStringReferenceFunc = NULL;
    RoGetActivationFactory_t RoGetActivationFactoryFunc = NULL;
@@ -41,7 +41,7 @@ extern "C" {
 */
 static SDL_bool s_bXInputEnabled = SDL_TRUE;

-static SDL_bool SDL_XInputUseOldJoystickMapping()
+static SDL_bool SDL_XInputUseOldJoystickMapping(void)
 {
 #ifdef __WINRT__
    /* TODO: remove this __WINRT__ block, but only after integrating with UWP/WinRT's HID API */
@@ -458,6 +458,7 @@ void SDL_XINPUT_JoystickClose(SDL_Joystick *joystick)
 void SDL_XINPUT_JoystickQuit(void)
 {
    if (s_bXInputEnabled) {
+        s_bXInputEnabled = SDL_FALSE;
        WIN_UnloadXInputDLL();
    }
 }
@@ -23,7 +23,7 @@
 #undef main
 #endif

-__attribute__((weak)) void reset_IOP()
+__attribute__((weak)) void reset_IOP(void)
 {
    SifInitRpc(0);
    while (!SifIopReset(NULL, 0)) {
@@ -32,7 +32,7 @@ __attribute__((weak)) void reset_IOP()
    }
 }

-static void prepare_IOP()
+static void prepare_IOP(void)
 {
    reset_IOP();
    SifInitRpc(0);
@@ -41,12 +41,12 @@ static void prepare_IOP()
    sbv_patch_fileio();
 }

-static void init_drivers()
+static void init_drivers(void)
 {
 	init_ps2_filesystem_driver();
 }

-static void deinit_drivers()
+static void deinit_drivers(void)
 {
 	deinit_ps2_filesystem_driver();
 }
@@ -9,8 +9,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //

 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,30,4,0
- PRODUCTVERSION 2,30,4,0
+ FILEVERSION 2,30,6,0
+ PRODUCTVERSION 2,30,6,0
 FILEFLAGSMASK 0x3fL
 FILEFLAGS 0x0L
 FILEOS 0x40004L
@@ -23,12 +23,12 @@ BEGIN
        BEGIN
            VALUE "CompanyName", "\0"
            VALUE "FileDescription", "SDL\0"
-            VALUE "FileVersion", "2, 30, 4, 0\0"
+            VALUE "FileVersion", "2, 30, 6, 0\0"
            VALUE "InternalName", "SDL\0"
            VALUE "LegalCopyright", "Copyright (C) 2024 Sam Lantinga\0"
            VALUE "OriginalFilename", "SDL2.dll\0"
            VALUE "ProductName", "Simple DirectMedia Layer\0"
-            VALUE "ProductVersion", "2, 30, 4, 0\0"
+            VALUE "ProductVersion", "2, 30, 6, 0\0"
        END
    END
    BLOCK "VarFileInfo"
@@ -1610,7 +1610,12 @@ SDL_Renderer *D3D_CreateRenderer(SDL_Window *window, Uint32 flags)
    renderer->driverdata = data;

    SDL_VERSION(&windowinfo.version);
-    SDL_GetWindowWMInfo(window, &windowinfo);
+    if (!SDL_GetWindowWMInfo(window, &windowinfo) ||
+        windowinfo.subsystem != SDL_SYSWM_WINDOWS) {
+        SDL_free(data);
+        SDL_SetError("Couldn't get window handle");
+        return NULL;
+    }

    window_flags = SDL_GetWindowFlags(window);
    SDL_GetWindowSizeInPixels(window, &w, &h);
@@ -813,7 +813,12 @@ static HRESULT D3D11_CreateSwapChain(SDL_Renderer *renderer, int w, int h)
 #if defined(__WIN32__) || defined(__WINGDK__)
        SDL_SysWMinfo windowinfo;
        SDL_VERSION(&windowinfo.version);
-        SDL_GetWindowWMInfo(renderer->window, &windowinfo);
+        if (!SDL_GetWindowWMInfo(renderer->window, &windowinfo) ||
+            windowinfo.subsystem != SDL_SYSWM_WINDOWS) {
+            SDL_SetError("Couldn't get window handle");
+            result = E_FAIL;
+            goto done;
+        }

        result = IDXGIFactory2_CreateSwapChainForHwnd(data->dxgiFactory,
                                                      (IUnknown *)data->d3dDevice,
@@ -55,7 +55,7 @@ typedef struct
 static int vsync_sema_id = 0;

 /* PRIVATE METHODS */
-static int vsync_handler()
+static int vsync_handler(void)
 {
    iSignalSema(vsync_sema_id);

@@ -4472,7 +4472,7 @@ struct mallinfo dlmallinfo(void) {
 }
 #endif /* NO_MALLINFO */

-void dlmalloc_stats() {
+void dlmalloc_stats(void) {
  internal_malloc_stats(gm);
 }

@@ -65,7 +65,7 @@ void SDL_qsort(void *base, size_t nmemb, size_t size, int (SDLCALL *compare) (co

 /*
 This code came from Gareth McCaughan, under the zlib license.
-Specifically this: https://www.mccaughan.org.uk/software/qsort.c-1.15
+Specifically this: https://www.mccaughan.org.uk/software/qsort.c-1.16

 Everything below this comment until the HAVE_QSORT #endif was from Gareth
 (any minor changes will be noted inline).
@@ -112,7 +112,7 @@ benefit!
 * Gareth McCaughan
 */

-/* Copyright (c) 1998-2016 Gareth McCaughan
+/* Copyright (c) 1998-2021 Gareth McCaughan
 *
 * This software is provided 'as-is', without any express or implied
 * warranty. In no event will the authors be held liable for any
@@ -148,17 +148,23 @@ benefit!
 *                    (pre-insertion-sort messed up).
 *                    Disable DEBUG_QSORT by default.
 *                    Tweak comments very slightly.
+ *   2021-02-20 v1.16 Fix bug kindly reported by Ray Gardner
+ *                    (error in recursion leading to possible
+ *                    stack overflow).
+ *                    When checking alignment, avoid casting
+ *                    pointer to possibly-smaller integer.
 */

 /* BEGIN SDL CHANGE ... commented this out with an #if 0 block. --ryan. */
 #if 0
 #include <assert.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>

 #undef DEBUG_QSORT

-static char _ID[]="<qsort.c gjm 1.15 2016-03-10>";
+static char _ID[]="<qsort.c gjm 1.16 2021-02-20>";
 #endif
 /* END SDL CHANGE ... commented this out with an #if 0 block. --ryan. */

@@ -168,7 +174,8 @@ static char _ID[]="<qsort.c gjm 1.15 2016-03-10>";
 #define WORD_BYTES sizeof(int)

 /* How big does our stack need to be? Answer: one entry per
- * bit in a |size_t|.
+ * bit in a |size_t|. (Actually, a bit less because we don't
+ * recurse all the way down to size-1 subarrays.)
 */
 #define STACK_SIZE (8*sizeof(size_t))

@@ -207,11 +214,12 @@ typedef struct { char * first; char * last; } stack_entry;
 *    on large datasets for locality-of-reference reasons,
 *    but it makes the code much nastier and increases
 *    bookkeeping overhead.
- * 2. We always save the shorter and get to work on the
- *    longer. This guarantees that every time we push
- *    an item onto the stack its size is <= 1/2 of that
- *    of its parent; so the stack can't need more than
- *    log_2(max-array-size) entries.
+ * 2. We always save the longer and get to work on the
+ *    shorter. This guarantees that whenever we push
+ *    a k'th entry onto the stack we are about to get
+ *    working on something of size <= N/2^k where N is
+ *    the original array size; so the stack can't need
+ *    more than log_2(max-array-size) entries.
 * 3. We choose a pivot by looking at the first, last
 *    and middle elements. We arrange them into order
 *    because it's easy to do that in conjunction with
@@ -273,8 +281,8 @@ typedef struct { char * first; char * last; } stack_entry;
          if (r>=Trunc) doRight			\
          else pop				\
        }					\
-        else if (l<=r) { pushLeft; doRight }	\
-        else if (r>=Trunc) { pushRight; doLeft }\
+        else if (l<=r) { pushRight; doLeft }	\
+        else if (r>=Trunc) { pushLeft; doRight }\
        else doLeft				\
      }

@@ -526,7 +534,7 @@ extern void qsortG(void *base, size_t nmemb, size_t size,
           int (SDLCALL * compare)(const void *, const void *)) {

  if (nmemb<=1) return;
-  if (((size_t)base|size)&(WORD_BYTES-1))
+  if (((uintptr_t)base|size)&(WORD_BYTES-1))
    qsort_nonaligned(base,nmemb,size,compare);
  else if (size!=WORD_BYTES)
    qsort_aligned(base,nmemb,size,compare);
@@ -107,7 +107,7 @@ void SDLTest_AssertPass(SDL_PRINTF_FORMAT_STRING const char *assertDescription,
 /*
 * Resets the assert summary counters to zero.
 */
-void SDLTest_ResetAssertSummary()
+void SDLTest_ResetAssertSummary(void)
 {
    SDLTest_AssertsPassed = 0;
    SDLTest_AssertsFailed = 0;
@@ -117,7 +117,7 @@ void SDLTest_ResetAssertSummary()
 * Logs summary of all assertions (total, pass, fail) since last reset
 * as INFO (failed==0) or ERROR (failed > 0).
 */
-void SDLTest_LogAssertSummary()
+void SDLTest_LogAssertSummary(void)
 {
    int totalAsserts = SDLTest_AssertsPassed + SDLTest_AssertsFailed;
    if (SDLTest_AssertsFailed == 0) {
@@ -130,7 +130,7 @@ void SDLTest_LogAssertSummary()
 /*
 * Converts the current assert state into a test result
 */
-int SDLTest_AssertSummaryToTestResult()
+int SDLTest_AssertSummaryToTestResult(void)
 {
    if (SDLTest_AssertsFailed > 0) {
        return TEST_RESULT_FAILED;
@@ -68,54 +68,54 @@ void SDLTest_FuzzerInit(Uint64 execKey)
    fuzzerInvocationCounter = 0;
 }

-int SDLTest_GetFuzzerInvocationCount()
+int SDLTest_GetFuzzerInvocationCount(void)
 {
    return fuzzerInvocationCounter;
 }

-Uint8 SDLTest_RandomUint8()
+Uint8 SDLTest_RandomUint8(void)
 {
    fuzzerInvocationCounter++;

    return (Uint8)SDLTest_RandomInt(&rndContext) & 0x000000FF;
 }

-Sint8 SDLTest_RandomSint8()
+Sint8 SDLTest_RandomSint8(void)
 {
    fuzzerInvocationCounter++;

    return (Sint8)SDLTest_RandomInt(&rndContext) & 0x000000FF;
 }

-Uint16 SDLTest_RandomUint16()
+Uint16 SDLTest_RandomUint16(void)
 {
    fuzzerInvocationCounter++;

    return (Uint16)SDLTest_RandomInt(&rndContext) & 0x0000FFFF;
 }

-Sint16 SDLTest_RandomSint16()
+Sint16 SDLTest_RandomSint16(void)
 {
    fuzzerInvocationCounter++;

    return (Sint16)SDLTest_RandomInt(&rndContext) & 0x0000FFFF;
 }

-Sint32 SDLTest_RandomSint32()
+Sint32 SDLTest_RandomSint32(void)
 {
    fuzzerInvocationCounter++;

    return (Sint32)SDLTest_RandomInt(&rndContext);
 }

-Uint32 SDLTest_RandomUint32()
+Uint32 SDLTest_RandomUint32(void)
 {
    fuzzerInvocationCounter++;

    return (Uint32)SDLTest_RandomInt(&rndContext);
 }

-Uint64 SDLTest_RandomUint64()
+Uint64 SDLTest_RandomUint64(void)
 {
    union
    {
@@ -132,7 +132,7 @@ Uint64 SDLTest_RandomUint64()
    return value.v64;
 }

-Sint64 SDLTest_RandomSint64()
+Sint64 SDLTest_RandomSint64(void)
 {
    union
    {
@@ -425,24 +425,24 @@ Sint64 SDLTest_RandomSint64BoundaryValue(Sint64 boundary1, Sint64 boundary2, SDL
                                                validDomain);
 }

-float SDLTest_RandomUnitFloat()
+float SDLTest_RandomUnitFloat(void)
 {
    return SDLTest_RandomUint32() / (float)UINT_MAX;
 }

-float SDLTest_RandomFloat()
+float SDLTest_RandomFloat(void)
 {
    return (float)(SDLTest_RandomUnitDouble() * 2.0 * (double)FLT_MAX - (double)(FLT_MAX));
 }

 double
-SDLTest_RandomUnitDouble()
+SDLTest_RandomUnitDouble(void)
 {
    return (double)(SDLTest_RandomUint64() >> 11) * (1.0 / 9007199254740992.0);
 }

 double
-SDLTest_RandomDouble()
+SDLTest_RandomDouble(void)
 {
    double r = 0.0;
    double s = 1.0;
@@ -456,7 +456,7 @@ SDLTest_RandomDouble()
    return r;
 }

-char *SDLTest_RandomAsciiString()
+char *SDLTest_RandomAsciiString(void)
 {
    return SDLTest_RandomAsciiStringWithMaximumLength(255);
 }
@@ -339,7 +339,7 @@ static void SDLTest_LogTestSuiteSummary(SDLTest_TestSuiteReference *testSuites)
 #endif

 /* Gets a timer value in seconds */
-static float GetClock()
+static float GetClock(void)
 {
    float currentClock = SDL_GetPerformanceCounter() / (float)SDL_GetPerformanceFrequency();
    return currentClock;
@@ -540,7 +540,7 @@ static const SDLTest_SurfaceImage_t SDLTest_imageBlit = {
 /**
 * \brief Returns the Blit test image as SDL_Surface.
 */
-SDL_Surface *SDLTest_ImageBlit()
+SDL_Surface *SDLTest_ImageBlit(void)
 {
    SDL_Surface *surface = SDL_CreateRGBSurfaceWithFormatFrom(
        (void *)SDLTest_imageBlit.pixel_data,
@@ -1014,7 +1014,7 @@ static const SDLTest_SurfaceImage_t SDLTest_imageBlitColor = {
 /**
 * \brief Returns the BlitColor test image as SDL_Surface.
 */
-SDL_Surface *SDLTest_ImageBlitColor()
+SDL_Surface *SDLTest_ImageBlitColor(void)
 {
    SDL_Surface *surface = SDL_CreateRGBSurfaceWithFormatFrom(
        (void *)SDLTest_imageBlitColor.pixel_data,
@@ -1651,7 +1651,7 @@ static const SDLTest_SurfaceImage_t SDLTest_imageBlitAlpha = {
 /**
 * \brief Returns the BlitAlpha test image as SDL_Surface.
 */
-SDL_Surface *SDLTest_ImageBlitAlpha()
+SDL_Surface *SDLTest_ImageBlitAlpha(void)
 {
    SDL_Surface *surface = SDL_CreateRGBSurfaceWithFormatFrom(
        (void *)SDLTest_imageBlitAlpha.pixel_data,
@@ -580,7 +580,7 @@ static const SDLTest_SurfaceImage_t SDLTest_imageBlitBlendAdd = {
 /**
 * \brief Returns the BlitBlendAdd test image as SDL_Surface.
 */
-SDL_Surface *SDLTest_ImageBlitBlendAdd()
+SDL_Surface *SDLTest_ImageBlitBlendAdd(void)
 {
    SDL_Surface *surface = SDL_CreateRGBSurfaceWithFormatFrom(
        (void *)SDLTest_imageBlitBlendAdd.pixel_data,
@@ -1171,7 +1171,7 @@ static const SDLTest_SurfaceImage_t SDLTest_imageBlitBlend = {
 /**
 * \brief Returns the BlitBlend test image as SDL_Surface.
 */
-SDL_Surface *SDLTest_ImageBlitBlend()
+SDL_Surface *SDLTest_ImageBlitBlend(void)
 {
    SDL_Surface *surface = SDL_CreateRGBSurfaceWithFormatFrom(
        (void *)SDLTest_imageBlitBlend.pixel_data,
@@ -1592,7 +1592,7 @@ static const SDLTest_SurfaceImage_t SDLTest_imageBlitBlendMod = {
 /**
 * \brief Returns the BlitBlendMod test image as SDL_Surface.
 */
-SDL_Surface *SDLTest_ImageBlitBlendMod()
+SDL_Surface *SDLTest_ImageBlitBlendMod(void)
 {
    SDL_Surface *surface = SDL_CreateRGBSurfaceWithFormatFrom(
        (void *)SDLTest_imageBlitBlendMod.pixel_data,
@@ -2396,7 +2396,7 @@ static const SDLTest_SurfaceImage_t SDLTest_imageBlitBlendNone = {
 /**
 * \brief Returns the BlitBlendNone test image as SDL_Surface.
 */
-SDL_Surface *SDLTest_ImageBlitBlendNone()
+SDL_Surface *SDLTest_ImageBlitBlendNone(void)
 {
    SDL_Surface *surface = SDL_CreateRGBSurfaceWithFormatFrom(
        (void *)SDLTest_imageBlitBlendNone.pixel_data,
@@ -2932,7 +2932,7 @@ static const SDLTest_SurfaceImage_t SDLTest_imageBlitBlendAll = {
 /**
 * \brief Returns the BlitBlendAll test image as SDL_Surface.
 */
-SDL_Surface *SDLTest_ImageBlitBlendAll()
+SDL_Surface *SDLTest_ImageBlitBlendAll(void)
 {
    SDL_Surface *surface = SDL_CreateRGBSurfaceWithFormatFrom(
        (void *)SDLTest_imageBlitBlendAll.pixel_data,
@@ -223,7 +223,7 @@ static const SDLTest_SurfaceImage_t SDLTest_imageFace = {
 /**
 * \brief Returns the Face test image as SDL_Surface.
 */
-SDL_Surface *SDLTest_ImageFace()
+SDL_Surface *SDLTest_ImageFace(void)
 {
    SDL_Surface *surface = SDL_CreateRGBSurfaceWithFormatFrom(
        (void *)SDLTest_imageFace.pixel_data,
@@ -504,7 +504,7 @@ static const SDLTest_SurfaceImage_t SDLTest_imagePrimitives = {
 /**
 * \brief Returns the Primitives test image as SDL_Surface.
 */
-SDL_Surface *SDLTest_ImagePrimitives()
+SDL_Surface *SDLTest_ImagePrimitives(void)
 {
    SDL_Surface *surface = SDL_CreateRGBSurfaceWithFormatFrom(
        (void *)SDLTest_imagePrimitives.pixel_data,
@@ -677,7 +677,7 @@ static const SDLTest_SurfaceImage_t SDLTest_imagePrimitivesBlend = {
 /**
 * \brief Returns the PrimitivesBlend test image as SDL_Surface.
 */
-SDL_Surface *SDLTest_ImagePrimitivesBlend()
+SDL_Surface *SDLTest_ImagePrimitivesBlend(void)
 {
    SDL_Surface *surface = SDL_CreateRGBSurfaceWithFormatFrom(
        (void *)SDLTest_imagePrimitivesBlend.pixel_data,
@@ -195,7 +195,7 @@ static void SDLCALL SDLTest_TrackedFree(void *ptr)
    SDL_free_orig(ptr);
 }

-int SDLTest_TrackAllocations()
+int SDLTest_TrackAllocations(void)
 {
    if (SDL_malloc_orig) {
        return 0;
@@ -220,7 +220,7 @@ int SDLTest_TrackAllocations()
    return 0;
 }

-void SDLTest_LogAllocations()
+void SDLTest_LogAllocations(void)
 {
    char *message = NULL;
    size_t message_size = 0;
@@ -59,12 +59,18 @@ extern void SDL_SYS_WaitThread(SDL_Thread *thread);
 /* Mark thread as cleaned up as soon as it exits, without joining. */
 extern void SDL_SYS_DetachThread(SDL_Thread *thread);

+/* Initialize the global TLS data */
+extern void SDL_SYS_InitTLSData(void);
+
 /* Get the thread local storage for this thread */
 extern SDL_TLSData *SDL_SYS_GetTLSData(void);

 /* Set the thread local storage for this thread */
 extern int SDL_SYS_SetTLSData(SDL_TLSData *data);

+/* Quit the global TLS data */
+extern void SDL_SYS_QuitTLSData(void);
+
 /* This is for internal SDL use, so we don't need #ifdefs everywhere. */
 extern SDL_Thread *
 SDL_CreateThreadInternal(int(SDLCALL *fn)(void *), const char *name,
@@ -28,6 +28,15 @@
 #include "SDL_hints.h"
 #include "../SDL_error_c.h"

+/* The storage is local to the thread, but the IDs are global for the process */
+
+static SDL_atomic_t SDL_tls_allocated;
+
+void SDL_InitTLSData(void)
+{
+    SDL_SYS_InitTLSData();
+}
+
 SDL_TLSID SDL_TLSCreate(void)
 {
    static SDL_atomic_t SDL_tls_id;
@@ -53,6 +62,13 @@ int SDL_TLSSet(SDL_TLSID id, const void *value, void(SDLCALL *destructor)(void *
        return SDL_InvalidParamError("id");
    }

+    /* Make sure TLS is initialized.
+     * There's a race condition here if you are calling this from non-SDL threads
+     * and haven't called SDL_Init() on your main thread, but such is life.
+     */
+    SDL_InitTLSData();
+
+    /* Get the storage for the current thread */
    storage = SDL_SYS_GetTLSData();
    if (!storage || (id > storage->limit)) {
        unsigned int i, oldlimit, newlimit;
@@ -69,8 +85,10 @@ int SDL_TLSSet(SDL_TLSID id, const void *value, void(SDLCALL *destructor)(void *
            storage->array[i].destructor = NULL;
        }
        if (SDL_SYS_SetTLSData(storage) != 0) {
+            SDL_free(storage);
            return -1;
        }
+        SDL_AtomicIncRef(&SDL_tls_allocated);
    }

    storage->array[id - 1].data = SDL_const_cast(void *, value);
@@ -82,6 +100,7 @@ void SDL_TLSCleanup(void)
 {
    SDL_TLSData *storage;

+    /* Cleanup the storage for the current thread */
    storage = SDL_SYS_GetTLSData();
    if (storage) {
        unsigned int i;
@@ -92,6 +111,18 @@ void SDL_TLSCleanup(void)
        }
        SDL_SYS_SetTLSData(NULL);
        SDL_free(storage);
+        (void)SDL_AtomicDecRef(&SDL_tls_allocated);
+    }
+}
+
+void SDL_QuitTLSData(void)
+{
+    SDL_TLSCleanup();
+
+    if (SDL_AtomicGet(&SDL_tls_allocated) == 0) {
+        SDL_SYS_QuitTLSData();
+    } else {
+        /* Some thread hasn't called SDL_CleanupTLS() */
    }
 }

@@ -113,40 +144,27 @@ typedef struct SDL_TLSEntry
 static SDL_mutex *SDL_generic_TLS_mutex;
 static SDL_TLSEntry *SDL_generic_TLS;

+void SDL_Generic_InitTLSData(void)
+{
+    if (!SDL_generic_TLS_mutex) {
+        SDL_generic_TLS_mutex = SDL_CreateMutex();
+    }
+}
+
 SDL_TLSData *SDL_Generic_GetTLSData(void)
 {
    SDL_threadID thread = SDL_ThreadID();
    SDL_TLSEntry *entry;
    SDL_TLSData *storage = NULL;

-#ifndef SDL_THREADS_DISABLED
-    if (!SDL_generic_TLS_mutex) {
-        static SDL_SpinLock tls_lock;
-        SDL_AtomicLock(&tls_lock);
-        if (!SDL_generic_TLS_mutex) {
-            SDL_mutex *mutex = SDL_CreateMutex();
-            SDL_MemoryBarrierRelease();
-            SDL_generic_TLS_mutex = mutex;
-            if (!SDL_generic_TLS_mutex) {
-                SDL_AtomicUnlock(&tls_lock);
-                return NULL;
-            }
-        }
-        SDL_AtomicUnlock(&tls_lock);
-    }
-    SDL_MemoryBarrierAcquire();
    SDL_LockMutex(SDL_generic_TLS_mutex);
-#endif /* SDL_THREADS_DISABLED */
-
    for (entry = SDL_generic_TLS; entry; entry = entry->next) {
        if (entry->thread == thread) {
            storage = entry->storage;
            break;
        }
    }
-#ifndef SDL_THREADS_DISABLED
    SDL_UnlockMutex(SDL_generic_TLS_mutex);
-#endif

    return storage;
 }
@@ -155,8 +173,8 @@ int SDL_Generic_SetTLSData(SDL_TLSData *data)
 {
    SDL_threadID thread = SDL_ThreadID();
    SDL_TLSEntry *prev, *entry;
+    int retval = 0;

-    /* SDL_Generic_GetTLSData() is always called first, so we can assume SDL_generic_TLS_mutex */
    SDL_LockMutex(SDL_generic_TLS_mutex);
    prev = NULL;
    for (entry = SDL_generic_TLS; entry; entry = entry->next) {
@@ -175,21 +193,44 @@ int SDL_Generic_SetTLSData(SDL_TLSData *data)
        }
        prev = entry;
    }
-    if (!entry) {
+    if (!entry && data) {
        entry = (SDL_TLSEntry *)SDL_malloc(sizeof(*entry));
        if (entry) {
            entry->thread = thread;
            entry->storage = data;
            entry->next = SDL_generic_TLS;
            SDL_generic_TLS = entry;
+        } else {
+            retval = SDL_OutOfMemory();
        }
    }
    SDL_UnlockMutex(SDL_generic_TLS_mutex);

-    if (!entry) {
-        return SDL_OutOfMemory();
+    return retval;
+}
+
+void SDL_Generic_QuitTLSData(void)
+{
+    SDL_TLSEntry *entry;
+
+    /* This should have been cleaned up by the time we get here */
+    SDL_assert(!SDL_generic_TLS);
+    if (SDL_generic_TLS) {
+        SDL_LockMutex(SDL_generic_TLS_mutex);
+        for (entry = SDL_generic_TLS; entry; ) {
+            SDL_TLSEntry *next = entry->next;
+            SDL_free(entry->storage);
+            SDL_free(entry);
+            entry = next;
+        }
+        SDL_generic_TLS = NULL;
+        SDL_UnlockMutex(SDL_generic_TLS_mutex);
+    }
+
+    if (SDL_generic_TLS_mutex) {
+        SDL_DestroyMutex(SDL_generic_TLS_mutex);
+        SDL_generic_TLS_mutex = NULL;
    }
-    return 0;
 }

 /* Non-thread-safe global error variable */
@@ -328,6 +369,8 @@ SDL_Thread *SDL_CreateThreadWithStackSize(int(SDLCALL *fn)(void *),
    SDL_Thread *thread;
    int ret;

+    SDL_InitMainThread();
+
    /* Allocate memory for the thread info structure */
    thread = (SDL_Thread *)SDL_calloc(1, sizeof(*thread));
    if (!thread) {
@@ -93,17 +93,17 @@ typedef struct
 /* This is how many TLS entries we allocate at once */
 #define TLS_ALLOC_CHUNKSIZE 4

-/* Get cross-platform, slow, thread local storage for this thread.
-   This is only intended as a fallback if getting real thread-local
-   storage fails or isn't supported on this platform.
- */
-extern SDL_TLSData *SDL_Generic_GetTLSData(void);
+extern void SDL_InitTLSData(void);
+extern void SDL_QuitTLSData(void);

-/* Set cross-platform, slow, thread local storage for this thread.
+/* Generic TLS support.
   This is only intended as a fallback if getting real thread-local
   storage fails or isn't supported on this platform.
 */
+extern void SDL_Generic_InitTLSData(void);
+extern SDL_TLSData *SDL_Generic_GetTLSData(void);
 extern int SDL_Generic_SetTLSData(SDL_TLSData *data);
+extern void SDL_Generic_QuitTLSData(void);

 #endif /* SDL_thread_c_h_ */

@@ -22,6 +22,11 @@
 #include "../../SDL_internal.h"
 #include "../SDL_thread_c.h"

+void SDL_SYS_InitTLSData(void)
+{
+    SDL_Generic_InitTLSData();
+}
+
 SDL_TLSData *SDL_SYS_GetTLSData(void)
 {
    return SDL_Generic_GetTLSData();
@@ -32,4 +37,9 @@ int SDL_SYS_SetTLSData(SDL_TLSData *data)
    return SDL_Generic_SetTLSData(data);
 }

+void SDL_SYS_QuitTLSData(void)
+{
+    SDL_Generic_QuitTLSData();
+}
+
 /* vi: set ts=4 sw=4 expandtab: */
@@ -34,45 +34,22 @@

 SDL_TLSData **ppSDLTLSData = NULL;

-static ULONG  cTLSAlloc = 0;
-
-/* SDL_OS2TLSAlloc() called from SDL_InitSubSystem() */
-void SDL_OS2TLSAlloc(void)
+void SDL_SYS_InitTLSData(void)
 {
    ULONG ulRC;

-    if (cTLSAlloc == 0 || !ppSDLTLSData) {
-        /* First call - allocate the thread local memory (1 DWORD) */
+    if (!ppSDLTLSData) {
+        /* Allocate the thread local memory (1 DWORD) */
        ulRC = DosAllocThreadLocalMemory(1, (PULONG *)&ppSDLTLSData);
        if (ulRC != NO_ERROR) {
            debug_os2("DosAllocThreadLocalMemory() failed, rc = %u", ulRC);
        }
    }
-    cTLSAlloc++;
-}
-
-/* SDL_OS2TLSFree() called from SDL_QuitSubSystem() */
-void SDL_OS2TLSFree(void)
-{
-    ULONG ulRC;
-
-    if (cTLSAlloc != 0)
-        cTLSAlloc--;
-
-    if (cTLSAlloc == 0 && ppSDLTLSData) {
-        /* Last call - free the thread local memory */
-        ulRC = DosFreeThreadLocalMemory((PULONG)ppSDLTLSData);
-        if (ulRC != NO_ERROR) {
-            debug_os2("DosFreeThreadLocalMemory() failed, rc = %u", ulRC);
-        } else {
-            ppSDLTLSData = NULL;
-        }
-    }
 }

 SDL_TLSData *SDL_SYS_GetTLSData(void)
 {
-    return (!ppSDLTLSData)? NULL : *ppSDLTLSData;
+    return ppSDLTLSData ? *ppSDLTLSData : NULL;
 }

 int SDL_SYS_SetTLSData(SDL_TLSData *data)
@@ -84,6 +61,21 @@ int SDL_SYS_SetTLSData(SDL_TLSData *data)
    return 0;
 }

+void SDL_SYS_QuitTLSData(void)
+{
+    ULONG ulRC;
+
+    if (ppSDLTLSData) {
+        /* Free the thread local memory */
+        ulRC = DosFreeThreadLocalMemory((PULONG)ppSDLTLSData);
+        if (ulRC != NO_ERROR) {
+            debug_os2("DosFreeThreadLocalMemory() failed, rc = %u", ulRC);
+        } else {
+            ppSDLTLSData = NULL;
+        }
+    }
+}
+
 #endif /* SDL_THREAD_OS2 */

 /* vi: set ts=4 sw=4 expandtab: */
@@ -27,12 +27,4 @@

 extern SDL_TLSData **ppSDLTLSData;

-/* SDL_OS2TLSAlloc() called from SDL_InitSubSystem() */
-void SDL_OS2TLSAlloc(void);
-
-/* SDL_OS2TLSFree() called from SDL_QuitSubSystem() */
-void SDL_OS2TLSFree(void);
-
 #endif /* SDL_THREAD_OS2 */
-
-/* vi: set ts=4 sw=4 expandtab: */
@@ -114,7 +114,7 @@ int SDL_CondWaitTimeout(SDL_cond *cond, SDL_mutex *mutex, Uint32 ms)
    abstime.tv_sec = delta.tv_sec + (ms / 1000);
    abstime.tv_nsec = (long)(delta.tv_usec + (ms % 1000) * 1000) * 1000;
 #endif
-    if (abstime.tv_nsec > 1000000000) {
+    if (abstime.tv_nsec >= 1000000000) {
        abstime.tv_sec += 1;
        abstime.tv_nsec -= 1000000000;
    }
@@ -141,7 +141,7 @@ int SDL_SemWaitTimeout(SDL_sem *sem, Uint32 timeout)
 #endif

    /* Wrap the second if needed */
-    if (ts_timeout.tv_nsec > 1000000000) {
+    if (ts_timeout.tv_nsec >= 1000000000) {
        ts_timeout.tv_sec += 1;
        ts_timeout.tv_nsec -= 1000000000;
    }
@@ -30,27 +30,27 @@
 static pthread_key_t thread_local_storage = INVALID_PTHREAD_KEY;
 static SDL_bool generic_local_storage = SDL_FALSE;

-SDL_TLSData *SDL_SYS_GetTLSData(void)
+void SDL_SYS_InitTLSData(void)
 {
    if (thread_local_storage == INVALID_PTHREAD_KEY && !generic_local_storage) {
-        static SDL_SpinLock lock;
-        SDL_AtomicLock(&lock);
-        if (thread_local_storage == INVALID_PTHREAD_KEY && !generic_local_storage) {
-            pthread_key_t storage;
-            if (pthread_key_create(&storage, NULL) == 0) {
-                SDL_MemoryBarrierRelease();
-                thread_local_storage = storage;
-            } else {
-                generic_local_storage = SDL_TRUE;
-            }
+        if (pthread_key_create(&thread_local_storage, NULL) != 0) {
+            thread_local_storage = INVALID_PTHREAD_KEY;
+            SDL_Generic_InitTLSData();
+            generic_local_storage = SDL_TRUE;
        }
-        SDL_AtomicUnlock(&lock);
    }
+}
+
+SDL_TLSData *SDL_SYS_GetTLSData(void)
+{
    if (generic_local_storage) {
        return SDL_Generic_GetTLSData();
    }
-    SDL_MemoryBarrierAcquire();
-    return (SDL_TLSData *)pthread_getspecific(thread_local_storage);
+
+    if (thread_local_storage != INVALID_PTHREAD_KEY) {
+        return (SDL_TLSData *)pthread_getspecific(thread_local_storage);
+    }
+    return NULL;
 }

 int SDL_SYS_SetTLSData(SDL_TLSData *data)
@@ -58,10 +58,24 @@ int SDL_SYS_SetTLSData(SDL_TLSData *data)
    if (generic_local_storage) {
        return SDL_Generic_SetTLSData(data);
    }
+
    if (pthread_setspecific(thread_local_storage, data) != 0) {
        return SDL_SetError("pthread_setspecific() failed");
    }
    return 0;
 }

+void SDL_SYS_QuitTLSData(void)
+{
+    if (generic_local_storage) {
+        SDL_Generic_QuitTLSData();
+        generic_local_storage = SDL_FALSE;
+    } else {
+        if (thread_local_storage != INVALID_PTHREAD_KEY) {
+            pthread_key_delete(thread_local_storage);
+            thread_local_storage = INVALID_PTHREAD_KEY;
+        }
+    }
+}
+
 /* vi: set ts=4 sw=4 expandtab: */
@@ -120,8 +120,12 @@ SDL_SYS_WaitThread(SDL_Thread *thread)

    try {
        std::thread *cpp_thread = (std::thread *)thread->handle;
-        if (cpp_thread->joinable()) {
-            cpp_thread->join();
+        if (cpp_thread) {
+            if (cpp_thread->joinable()) {
+                cpp_thread->join();
+            }
+            delete cpp_thread;
+            thread->handle = nullptr;
        }
    } catch (std::system_error &) {
        // An error occurred when joining the thread.  SDL_WaitThread does not,
@@ -139,8 +143,12 @@ SDL_SYS_DetachThread(SDL_Thread *thread)

    try {
        std::thread *cpp_thread = (std::thread *)thread->handle;
-        if (cpp_thread->joinable()) {
-            cpp_thread->detach();
+        if (cpp_thread) {
+            if (cpp_thread->joinable()) {
+                cpp_thread->detach();
+            }
+            delete cpp_thread;
+            thread->handle = nullptr;
        }
    } catch (std::system_error &) {
        // An error occurred when detaching the thread.  SDL_DetachThread does not,
@@ -149,16 +157,29 @@ SDL_SYS_DetachThread(SDL_Thread *thread)
    }
 }

-extern "C" SDL_TLSData *
-SDL_SYS_GetTLSData(void)
+static thread_local SDL_TLSData *thread_local_storage;
+
+extern "C"
+void SDL_SYS_InitTLSData(void)
 {
-    return SDL_Generic_GetTLSData();
 }

-extern "C" int
-SDL_SYS_SetTLSData(SDL_TLSData *data)
+extern "C"
+SDL_TLSData * SDL_SYS_GetTLSData(void)
+{
+    return thread_local_storage;
+}
+
+extern "C"
+int SDL_SYS_SetTLSData(SDL_TLSData *data)
+{
+    thread_local_storage = data;
+    return 0;
+}
+
+extern "C"
+void SDL_SYS_QuitTLSData(void)
 {
-    return SDL_Generic_SetTLSData(data);
 }

 /* vi: set ts=4 sw=4 expandtab: */
@@ -43,27 +43,27 @@
 static DWORD thread_local_storage = TLS_OUT_OF_INDEXES;
 static SDL_bool generic_local_storage = SDL_FALSE;

-SDL_TLSData *SDL_SYS_GetTLSData(void)
+void SDL_SYS_InitTLSData(void)
 {
    if (thread_local_storage == TLS_OUT_OF_INDEXES && !generic_local_storage) {
-        static SDL_SpinLock lock;
-        SDL_AtomicLock(&lock);
-        if (thread_local_storage == TLS_OUT_OF_INDEXES && !generic_local_storage) {
-            DWORD storage = TlsAlloc();
-            if (storage != TLS_OUT_OF_INDEXES) {
-                SDL_MemoryBarrierRelease();
-                thread_local_storage = storage;
-            } else {
-                generic_local_storage = SDL_TRUE;
-            }
+        thread_local_storage = TlsAlloc();
+        if (thread_local_storage == TLS_OUT_OF_INDEXES) {
+            SDL_Generic_InitTLSData();
+            generic_local_storage = SDL_TRUE;
        }
-        SDL_AtomicUnlock(&lock);
    }
+}
+
+SDL_TLSData *SDL_SYS_GetTLSData(void)
+{
    if (generic_local_storage) {
        return SDL_Generic_GetTLSData();
    }
-    SDL_MemoryBarrierAcquire();
-    return (SDL_TLSData *)TlsGetValue(thread_local_storage);
+
+    if (thread_local_storage != TLS_OUT_OF_INDEXES) {
+        return (SDL_TLSData *)TlsGetValue(thread_local_storage);
+    }
+    return NULL;
 }

 int SDL_SYS_SetTLSData(SDL_TLSData *data)
@@ -71,12 +71,26 @@ int SDL_SYS_SetTLSData(SDL_TLSData *data)
    if (generic_local_storage) {
        return SDL_Generic_SetTLSData(data);
    }
+
    if (!TlsSetValue(thread_local_storage, data)) {
-        return SDL_SetError("TlsSetValue() failed");
+        return WIN_SetError("TlsSetValue()");
    }
    return 0;
 }

+void SDL_SYS_QuitTLSData(void)
+{
+    if (generic_local_storage) {
+        SDL_Generic_QuitTLSData();
+        generic_local_storage = SDL_FALSE;
+    } else {
+        if (thread_local_storage != TLS_OUT_OF_INDEXES) {
+            TlsFree(thread_local_storage);
+            thread_local_storage = TLS_OUT_OF_INDEXES;
+        }
+    }
+}
+
 #endif /* SDL_THREAD_WINDOWS */

 /* vi: set ts=4 sw=4 expandtab: */
@@ -103,7 +103,7 @@ static int SDLCALL SDL_SoftBlit(SDL_Surface *src, SDL_Rect *srcrect,
 #ifdef __MACOSX__
 #include <sys/sysctl.h>

-static SDL_bool SDL_UseAltivecPrefetch()
+static SDL_bool SDL_UseAltivecPrefetch(void)
 {
    const char key[] = "hw.l3cachesize";
    u_int64_t result = 0;
@@ -367,7 +367,7 @@ static void printf_128(const char *str, __m128i var)
 }
 #endif

-static SDL_INLINE int hasSSE2()
+static SDL_INLINE int hasSSE2(void)
 {
    static int val = -1;
    if (val != -1) {
@@ -227,26 +227,37 @@ static int SDL_CreateWindowTexture(SDL_VideoDevice *_this, SDL_Window *window, U

    if (!data) {
        SDL_Renderer *renderer = NULL;
-        const char *hint = SDL_GetHint(SDL_HINT_FRAMEBUFFER_ACCELERATION);
-        const SDL_bool specific_accelerated_renderer = (hint && *hint != '0' && *hint != '1' &&
-                                                        SDL_strcasecmp(hint, "true") != 0 &&
-                                                        SDL_strcasecmp(hint, "false") != 0 &&
-                                                        SDL_strcasecmp(hint, "software") != 0);
+        const char *render_driver = NULL;
+        const char *hint;
+
+        /* See if there's a render driver being requested */
+        hint = SDL_GetHint(SDL_HINT_FRAMEBUFFER_ACCELERATION);
+        if (hint && *hint != '0' && *hint != '1' &&
+            SDL_strcasecmp(hint, "true") != 0 &&
+            SDL_strcasecmp(hint, "false") != 0 &&
+            SDL_strcasecmp(hint, "software") != 0) {
+            render_driver = hint;
+        }
+
+        if (!render_driver) {
+            hint = SDL_GetHint(SDL_HINT_RENDER_DRIVER);
+            if (hint && *hint && SDL_strcasecmp(hint, "software") != 0) {
+                render_driver = hint;
+            }
+        }

        /* Check to see if there's a specific driver requested */
-        if (specific_accelerated_renderer) {
+        if (render_driver) {
            for (i = 0; i < SDL_GetNumRenderDrivers(); ++i) {
                SDL_GetRenderDriverInfo(i, &info);
-                if (SDL_strcasecmp(info.name, hint) == 0) {
+                if (SDL_strcasecmp(info.name, render_driver) == 0) {
                    renderer = SDL_CreateRenderer(window, i, 0);
                    break;
                }
            }
-            if (!renderer || (SDL_GetRendererInfo(renderer, &info) == -1)) {
-                if (renderer) {
-                    SDL_DestroyRenderer(renderer);
-                }
-                return SDL_SetError("Requested renderer for " SDL_HINT_FRAMEBUFFER_ACCELERATION " is not available");
+            if (!renderer) {
+                /* The error for this specific renderer has already been set */
+                return -1;
            }
            /* if it was specifically requested, even if SDL_RENDERER_ACCELERATED isn't set, we'll accept this renderer. */
        } else {
@@ -672,9 +683,9 @@ void SDL_DelVideoDisplay(int index)

    SDL_SendDisplayEvent(&_this->displays[index], SDL_DISPLAYEVENT_DISCONNECTED, 0);

+    SDL_free(_this->displays[index].driverdata);
+    SDL_free(_this->displays[index].name);
    if (index < (_this->num_displays - 1)) {
-        SDL_free(_this->displays[index].driverdata);
-        SDL_free(_this->displays[index].name);
        SDL_memmove(&_this->displays[index], &_this->displays[index + 1], (_this->num_displays - index - 1) * sizeof(_this->displays[index]));
    }
    --_this->num_displays;
@@ -1941,12 +1952,6 @@ int SDL_RecreateWindow(SDL_Window *window, Uint32 flags)
    /* Tear down the old native window */
    SDL_DestroyWindowSurface(window);

-    if (_this->checked_texture_framebuffer) { /* never checked? No framebuffer to destroy. Don't risk calling the wrong implementation. */
-        if (_this->DestroyWindowFramebuffer) {
-            _this->DestroyWindowFramebuffer(_this, window);
-        }
-    }
-
    if (_this->DestroyWindow && !(flags & SDL_WINDOW_FOREIGN)) {
        _this->DestroyWindow(_this, window);
    }
@@ -2645,6 +2650,47 @@ int SDL_SetWindowFullscreen(SDL_Window *window, Uint32 flags)
    return -1;
 }

+static SDL_bool ShouldAttemptTextureFramebuffer(void)
+{
+    const char *hint;
+    SDL_bool attempt_texture_framebuffer = SDL_TRUE;
+
+    /* The dummy driver never has GPU support, of course. */
+    if (_this->is_dummy) {
+        return SDL_FALSE;
+    }
+
+    /* See if there's a hint override */
+    hint = SDL_GetHint(SDL_HINT_FRAMEBUFFER_ACCELERATION);
+    if (hint && *hint) {
+        if (*hint == '0' || SDL_strcasecmp(hint, "false") == 0 || SDL_strcasecmp(hint, "software") == 0) {
+            attempt_texture_framebuffer = SDL_FALSE;
+        } else {
+            attempt_texture_framebuffer = SDL_TRUE;
+        }
+    } else {
+        /* Check for platform specific defaults */
+#if defined(__LINUX__)
+        /* On WSL, direct X11 is faster than using OpenGL for window framebuffers, so try to detect WSL and avoid texture framebuffer. */
+        if ((_this->CreateWindowFramebuffer) && (SDL_strcmp(_this->name, "x11") == 0)) {
+            struct stat sb;
+            if ((stat("/proc/sys/fs/binfmt_misc/WSLInterop", &sb) == 0) || (stat("/run/WSL", &sb) == 0)) { /* if either of these exist, we're on WSL. */
+                attempt_texture_framebuffer = SDL_FALSE;
+            }
+        }
+#endif
+#if defined(__WIN32__) || defined(__WINGDK__) /* GDI BitBlt() is way faster than Direct3D dynamic textures right now. (!!! FIXME: is this still true?) */
+        if (_this->CreateWindowFramebuffer && (SDL_strcmp(_this->name, "windows") == 0)) {
+            attempt_texture_framebuffer = SDL_FALSE;
+        }
+#endif
+#if defined(__EMSCRIPTEN__)
+        attempt_texture_framebuffer = SDL_FALSE;
+#endif
+    }
+    return attempt_texture_framebuffer;
+}
+
 static SDL_Surface *SDL_CreateWindowFramebuffer(SDL_Window *window)
 {
    Uint32 format = 0;
@@ -2661,42 +2707,8 @@ static SDL_Surface *SDL_CreateWindowFramebuffer(SDL_Window *window)
       using a GPU texture through the 2D render API, if we think this would
       be more efficient. This only checks once, on demand. */
    if (!_this->checked_texture_framebuffer) {
-        SDL_bool attempt_texture_framebuffer = SDL_TRUE;
-
-        /* See if the user or application wants to specifically disable the framebuffer */
-        const char *hint = SDL_GetHint(SDL_HINT_FRAMEBUFFER_ACCELERATION);
-        if (hint) {
-            if ((*hint == '0') || (SDL_strcasecmp(hint, "false") == 0) || (SDL_strcasecmp(hint, "software") == 0)) {
-                attempt_texture_framebuffer = SDL_FALSE;
-            }
-        }
-
-        if (_this->is_dummy) { /* dummy driver never has GPU support, of course. */
-            attempt_texture_framebuffer = SDL_FALSE;
-        }
-
-#if defined(__LINUX__)
-        /* On WSL, direct X11 is faster than using OpenGL for window framebuffers, so try to detect WSL and avoid texture framebuffer. */
-        else if ((_this->CreateWindowFramebuffer) && (SDL_strcmp(_this->name, "x11") == 0)) {
-            struct stat sb;
-            if ((stat("/proc/sys/fs/binfmt_misc/WSLInterop", &sb) == 0) || (stat("/run/WSL", &sb) == 0)) { /* if either of these exist, we're on WSL. */
-                attempt_texture_framebuffer = SDL_FALSE;
-            }
-        }
-#endif
-#if defined(__WIN32__) || defined(__WINGDK__) /* GDI BitBlt() is way faster than Direct3D dynamic textures right now. (!!! FIXME: is this still true?) */
-        else if ((_this->CreateWindowFramebuffer) && (SDL_strcmp(_this->name, "windows") == 0)) {
-            attempt_texture_framebuffer = SDL_FALSE;
-        }
-#endif
-#if defined(__EMSCRIPTEN__)
-        else {
-            attempt_texture_framebuffer = SDL_FALSE;
-        }
-#endif
-
-        if (attempt_texture_framebuffer) {
-            if (SDL_CreateWindowTexture(_this, window, &format, &pixels, &pitch) == -1) {
+        if (ShouldAttemptTextureFramebuffer()) {
+            if (SDL_CreateWindowTexture(_this, window, &format, &pixels, &pitch) < 0) {
                /* !!! FIXME: if this failed halfway (made renderer, failed to make texture, etc),
                   !!! FIXME:  we probably need to clean this up so it doesn't interfere with
                   !!! FIXME:  a software fallback at the system level (can we blit to an
@@ -2718,6 +2730,7 @@ static SDL_Surface *SDL_CreateWindowFramebuffer(SDL_Window *window)

    if (!created_framebuffer) {
        if (!_this->CreateWindowFramebuffer || !_this->UpdateWindowFramebuffer) {
+            SDL_SetError("Window framebuffer support not available");
            return NULL;
        }

@@ -2727,6 +2740,7 @@ static SDL_Surface *SDL_CreateWindowFramebuffer(SDL_Window *window)
    }

    if (window->surface) {
+        /* We may have gone recursive and already created the surface */
        return window->surface;
    }

@@ -2749,7 +2763,12 @@ SDL_Surface *SDL_GetWindowSurface(SDL_Window *window)
    CHECK_WINDOW_MAGIC(window, NULL);

    if (!window->surface_valid) {
-        SDL_DestroyWindowSurface(window);
+        if (window->surface) {
+            window->surface->flags &= ~SDL_DONTFREE;
+            SDL_FreeSurface(window->surface);
+            window->surface = NULL;
+        }
+
        window->surface = SDL_CreateWindowFramebuffer(window);
        if (window->surface) {
            window->surface_valid = SDL_TRUE;
@@ -2786,6 +2805,25 @@ int SDL_UpdateWindowSurfaceRects(SDL_Window *window, const SDL_Rect *rects,
    return _this->UpdateWindowFramebuffer(_this, window, rects, numrects);
 }

+int SDL_DestroyWindowSurface(SDL_Window *window)
+{
+    CHECK_WINDOW_MAGIC(window, -1);
+
+    if (window->surface) {
+        window->surface->flags &= ~SDL_DONTFREE;
+        SDL_FreeSurface(window->surface);
+        window->surface = NULL;
+        window->surface_valid = SDL_FALSE;
+    }
+
+    if (_this->checked_texture_framebuffer) { /* never checked? No framebuffer to destroy. Don't risk calling the wrong implementation. */
+        if (_this->DestroyWindowFramebuffer) {
+            _this->DestroyWindowFramebuffer(_this, window);
+        }
+    }
+    return 0;
+}
+
 int SDL_SetWindowBrightness(SDL_Window * window, float brightness)
 {
    Uint16 ramp[256];
@@ -2831,19 +2869,6 @@ int SDL_SetWindowOpacity(SDL_Window * window, float opacity)
    return retval;
 }

-int SDL_DestroyWindowSurface(SDL_Window *window)
-{
-    CHECK_WINDOW_MAGIC(window, -1);
-
-    if (window->surface) {
-        window->surface->flags &= ~SDL_DONTFREE;
-        SDL_FreeSurface(window->surface);
-        window->surface = NULL;
-        window->surface_valid = SDL_FALSE;
-    }
-    return 0;
-}
-
 int SDL_GetWindowOpacity(SDL_Window *window, float *out_opacity)
 {
    CHECK_WINDOW_MAGIC(window, -1);
@@ -3282,19 +3307,15 @@ void SDL_DestroyWindow(SDL_Window *window)
        SDL_SetMouseFocus(NULL);
    }

-    /* make no context current if this is the current context window. */
+    SDL_DestroyWindowSurface(window);
+
+    /* Make no context current if this is the current context window */
    if (window->flags & SDL_WINDOW_OPENGL) {
        if (_this->current_glwin == window) {
            SDL_GL_MakeCurrent(window, NULL);
        }
    }

-    SDL_DestroyWindowSurface(window);
-    if (_this->checked_texture_framebuffer) { /* never checked? No framebuffer to destroy. Don't risk calling the wrong implementation. */
-        if (_this->DestroyWindowFramebuffer) {
-            _this->DestroyWindowFramebuffer(_this, window);
-        }
-    }
    if (_this->DestroyWindow) {
        _this->DestroyWindow(_this, window);
    }
@@ -78,7 +78,7 @@ static SDL_Cursor *Android_WrapCursor(int custom_cursor, int system_cursor)
    return cursor;
 }

-static SDL_Cursor *Android_CreateDefaultCursor()
+static SDL_Cursor *Android_CreateDefaultCursor(void)
 {
    return Android_WrapCursor(0, SDL_SYSTEM_CURSOR_ARROW);
 }
@@ -116,7 +116,7 @@ static void Android_FreeCursor(SDL_Cursor *cursor)
    SDL_free(cursor);
 }

-static SDL_Cursor *Android_CreateEmptyCursor()
+static SDL_Cursor *Android_CreateEmptyCursor(void)
 {
    if (!empty_cursor) {
        SDL_Surface *empty_surface = SDL_CreateRGBSurfaceWithFormat(0, 1, 1, 32, SDL_PIXELFORMAT_ARGB8888);
@@ -129,7 +129,7 @@ static SDL_Cursor *Android_CreateEmptyCursor()
    return empty_cursor;
 }

-static void Android_DestroyEmptyCursor()
+static void Android_DestroyEmptyCursor(void)
 {
    if (empty_cursor) {
        Android_FreeCursor(empty_cursor);
@@ -933,11 +933,13 @@ static NSCursor *Cocoa_GetDesiredCursor(void)
 - (void)windowDidChangeScreen:(NSNotification *)aNotification
 {
    /*printf("WINDOWDIDCHANGESCREEN\n");*/
+#ifdef SDL_VIDEO_OPENGL
    if (_data && _data.nscontexts) {
        for (SDLOpenGLContext *context in _data.nscontexts) {
            [context movedToNewScreen];
        }
    }
+#endif /* SDL_VIDEO_OPENGL */
 }

 - (void)windowWillEnterFullScreen:(NSNotification *)aNotification
@@ -2346,7 +2348,10 @@ void Cocoa_DestroyWindow(_THIS, SDL_Window * window)
    SDL_WindowData *data = (SDL_WindowData *) CFBridgingRelease(window->driverdata);

    if (data) {
+#ifdef SDL_VIDEO_OPENGL
        NSArray *contexts;
+#endif
+
        if ([data.listener isInFullscreenSpace]) {
            [NSMenu setMenuBarVisible:YES];
        }
@@ -2358,15 +2363,13 @@ void Cocoa_DestroyWindow(_THIS, SDL_Window * window)
            [data.nswindow close];
        }

-        #ifdef SDL_VIDEO_OPENGL
-
+#ifdef SDL_VIDEO_OPENGL
        contexts = [data.nscontexts copy];
        for (SDLOpenGLContext *context in contexts) {
            /* Calling setWindow:NULL causes the context to remove itself from the context list. */
            [context setWindow:NULL];
        }
-
-        #endif /* SDL_VIDEO_OPENGL */
+#endif /* SDL_VIDEO_OPENGL */

        if (window->shaper) {
            CFBridgingRelease(window->shaper->driverdata);
@@ -561,7 +561,7 @@ static void DirectFB_UnlockTexture(SDL_Renderer * renderer, SDL_Texture * textur
    }
 }

-static void DirectFB_SetTextureScaleMode()
+static void DirectFB_SetTextureScaleMode(void)
 {
 }

@@ -131,7 +131,7 @@ VideoBootStrap DUMMY_evdev_bootstrap = {
    NULL /* no ShowMessageBox implementation */
 };
 void SDL_EVDEV_Init(void);
-void SDL_EVDEV_Poll();
+void SDL_EVDEV_Poll(void);
 void SDL_EVDEV_Quit(void);
 static void DUMMY_EVDEV_Poll(_THIS)
 {
@@ -222,7 +222,7 @@ static int Emscripten_SetRelativeMouseMode(SDL_bool enabled)
    return -1;
 }

-void Emscripten_InitMouse()
+void Emscripten_InitMouse(void)
 {
    SDL_Mouse *mouse = SDL_GetMouse();

@@ -236,7 +236,7 @@ void Emscripten_InitMouse()
    SDL_SetDefaultCursor(Emscripten_CreateDefaultCursor());
 }

-void Emscripten_FiniMouse()
+void Emscripten_FiniMouse(void)
 {
 }

@@ -54,6 +54,11 @@ SDL_KMSDRM_SYM(int,drmModeAddFB2,(int fd, uint32_t width, uint32_t height,
                         const uint32_t pitches[4], const uint32_t offsets[4],
                         uint32_t *buf_id, uint32_t flags))

+SDL_KMSDRM_SYM(int,drmModeAddFB2WithModifiers,(int fd, uint32_t width,
+                         uint32_t height, uint32_t pixel_format, const uint32_t bo_handles[4],
+                         const uint32_t pitches[4], const uint32_t offsets[4],
+                         const uint64_t modifier[4], uint32_t *buf_id, uint32_t flags))
+
 SDL_KMSDRM_SYM(int,drmModeRmFB,(int fd, uint32_t bufferId))
 SDL_KMSDRM_SYM(drmModeFBPtr,drmModeGetFB,(int fd, uint32_t buf))
 SDL_KMSDRM_SYM(drmModeCrtcPtr,drmModeGetCrtc,(int fd, uint32_t crtcId))
@@ -124,6 +129,11 @@ SDL_KMSDRM_SYM(void,gbm_surface_destroy,(struct gbm_surface *surf))
 SDL_KMSDRM_SYM(struct gbm_bo *,gbm_surface_lock_front_buffer,(struct gbm_surface *surf))
 SDL_KMSDRM_SYM(void,gbm_surface_release_buffer,(struct gbm_surface *surf, struct gbm_bo *bo))

+SDL_KMSDRM_SYM(uint64_t,gbm_bo_get_modifier,(struct gbm_bo *bo))
+SDL_KMSDRM_SYM(int,gbm_bo_get_plane_count,(struct gbm_bo *bo))
+SDL_KMSDRM_SYM(uint32_t,gbm_bo_get_offset,(struct gbm_bo *bo, int plane))
+SDL_KMSDRM_SYM(uint32_t,gbm_bo_get_stride_for_plane,(struct gbm_bo *bo, int plane))
+SDL_KMSDRM_SYM(union gbm_bo_handle,gbm_bo_get_handle_for_plane,(struct gbm_bo *bo, int plane);)

 #undef SDL_KMSDRM_MODULE
 #undef SDL_KMSDRM_SYM
@@ -336,8 +336,9 @@ KMSDRM_FBInfo *KMSDRM_FBFromBO(_THIS, struct gbm_bo *bo)
 {
    SDL_VideoData *viddata = ((SDL_VideoData *)_this->driverdata);
    unsigned w, h;
-    int ret;
-    Uint32 stride, handle;
+    int ret, num_planes = 0;
+    Uint32 format, strides[4] = { 0 }, handles[4] = { 0 }, offsets[4] = { 0 }, flags = 0;
+    uint64_t modifiers[4] = { 0 };

    /* Check for an existing framebuffer */
    KMSDRM_FBInfo *fb_info = (KMSDRM_FBInfo *)KMSDRM_gbm_bo_get_user_data(bo);
@@ -357,20 +358,46 @@ KMSDRM_FBInfo *KMSDRM_FBFromBO(_THIS, struct gbm_bo *bo)

    fb_info->drm_fd = viddata->drm_fd;

-    /* Create framebuffer object for the buffer */
+    /* Create framebuffer object for the buffer using the modifiers requested by GBM.
+       Use of the modifiers is necessary on some platforms. */
    w = KMSDRM_gbm_bo_get_width(bo);
    h = KMSDRM_gbm_bo_get_height(bo);
-    stride = KMSDRM_gbm_bo_get_stride(bo);
-    handle = KMSDRM_gbm_bo_get_handle(bo).u32;
-    ret = KMSDRM_drmModeAddFB(viddata->drm_fd, w, h, 24, 32, stride, handle,
-                              &fb_info->fb_id);
+    format = KMSDRM_gbm_bo_get_format(bo);
+
+    modifiers[0] = KMSDRM_gbm_bo_get_modifier(bo);
+    num_planes = KMSDRM_gbm_bo_get_plane_count(bo);
+    for (int i = 0; i < num_planes; i++) {
+        strides[i] = KMSDRM_gbm_bo_get_stride_for_plane(bo, i);
+        handles[i] = KMSDRM_gbm_bo_get_handle_for_plane(bo, i).u32;
+        offsets[i] = KMSDRM_gbm_bo_get_offset(bo, i);
+        modifiers[i] = modifiers[0];
+    }
+
+    if (modifiers[0] && modifiers[0] != DRM_FORMAT_MOD_INVALID) {
+        flags = DRM_MODE_FB_MODIFIERS;
+    }
+
+    ret = KMSDRM_drmModeAddFB2WithModifiers(viddata->drm_fd, w, h, format, handles, strides, offsets, modifiers, &fb_info->fb_id, flags);
+
+    if (ret) {
+        handles[0] = KMSDRM_gbm_bo_get_handle(bo).u32;
+        strides[0] = KMSDRM_gbm_bo_get_stride(bo);
+        offsets[0] = 0;
+        for (int i = 1; i<4; i++) {
+            handles[i] = 0;
+            strides[i] = 0;
+            offsets[i] = 0;
+        }
+        ret = KMSDRM_drmModeAddFB2(viddata->drm_fd, w, h, format, handles, strides, offsets, &fb_info->fb_id, 0);
+    }
+
    if (ret) {
        SDL_free(fb_info);
        return NULL;
    }

-    SDL_LogDebug(SDL_LOG_CATEGORY_VIDEO, "New DRM FB (%u): %ux%u, stride %u from BO %p",
-                 fb_info->fb_id, w, h, stride, (void *)bo);
+    SDL_LogDebug(SDL_LOG_CATEGORY_VIDEO, "New DRM FB (%u): %ux%u, from BO %p",
+                 fb_info->fb_id, w, h, (void *)bo);

    /* Associate our DRM framebuffer with this buffer object */
    KMSDRM_gbm_bo_set_user_data(bo, fb_info, KMSDRM_FBDestroyCallback);
@@ -33,6 +33,45 @@
 #include <gbm.h>
 #include <EGL/egl.h>

+#ifndef DRM_FORMAT_MOD_INVALID
+#define DRM_FORMAT_MOD_INVALID 0x00ffffffffffffffULL
+#endif
+
+#ifndef DRM_MODE_FB_MODIFIERS
+#define DRM_MODE_FB_MODIFIERS	2
+#endif
+
+#ifndef DRM_MODE_PAGE_FLIP_ASYNC
+#define DRM_MODE_PAGE_FLIP_ASYNC    2
+#endif
+
+#ifndef DRM_MODE_OBJECT_CONNECTOR
+#define DRM_MODE_OBJECT_CONNECTOR   0xc0c0c0c0
+#endif
+
+#ifndef DRM_MODE_OBJECT_CRTC
+#define DRM_MODE_OBJECT_CRTC        0xcccccccc
+#endif
+
+#ifndef DRM_CAP_ASYNC_PAGE_FLIP
+#define DRM_CAP_ASYNC_PAGE_FLIP 7
+#endif
+
+#ifndef DRM_CAP_CURSOR_WIDTH
+#define DRM_CAP_CURSOR_WIDTH    8
+#endif
+
+#ifndef DRM_CAP_CURSOR_HEIGHT
+#define DRM_CAP_CURSOR_HEIGHT   9
+#endif
+
+#ifndef GBM_FORMAT_ARGB8888
+#define GBM_FORMAT_ARGB8888  ((uint32_t)('A') | ((uint32_t)('R') << 8) | ((uint32_t)('2') << 16) | ((uint32_t)('4') << 24))
+#define GBM_BO_USE_CURSOR   (1 << 1)
+#define GBM_BO_USE_WRITE    (1 << 3)
+#define GBM_BO_USE_LINEAR   (1 << 4)
+#endif
+
 typedef struct SDL_VideoData
 {
    int devindex;     /* device index that was passed on creation */
@@ -30,17 +30,17 @@
 static SwkbdState sw_keyboard;
 const static size_t BUFFER_SIZE = 256;

-void N3DS_SwkbInit()
+void N3DS_SwkbInit(void)
 {
    swkbdInit(&sw_keyboard, SWKBD_TYPE_NORMAL, 2, -1);
 }

-void N3DS_SwkbPoll()
+void N3DS_SwkbPoll(void)
 {
    return;
 }

-void N3DS_SwkbQuit()
+void N3DS_SwkbQuit(void)
 {
    return;
 }
@@ -56,7 +56,7 @@ static void RPI_Destroy(SDL_VideoDevice *device)
    SDL_free(device);
 }

-static int RPI_GetRefreshRate()
+static int RPI_GetRefreshRate(void)
 {
    TV_DISPLAY_STATE_T tvstate;
    if (vc_tv_get_display_state(&tvstate) == 0) {
@@ -192,7 +192,6 @@ static SDL_bool wayland_get_system_cursor(SDL_VideoData *vdata, Wayland_CursorDa
    int size = 0;

    SDL_Window *focus;
-    SDL_WindowData *focusdata;
    int i;

    /*
@@ -216,16 +215,17 @@ static SDL_bool wayland_get_system_cursor(SDL_VideoData *vdata, Wayland_CursorDa
    }
    /* First, find the appropriate theme based on the current scale... */
    focus = SDL_GetMouse()->focus;
-    if (!focus) {
-        /* Nothing to see here, bail. */
-        return SDL_FALSE;
-    }
-    focusdata = focus->driverdata;
+    if (focus) {
+        SDL_WindowData *focusdata = (SDL_WindowData*)focus->driverdata;

-    /* Cursors use integer scaling. */
-    *scale = SDL_ceilf(focusdata->scale_factor);
-    size *= *scale;
-    for (i = 0; i < vdata->num_cursor_themes; i += 1) {
+        /* Cursors use integer scaling. */
+        *scale = SDL_ceilf(focusdata->scale_factor);
+    } else {
+        *scale = 1.0f;
+    }
+
+    size *= (int)*scale;
+    for (i = 0; i < vdata->num_cursor_themes; ++i) {
        if (vdata->cursor_themes[i].size == size) {
            theme = vdata->cursor_themes[i].theme;
            break;
@@ -78,7 +78,7 @@ static void Wayland_VideoQuit(_THIS);

 /* Find out what class name we should use
 * Based on src/video/x11/SDL_x11video.c */
-static char *get_classname()
+static char *get_classname(void)
 {
    /* !!! FIXME: this is probably wrong, albeit harmless in many common cases. From protocol spec:
        "The surface class identifies the general class of applications
@@ -751,12 +751,11 @@ static void Wayland_free_display(SDL_VideoData *d, uint32_t id)
                    }
                }
            }
-            SDL_DelVideoDisplay(i);
            if (data->xdg_output) {
                zxdg_output_v1_destroy(data->xdg_output);
            }
            wl_output_destroy(data->output);
-            SDL_free(data);
+            SDL_DelVideoDisplay(i);

            /* Update the index for all remaining displays */
            num_displays -= 1;
@@ -1016,9 +1015,6 @@ static void Wayland_VideoCleanup(_THIS)
        }

        wl_output_destroy(((SDL_WaylandOutputData *)display->driverdata)->output);
-        SDL_free(display->driverdata);
-        display->driverdata = NULL;
-
        SDL_DelVideoDisplay(i);
    }
    data->output_list = NULL;
@@ -327,7 +327,7 @@ static SDL_Scancode WindowsScanCodeToSDLScanCode(LPARAM lParam, WPARAM wParam)
 }

 #if !defined(__XBOXONE__) && !defined(__XBOXSERIES__)
-static SDL_bool WIN_ShouldIgnoreFocusClick()
+static SDL_bool WIN_ShouldIgnoreFocusClick(void)
 {
    return !SDL_GetHintBoolean(SDL_HINT_MOUSE_FOCUS_CLICKTHROUGH, SDL_FALSE);
 }
@@ -1794,7 +1794,7 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 }

 #if !defined(__XBOXONE__) && !defined(__XBOXSERIES__)
-static void WIN_UpdateClipCursorForWindows()
+static void WIN_UpdateClipCursorForWindows(void)
 {
    SDL_VideoDevice *_this = SDL_GetVideoDevice();
    SDL_Window *window;
@@ -1816,7 +1816,7 @@ static void WIN_UpdateClipCursorForWindows()
    }
 }

-static void WIN_UpdateMouseCapture()
+static void WIN_UpdateMouseCapture(void)
 {
    SDL_Window *focusWindow = SDL_GetKeyboardFocus();

@@ -2090,7 +2090,7 @@ int SDL_RegisterApp(const char *name, Uint32 style, void *hInst)
 }

 /* Unregisters the windowclass registered in SDL_RegisterApp above. */
-void SDL_UnregisterApp()
+void SDL_UnregisterApp(void)
 {
    WNDCLASSEX wcex;

@@ -166,7 +166,7 @@ void WIN_QuitKeyboard(_THIS)
 #endif /* !SDL_DISABLE_WINDOWS_IME */
 }

-void WIN_ResetDeadKeys()
+void WIN_ResetDeadKeys(void)
 {
    /*
    if a deadkey has been typed, but not the next character (which the deadkey might modify),
@@ -367,7 +367,7 @@ static void UILess_ReleaseSinks(SDL_VideoData *videodata);
 static void UILess_EnableUIUpdates(SDL_VideoData *videodata);
 static void UILess_DisableUIUpdates(SDL_VideoData *videodata);

-static SDL_bool WIN_ShouldShowNativeUI()
+static SDL_bool WIN_ShouldShowNativeUI(void)
 {
    return SDL_GetHintBoolean(SDL_HINT_IME_SHOW_UI, SDL_FALSE);
 }
@@ -474,7 +474,7 @@ static void WIN_SetLinearMouseScale(int mouse_speed)
    }
 }

-void WIN_UpdateMouseSystemScale()
+void WIN_UpdateMouseSystemScale(void)
 {
    int mouse_speed;
    int params[3] = { 0, 0, 0 };
Author	SHA1	Message	Date
Sam Lantinga	ba2f78a006	Updated to version 2.30.6 for release	2024-08-01 14:16:41 -07:00
Sam Lantinga	dcbdf09709	Fixed macOS build (cherry picked from commit `230f1debd0`)	2024-08-01 14:15:16 -07:00
Sam Lantinga	a9b11980d2	Fixed building on macOS with OpenGL disabled Fixes https://github.com/libsdl-org/SDL/issues/6226 (cherry picked from commit `0b6eff4167`)	2024-08-01 14:04:27 -07:00
Sam Lantinga	906d0e9c03	Fixed crash with joystick rumble after disconnection This prevents continuing a rumble after the first one fails, and fixes a long standing crash issue if rumble is started immediately before the controller is disconnected. Thanks to @AntTheAlchemist for the key bug report that showed what was happening here. Fixes https://github.com/libsdl-org/SDL/issues/10422 (cherry picked from commit `0a924b185d`) (cherry picked from commit `7fdf794377`)	2024-07-29 13:51:22 -07:00
Sam Lantinga	0952ab1ab9	Fixed whitespace (cherry picked from commit `67b973b5fa`) (cherry picked from commit `15c73f5bfe`)	2024-07-29 12:52:54 -07:00
Charles Cross	7635776ca4	Updates CheckLibUDev() to match main, fixing missing HAVE_LIBUDEV (cherry picked from commit `e306cbcbee`)	2024-07-29 07:22:29 -07:00
Ozkan Sezer	76a3457ad5	SDL_mslibc.c: revert PR/10303 changes (cherry picked from commit `2cb2897e50`)	2024-07-28 22:50:00 +03:00
Frank Praznik	881c4cb49e	wayland: Don't fail to retrieve a system cursor if no window is focused Doing this can leave the cursor data in a weird, corrupt state. (cherry picked from commit `5617ce277d`) (cherry picked from commit `5d1ca1c8c7`)	2024-07-27 20:32:33 -04:00
Ozkan Sezer	0406d1c316	testshader.c: include stdlib.h for exit()	2024-07-22 17:40:56 +03:00
Ozkan Sezer	1ca76a29d9	SDL_stdinc.h (SDL_COMPILE_TIME_ASSERT): Keep C++ case alone (after PR/10331) Some versions of gcc will define __STDC_VERSION__ even when compiling in C++ mode. Reference issue: https://github.com/libsdl-org/SDL/issues/6078 which was fixed by https://github.com/libsdl-org/SDL/commit/f6b81125b340e00129978f2c9eebfba6a4d25692 (cherry picked from commit `70c1012e8c`) (cherry picked from commit `86b4d035db`)	2024-07-22 16:02:50 +03:00
Anonymous Maarten	e53df5b07e	stdinc: c23 deprecated _Static_assert in favor of static_assert (cherry picked from commit `22bfbdbc02`) (cherry picked from commit `5d606eaae2`)	2024-07-21 13:18:55 -07:00
Amir	e7a47e783b	Fix warning for Android NDK compiler: "function declaration without a prototype is deprecated in all versions of C [-Wstrict-prototypes]" https://stackoverflow.com/questions/42125/warning-error-function-declaration-isnt-a-prototype In C int foo() and int foo(void) are different functions. int foo() accepts an arbitrary number of arguments, while int foo(void) accepts 0 arguments. In C++ they mean the same thing. (cherry picked from commit `ccade50587`)	2024-07-17 14:48:06 -07:00
Ryan C. Gordon	279eb89ce5	README-macos: Typo fixes. (Manually cherry-picked from 199e6929e5284b8573f02dcb655d3803ed436615.)	2024-07-16 08:32:29 -04:00
Anonymous Maarten	fe9020dcb8	pthread: timespec.tv_nsec must be less then 1000000000 ns (cherry picked from commit `1ef041a2ca`)	2024-07-14 17:29:33 +02:00
ceski	4927836b2d	Add a Windows mapping for SplitFish Game Controller (cherry picked from commit `68cf17d0d4`) (cherry picked from commit `3b7eafedb3`)	2024-07-12 22:04:47 -07:00
Anonymous Maarten	5a072d38db	cmake: only add SDL_LIBC=0 compile options to SDL2 libraries	2024-07-12 23:18:06 +02:00
Sam Lantinga	2d1ebf4850	Make sure SDL subsystems are initialized before starting threads (cherry picked from commit `b057159db7`)	2024-07-12 09:11:38 -07:00
Sam Lantinga	44ec2027f3	Make sure timers are initialized before any threads start This prevents race conditions and divide by zero if multiple threads start using the time functions simultaneously. (cherry picked from commit `b378bc5c83`)	2024-07-12 08:02:09 -07:00
Sam Lantinga	000da98663	Fixed OS/2 build (cherry picked from commit `b13dcf24d6`)	2024-07-11 13:56:11 -07:00
Sam Lantinga	87ba287f81	Added TLS initialization and shutdown functions Fixes https://github.com/libsdl-org/SDL/issues/8576 (cherry picked from commit `b517043936`) (cherry picked from commit `551164812a`)	2024-07-11 13:10:40 -07:00
Ozkan Sezer	d133701a72	ci: bump FreeBSD Reference issue: https://github.com/libsdl-org/SDL/issues/10224. (cherry picked from commit `956a8bf6c0`)	2024-07-11 18:55:56 +03:00
Substring	4635f8597d	KMSDRM: fix unsupported modifiers (cherry picked from commit `9548bba63a`) (cherry picked from commit `a2215ff81c`)	2024-07-10 14:43:06 -07:00
Sam Lantinga	802351be25	Fixed build (cherry picked from commit `026dfc6305`)	2024-07-08 11:39:25 -07:00
Sam Lantinga	d3765b27c2	Make sure we're actually running on Windows before using D3D renderers (cherry picked from commit `e22c89536a`)	2024-07-08 11:29:29 -07:00
mariob92	7b11fff2ee	wgl/glx: Fix attribute list for SDL_GL_FLOATBUFFERS This commit fixes the attribute list in the WGL and GLX code when requesting a floating point pixel format. The name of the attribute was missing in the list. Fixes libsdl-org#10189 (cherry picked from commit `9389712917`) (cherry picked from commit `58e179c8b5`)	2024-07-06 11:57:23 -07:00
Sam Lantinga	de4573275a	Improved detection of Nintendo Switch Pro controller report mode Fixes https://github.com/libsdl-org/SDL/issues/10182 (cherry picked from commit `4ba2e9f4f4`) (cherry picked from commit `4c44450258`)	2024-07-06 05:30:41 -07:00
Ozkan Sezer	275c94c900	SDL_hidapi.c: work-around watcom build error when libusb is enabled (cherry picked from commit `6a10309568`)	2024-07-05 18:56:20 +03:00
Max Maisel	c084e647ed	Drain HIDAPI buffer in SDL_hidapi_steamdeck.c. Add a loop around SDL_hid_read() in the Steam Deck HIDAPI driver as it is done in other HIDAPI drivers. This loop reads data from the device and processes it until the input buffer is empty which ensures that clients always get the latest data. This fixes an input latency issue if the application polls the events slower than the hardware generates them. (cherry picked from commit `22770e6496`)	2024-07-05 08:29:01 -07:00
Sam Lantinga	2cdb419a21	Try to create an accelerated renderer for the window surface even if SDL_HINT_RENDER_DRIVER is "software" This case is properly handled inside SDL_CreateWindowTexture() Fixes https://github.com/libsdl-org/SDL/issues/10155 (cherry picked from commit `c7ed78a9ef`) (cherry picked from commit `a4cbba1276`)	2024-07-05 08:23:39 -07:00
Sam Lantinga	2eef7ca475	Updated to version 2.30.5 for release	2024-07-03 14:21:42 -07:00
Sam Lantinga	d126e7bbba	Added support for the ROG RAIKIRI (cherry picked from commit `a04596c9a7`) (cherry picked from commit `845ebbbe96`)	2024-07-03 13:54:52 -07:00
Sam Lantinga	e5024fae3d	If a mapping specifies a crc, don't match for controllers that don't have that CRC The CRC is used to distinguish between different controllers that have the same VID/PID, so if the CRC doesn't match, it's probably a different controller that we don't know about. Fixes https://github.com/libsdl-org/SDL/issues/9265 (cherry picked from commit `30e93b40c2`) (cherry picked from commit `b8daf14fe5`)	2024-07-03 13:25:13 -07:00
Ryan C. Gordon	eb053c7f3f	SDL_JoystickEventState: Make documentation and implementation match. This changes the `SDL_EVENTS_DISABLED` path's return value from SDL_DISABLE to SDL_IGNORE to match expectations, but doesn't actually change the ABI, since these two symbols are both zero. Fixes https://github.com/libsdl-org/sdlwiki/issues/460 (cherry picked from commit `7d60ff9965`)	2024-07-03 13:24:19 -07:00
Sam Lantinga	ed441c8289	Turn HIDAPI joystick support off by default on mobile platforms On Android, HIDAPI prompts for permissions and acquires exclusive access to the device, and on Apple mobile platforms it doesn't do anything except for handling Bluetooth Steam Controllers. Fixes https://github.com/libsdl-org/SDL/issues/9241 (cherry picked from commit `e3cf2e4794`) (cherry picked from commit `66054a6515`)	2024-07-03 13:23:04 -07:00
Wouter Wijsman	59b0a1dc65	PSP: send initial SDL_JOYDEVICEADDED event (cherry picked from commit `5d80179954`)	2024-07-03 13:22:03 -07:00
Sam Lantinga	80d36aba5b	Only use the default gamepad mapping if an automatic mapping isn't available Fixes https://github.com/libsdl-org/SDL/issues/10162 (cherry picked from commit `0f8054cf87`) (cherry picked from commit `cd8ea5e3f1`)	2024-07-03 11:47:46 -07:00
Sam Lantinga	e1e36d213b	Fixed build (cherry picked from commit `288aea3b40`)	2024-06-29 11:22:48 -07:00
Sam Lantinga	5c8d92e4d0	Respect SDL_HINT_RENDER_DRIVER when creating an accelerated window surface Fixes https://github.com/libsdl-org/SDL/issues/10061 (cherry picked from commit `2a58e7b11c`) (cherry picked from commit `0d9e54237c`)	2024-06-29 11:13:50 -07:00
Sam Lantinga	8a39054b54	Clean up any renderer in SDL_DestroyWindowSurface() Also added an automated test to verify window surface functionality. Fixes https://github.com/libsdl-org/SDL/issues/10133 (cherry picked from commit `a522bfe3f1`) (cherry picked from commit `a3f0c373d3`)	2024-06-29 11:13:36 -07:00
1F616EMO	c60e2704c8	Remove the inconsistent and lag-causing usleep call in SDL_fcitx.c (cherry picked from commit `3bf2b90da0`)	2024-06-29 00:09:34 -07:00
Sam Lantinga	a9fdbf7f21	Make sure we don't try to use the XInput DLL after it's unloaded Steam ran into a crash SDL_XINPUT_JoystickDetect() with XINPUTGETCAPABILITIES being NULL. I'm not sure how that happened, and there may still be a race condition if this is a multi-threaded issue, but at least this is more correct. (cherry picked from commit `0ae4fd0ec9`) (cherry picked from commit `ee3b2b7de1`)	2024-06-26 15:56:21 -07:00
Sam Lantinga	ed86b02df8	Fixed building with older libdrm headers (cherry picked from commit `8949de3978`) (cherry picked from commit `88bbab275f`)	2024-06-26 15:56:20 -07:00
Sam Lantinga	0811b4dc51	Fixed building with the steamrt/scout SDK (cherry picked from commit `4b82bed259`) (cherry picked from commit `ecde0ca6b6`)	2024-06-26 15:56:20 -07:00
Sam Lantinga	d9901e0b85	Fix building with the steamrt/scout SDK (cherry picked from commit `b552f26e6a`) (cherry picked from commit `64d4baccb5`)	2024-06-26 15:56:20 -07:00
Frank Praznik	0f5752b0fc	video: Fix memory leak when deleting a video display The display deletion code would not free the driver data or name if the display index was the last, or only one, in the list. (cherry picked from commit `20f1061cc8`)	2024-06-26 12:32:07 -04:00
Frank Praznik	31f77182d0	wayland: Fix double free when deleting an output display (cherry picked from commit `3b88d4f46f`)	2024-06-26 12:31:51 -04:00
Cecill Etheredge	620e875335	fix: Use drmModeAddFB2WithModifiers instead of drmModeAddFB to allow using GBM modifiers. This fixes corrupt framebuffers on platforms that require the use of modifiers.	2024-06-25 14:20:36 -07:00
Edoardo Lolletti	c18173c260	Fix std::thread memory leak In the stdcpp thread implementation, the allocated std::thread objects were never deleted after joining/detaching (cherry picked from commit `20dbe90771`) (cherry picked from commit `99d7b9e626`)	2024-06-24 11:51:40 -07:00
Ganael Laplanche	f08f458896	Fix joystick (/dev/input/xxx) support on FreeBSD Backport `f8ad4abe` from main branch. When switching to CMake, src/joystick/linux/SDL_sysjoystick.c file got excluded from FreeBSD builds, losing support for /dev/input/xxx devices. See also: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=279907 and: https://github.com/libsdl-org/SDL/pull/10087 (cherry picked from commit `ab5740bde2`)	2024-06-23 00:07:35 -07:00
Blaž Tomažič	53cf48f505	android: add an option to manually pass the context when loading a native library (cherry picked from commit `b444e656cd`)	2024-06-20 10:40:05 -07:00
Blaž Tomažič	c32a1a5023	android: actually use ReLinker When loading libraries the `SDL.mContext` is still `null`. This results in relinker code path in `SDL.loadLibrary(...)` always throwing a null exception and fallbacking to system loader. Fix it by passing the context explicitly. (cherry picked from commit `6a2dd96ac7`)	2024-06-20 09:35:58 -07:00
expikr	8b204815cc	Add SDL_MOUSE_RELATIVE_CURSOR_VISIBLE (#7947 ) (cherry picked from commit `ee559d51be`) (cherry picked from commit `194d72bb29`)	2024-06-20 09:32:27 -07:00
Aikawa Yataro	a9bb92b3ae	Update qsort implementation (cherry picked from commit `0fe9f5da54`) (cherry picked from commit `4800edfa0c`)	2024-06-19 05:50:00 +03:00
Sam Lantinga	630272eb55	Fixed requesting USB permission on Android 14 (thanks @ikhoeyZX!) Fixes https://github.com/libsdl-org/SDL/issues/9831 (cherry picked from commit `8ab1ffca8a`) (cherry picked from commit `5a26b26880`)	2024-06-17 15:12:05 -07:00