Merge 9dc6c6e4d4 into 0e262dfd44

2025-06-16 13:07:11 +03:00
124 changed files with 447 additions and 626 deletions
--- a/.wikiheaders-options
+++ b/.wikiheaders-options
@ -9,7 +9,6 @@ versionfname = include/SDL3/SDL_version.h
 versionmajorregex = \A\#define\s+SDL_MAJOR_VERSION\s+(\d+)\Z
 versionminorregex = \A\#define\s+SDL_MINOR_VERSION\s+(\d+)\Z
 versionmicroregex = \A\#define\s+SDL_MICRO_VERSION\s+(\d+)\Z
-apipropertyregex = \A\s*\#\s*define\s+SDL_PROP_
 selectheaderregex = \ASDL.*?\.h\Z
 projecturl = https://libsdl.org/
 wikiurl = https://wiki.libsdl.org
--- a/build-scripts/wikiheaders.pl
+++ b/build-scripts/wikiheaders.pl
@ -32,7 +32,6 @@ my $wikisubdir = '';
 my $incsubdir = 'include';
 my $readmesubdir = undef;
 my $apiprefixregex = undef;
-my $apipropertyregex = undef;
 my $versionfname = 'include/SDL_version.h';
 my $versionmajorregex = '\A\#define\s+SDL_MAJOR_VERSION\s+(\d+)\Z';
 my $versionminorregex = '\A\#define\s+SDL_MINOR_VERSION\s+(\d+)\Z';
@ -111,7 +110,6 @@ if (defined $optionsfname) {
            $srcpath = $val, next if $key eq 'srcpath';
            $wikipath = $val, next if $key eq 'wikipath';
            $apiprefixregex = $val, next if $key eq 'apiprefixregex';
-            $apipropertyregex = $val, next if $key eq 'apipropertyregex';
            $projectfullname = $val, next if $key eq 'projectfullname';
            $projectshortname = $val, next if $key eq 'projectshortname';
            $wikisubdir = $val, next if $key eq 'wikisubdir';
@ -1368,7 +1366,7 @@ while (my $d = readdir(DH)) {
                    # update strings now that we know everything pending is to be applied to this declaration. Add pending blank lines and the new text.

                    # At Sam's request, don't list property defines with functions. (See #9440)
-                    my $is_property = (defined $apipropertyregex) ? /$apipropertyregex/ : 0;
+                    my $is_property = /\A\s*\#\s*define\s+SDL_PROP_/;
                    if (!$is_property) {
                        if ($blank_lines > 0) {
                            while ($blank_lines > 0) {
--- a/include/SDL3/SDL_audio.h
+++ b/include/SDL3/SDL_audio.h
@ -1021,8 +1021,7 @@ extern SDL_DECLSPEC void SDLCALL SDL_UnbindAudioStream(SDL_AudioStream *stream);
 /**
 * Query an audio stream for its currently-bound device.
 *
- * This reports the logical audio device that an audio stream is currently
- * bound to.
+ * This reports the audio device that an audio stream is currently bound to.
 *
 * If not bound, or invalid, this returns zero, which is not a valid device
 * ID.
--- a/include/SDL3/SDL_events.h
+++ b/include/SDL3/SDL_events.h
@ -135,8 +135,7 @@ typedef enum SDL_EventType
    /* 0x201 was SDL_SYSWMEVENT, reserve the number for sdl2-compat */
    SDL_EVENT_WINDOW_SHOWN = 0x202,     /**< Window has been shown */
    SDL_EVENT_WINDOW_HIDDEN,            /**< Window has been hidden */
-    SDL_EVENT_WINDOW_EXPOSED,           /**< Window has been exposed and should be redrawn, and can be redrawn directly from event watchers for this event.
-                                             data1 is 1 for live-resize expose events, 0 otherwise. */
+    SDL_EVENT_WINDOW_EXPOSED,           /**< Window has been exposed and should be redrawn, and can be redrawn directly from event watchers for this event */
    SDL_EVENT_WINDOW_MOVED,             /**< Window has been moved to data1, data2 */
    SDL_EVENT_WINDOW_RESIZED,           /**< Window has been resized to data1xdata2 */
    SDL_EVENT_WINDOW_PIXEL_SIZE_CHANGED,/**< The pixel size of the window has changed to data1xdata2 */
--- a/include/SDL3/SDL_iostream.h
+++ b/include/SDL3/SDL_iostream.h
@ -823,7 +823,7 @@ extern SDL_DECLSPEC bool SDLCALL SDL_ReadS8(SDL_IOStream *src, Sint8 *value);
 *
 * \param src the stream from which to read data.
 * \param value a pointer filled in with the data read.
- * \returns true on successful read or false on failure; call SDL_GetError()
+ * \returns true on successful write or false on failure; call SDL_GetError()
 *          for more information.
 *
 * \threadsafety This function is not thread safe.
@ -846,7 +846,7 @@ extern SDL_DECLSPEC bool SDLCALL SDL_ReadU16LE(SDL_IOStream *src, Uint16 *value)
 *
 * \param src the stream from which to read data.
 * \param value a pointer filled in with the data read.
- * \returns true on successful read or false on failure; call SDL_GetError()
+ * \returns true on successful write or false on failure; call SDL_GetError()
 *          for more information.
 *
 * \threadsafety This function is not thread safe.
@ -869,7 +869,7 @@ extern SDL_DECLSPEC bool SDLCALL SDL_ReadS16LE(SDL_IOStream *src, Sint16 *value)
 *
 * \param src the stream from which to read data.
 * \param value a pointer filled in with the data read.
- * \returns true on successful read or false on failure; call SDL_GetError()
+ * \returns true on successful write or false on failure; call SDL_GetError()
 *          for more information.
 *
 * \threadsafety This function is not thread safe.
@ -892,7 +892,7 @@ extern SDL_DECLSPEC bool SDLCALL SDL_ReadU16BE(SDL_IOStream *src, Uint16 *value)
 *
 * \param src the stream from which to read data.
 * \param value a pointer filled in with the data read.
- * \returns true on successful read or false on failure; call SDL_GetError()
+ * \returns true on successful write or false on failure; call SDL_GetError()
 *          for more information.
 *
 * \threadsafety This function is not thread safe.
@ -915,7 +915,7 @@ extern SDL_DECLSPEC bool SDLCALL SDL_ReadS16BE(SDL_IOStream *src, Sint16 *value)
 *
 * \param src the stream from which to read data.
 * \param value a pointer filled in with the data read.
- * \returns true on successful read or false on failure; call SDL_GetError()
+ * \returns true on successful write or false on failure; call SDL_GetError()
 *          for more information.
 *
 * \threadsafety This function is not thread safe.
@ -938,7 +938,7 @@ extern SDL_DECLSPEC bool SDLCALL SDL_ReadU32LE(SDL_IOStream *src, Uint32 *value)
 *
 * \param src the stream from which to read data.
 * \param value a pointer filled in with the data read.
- * \returns true on successful read or false on failure; call SDL_GetError()
+ * \returns true on successful write or false on failure; call SDL_GetError()
 *          for more information.
 *
 * \threadsafety This function is not thread safe.
@ -961,7 +961,7 @@ extern SDL_DECLSPEC bool SDLCALL SDL_ReadS32LE(SDL_IOStream *src, Sint32 *value)
 *
 * \param src the stream from which to read data.
 * \param value a pointer filled in with the data read.
- * \returns true on successful read or false on failure; call SDL_GetError()
+ * \returns true on successful write or false on failure; call SDL_GetError()
 *          for more information.
 *
 * \threadsafety This function is not thread safe.
@ -984,7 +984,7 @@ extern SDL_DECLSPEC bool SDLCALL SDL_ReadU32BE(SDL_IOStream *src, Uint32 *value)
 *
 * \param src the stream from which to read data.
 * \param value a pointer filled in with the data read.
- * \returns true on successful read or false on failure; call SDL_GetError()
+ * \returns true on successful write or false on failure; call SDL_GetError()
 *          for more information.
 *
 * \threadsafety This function is not thread safe.
@ -1007,7 +1007,7 @@ extern SDL_DECLSPEC bool SDLCALL SDL_ReadS32BE(SDL_IOStream *src, Sint32 *value)
 *
 * \param src the stream from which to read data.
 * \param value a pointer filled in with the data read.
- * \returns true on successful read or false on failure; call SDL_GetError()
+ * \returns true on successful write or false on failure; call SDL_GetError()
 *          for more information.
 *
 * \threadsafety This function is not thread safe.
@ -1030,7 +1030,7 @@ extern SDL_DECLSPEC bool SDLCALL SDL_ReadU64LE(SDL_IOStream *src, Uint64 *value)
 *
 * \param src the stream from which to read data.
 * \param value a pointer filled in with the data read.
- * \returns true on successful read or false on failure; call SDL_GetError()
+ * \returns true on successful write or false on failure; call SDL_GetError()
 *          for more information.
 *
 * \threadsafety This function is not thread safe.
@ -1053,7 +1053,7 @@ extern SDL_DECLSPEC bool SDLCALL SDL_ReadS64LE(SDL_IOStream *src, Sint64 *value)
 *
 * \param src the stream from which to read data.
 * \param value a pointer filled in with the data read.
- * \returns true on successful read or false on failure; call SDL_GetError()
+ * \returns true on successful write or false on failure; call SDL_GetError()
 *          for more information.
 *
 * \threadsafety This function is not thread safe.
@ -1076,7 +1076,7 @@ extern SDL_DECLSPEC bool SDLCALL SDL_ReadU64BE(SDL_IOStream *src, Uint64 *value)
 *
 * \param src the stream from which to read data.
 * \param value a pointer filled in with the data read.
- * \returns true on successful read or false on failure; call SDL_GetError()
+ * \returns true on successful write or false on failure; call SDL_GetError()
 *          for more information.
 *
 * \threadsafety This function is not thread safe.
--- a/src/audio/SDL_audio.c
+++ b/src/audio/SDL_audio.c
@ -1415,7 +1415,6 @@ static int SDLCALL RecordingAudioThread(void *devicep)  // thread entry point
 typedef struct CountAudioDevicesData
 {
    int devs_seen;
-    int devs_skipped;
    const int num_devices;
    SDL_AudioDeviceID *result;
    const bool recording;
@ -1431,14 +1430,8 @@ static bool SDLCALL CountAudioDevices(void *userdata, const SDL_HashTable *table
    const bool isphysical = !!(devid & (1<<1));
    if (isphysical && (devid_recording == data->recording)) {
        SDL_assert(data->devs_seen < data->num_devices);
-        SDL_AudioDevice *device = (SDL_AudioDevice *) value;  // this is normally risky, but we hold the device_hash_lock here.
-        const bool zombie = SDL_GetAtomicInt(&device->zombie) != 0;
-        if (zombie) {
-            data->devs_skipped++;
-        } else {
        data->result[data->devs_seen++] = devid;
    }
-    }
    return true;  // keep iterating.
 }

@ -1453,11 +1446,10 @@ static SDL_AudioDeviceID *GetAudioDevices(int *count, bool recording)
            num_devices = SDL_GetAtomicInt(recording ? &current_audio.recording_device_count : &current_audio.playback_device_count);
            result = (SDL_AudioDeviceID *) SDL_malloc((num_devices + 1) * sizeof (SDL_AudioDeviceID));
            if (result) {
-                CountAudioDevicesData data = { 0, 0, num_devices, result, recording };
+                CountAudioDevicesData data = { 0, num_devices, result, recording };
                SDL_IterateHashTable(current_audio.device_hash, CountAudioDevices, &data);
-                SDL_assert((data.devs_seen + data.devs_skipped) == num_devices);
-                num_devices = data.devs_seen;  // might be less if we skipped any.
-                result[num_devices] = 0;  // null-terminated.
+                SDL_assert(data.devs_seen == num_devices);
+                result[data.devs_seen] = 0;  // null-terminated.
            }
        }
        SDL_UnlockRWLock(current_audio.device_hash_lock);
--- a/src/audio/alsa/SDL_alsa_audio.c
+++ b/src/audio/alsa/SDL_alsa_audio.c
@ -38,7 +38,6 @@

 #include "../SDL_sysaudio.h"
 #include "SDL_alsa_audio.h"
-#include "../../core/linux/SDL_udev.h"

 #if SDL_ALSA_DEBUG
 #define LOGDEBUG(...) SDL_LogDebug(SDL_LOG_CATEGORY_AUDIO, "ALSA: " __VA_ARGS__)
@ -349,25 +348,28 @@ static char *get_pcm_str(void *handle)
 // This function waits until it is possible to write a full sound buffer
 static bool ALSA_WaitDevice(SDL_AudioDevice *device)
 {
-    const int sample_frames = device->sample_frames;
-    const int fulldelay = (int) ((((Uint64) sample_frames) * 1000) / device->spec.freq);
-    const int delay = SDL_clamp(fulldelay, 1, 5);
+    const int fulldelay = (int) ((((Uint64) device->sample_frames) * 1000) / device->spec.freq);
+    const int delay = SDL_max(fulldelay, 10);

    while (!SDL_GetAtomicInt(&device->shutdown)) {
-        const int rc = ALSA_snd_pcm_avail(device->hidden->pcm);
-        if (rc < 0) {
+        const int rc = ALSA_snd_pcm_wait(device->hidden->pcm, delay);
+        if (rc < 0 && (rc != -EAGAIN)) {
            const int status = ALSA_snd_pcm_recover(device->hidden->pcm, rc, 0);
            if (status < 0) {
                // Hmm, not much we can do - abort
-                SDL_LogError(SDL_LOG_CATEGORY_AUDIO, "ALSA wait failed (unrecoverable): %s", ALSA_snd_strerror(rc));
+                SDL_LogError(SDL_LOG_CATEGORY_AUDIO, "ALSA: snd_pcm_wait failed (unrecoverable): %s", ALSA_snd_strerror(rc));
                return false;
            }
+            continue;
        }
-        if (rc >= sample_frames) {
-            break;
+
+        if (rc > 0) {
+            break;  // ready to go!
        }
-        SDL_Delay(delay);
+
+        // Timed out! Make sure we aren't shutting down and then wait again.
    }
+
    return true;
 }

@ -429,11 +431,8 @@ static int ALSA_RecordDevice(SDL_AudioDevice *device, void *buffer, int buflen)
    SDL_assert((buflen % frame_size) == 0);

    const snd_pcm_sframes_t total_available = ALSA_snd_pcm_avail(device->hidden->pcm);
-    if (total_available == 0) {
-        return 0;  // go back to WaitDevice and try again.
-    }
-
    const int total_frames = SDL_min(buflen / frame_size, total_available);
+
    const int rc = ALSA_snd_pcm_readi(device->hidden->pcm, buffer, total_frames);

    SDL_assert(rc != -EAGAIN);  // assuming this can't happen if we used snd_pcm_wait and queried for available space. snd_pcm_recover won't handle it!
@ -1446,65 +1445,6 @@ static int SDLCALL ALSA_HotplugThread(void *arg)
 }
 #endif

-#ifdef SDL_USE_LIBUDEV
-
-static bool udev_initialized;
-
-static void ALSA_udev_callback(SDL_UDEV_deviceevent udev_type, int udev_class, const char *devpath)
-{
-    if (!devpath) {
-        return;
-    }
-
-    switch (udev_type) {
-    case SDL_UDEV_DEVICEADDED:
-        ALSA_HotplugIteration(NULL, NULL);
-        break;
-
-    case SDL_UDEV_DEVICEREMOVED:
-        ALSA_HotplugIteration(NULL, NULL);
-        break;
-
-    default:
-        break;
-    }
-}
-
-static bool ALSA_start_udev()
-{
-    udev_initialized = SDL_UDEV_Init();
-    if (udev_initialized) {
-        // Set up the udev callback
-        if (!SDL_UDEV_AddCallback(ALSA_udev_callback)) {
-            SDL_UDEV_Quit();
-            udev_initialized = false;
-        }
-    }
-    return udev_initialized;
-}
-
-static void ALSA_stop_udev()
-{
-    if (udev_initialized) {
-        SDL_UDEV_DelCallback(ALSA_udev_callback);
-        SDL_UDEV_Quit();
-        udev_initialized = false;
-    }
-}
-
-#else
-
-static bool ALSA_start_udev()
-{
-    return false;
-}
-
-static void ALSA_stop_udev()
-{
-}
-
-#endif // SDL_USE_LIBUDEV
-
 static void ALSA_DetectDevices(SDL_AudioDevice **default_playback, SDL_AudioDevice **default_recording)
 {
    ALSA_guess_device_prefix();
@ -1520,14 +1460,12 @@ static void ALSA_DetectDevices(SDL_AudioDevice **default_playback, SDL_AudioDevi
        *default_recording = SDL_AddAudioDevice(/*recording=*/true, "ALSA default recording device", NULL, (void*)&default_recording_handle);
    }

-    if (!ALSA_start_udev()) {
 #if SDL_ALSA_HOTPLUG_THREAD
    SDL_SetAtomicInt(&ALSA_hotplug_shutdown, 0);
    ALSA_hotplug_thread = SDL_CreateThread(ALSA_HotplugThread, "SDLHotplugALSA", NULL);
    // if the thread doesn't spin, oh well, you just don't get further hotplug events.
 #endif
 }
-}

 static void ALSA_DeinitializeStart(void)
 {
@ -1541,7 +1479,6 @@ static void ALSA_DeinitializeStart(void)
        ALSA_hotplug_thread = NULL;
    }
 #endif
-    ALSA_stop_udev();

    // Shutting down! Clean up any data we've gathered.
    for (dev = hotplug_devices; dev; dev = next) {
--- a/src/events/scancodes_xfree86.h
+++ b/src/events/scancodes_xfree86.h
@ -371,10 +371,10 @@ static const SDL_Scancode xfree86_scancode_table2[] = {
    /* 188, 0x0bc */   SDL_SCANCODE_F18,                // XF86Launch9
    /* 189, 0x0bd */   SDL_SCANCODE_F19,                // NoSymbol
    /* 190, 0x0be */   SDL_SCANCODE_F20,                // XF86AudioMicMute
-    /* 191, 0x0bf */   SDL_SCANCODE_F21,                // XF86TouchpadToggle
-    /* 192, 0x0c0 */   SDL_SCANCODE_F22,                // XF86TouchpadOn
-    /* 193, 0x0c1 */   SDL_SCANCODE_F23,                // XF86TouchpadOff
-    /* 194, 0x0c2 */   SDL_SCANCODE_F24,                // NoSymbol
+    /* 191, 0x0bf */   SDL_SCANCODE_UNKNOWN,            // XF86TouchpadToggle
+    /* 192, 0x0c0 */   SDL_SCANCODE_UNKNOWN,            // XF86TouchpadOn
+    /* 193, 0x0c1 */   SDL_SCANCODE_UNKNOWN,            // XF86TouchpadOff
+    /* 194, 0x0c2 */   SDL_SCANCODE_UNKNOWN,            // NoSymbol
    /* 195, 0x0c3 */   SDL_SCANCODE_MODE,               // Mode_switch
    /* 196, 0x0c4 */   SDL_SCANCODE_UNKNOWN,            // NoSymbol
    /* 197, 0x0c5 */   SDL_SCANCODE_UNKNOWN,            // NoSymbol
--- a/src/hidapi/libusb/hid.c
+++ b/src/hidapi/libusb/hid.c
@ -71,11 +71,6 @@ extern "C" {
 #define DETACH_KERNEL_DRIVER
 #endif

-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:5287) /* operands are different enum types */
-#endif
-
 /* Uncomment to enable the retrieval of Usage and Usage Page in
 hid_enumerate(). Warning, on platforms different from FreeBSD
 this is very invasive as it requires the detach
@ -2149,10 +2144,6 @@ uint16_t get_usb_code_for_current_locale(void)
 	return 0x0;
 }

-#if defined(_MSC_VER)
-#pragma warning (pop)
-#endif
-
 #ifdef __cplusplus
 }
 #endif
--- a/src/joystick/SDL_gamepad.c
+++ b/src/joystick/SDL_gamepad.c
@ -841,7 +841,6 @@ static GamepadMapping_t *SDL_CreateMappingForHIDAPIGamepad(SDL_GUID guid)
            case 80:
            case 81:
            case 85:
-            case 105:
                // Vader series of controllers have C/Z buttons
                SDL_strlcat(mapping_string, "misc2:b15,misc3:b16,", sizeof(mapping_string));
                break;
--- a/src/joystick/hidapi/SDL_hidapi_flydigi.c
+++ b/src/joystick/hidapi/SDL_hidapi_flydigi.c
@ -95,18 +95,19 @@ static void UpdateDeviceIdentity(SDL_HIDAPI_Device *device)
 {
    SDL_DriverFlydigi_Context *ctx = (SDL_DriverFlydigi_Context *)device->context;

-    // Detecting the Vader 2 can take over 1000 read retries, so be generous here
-    for (int attempt = 0; ctx->deviceID == 0 && attempt < 30; ++attempt) {
+    for (int attempt = 0; ctx->deviceID == 0 && attempt < 3; ++attempt) {
        const Uint8 request[] = { FLYDIGI_CMD_REPORT_ID, FLYDIGI_GET_INFO_COMMAND, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-        // This write will occasionally return -1, so ignore failure here and try again
-        (void)SDL_hid_write(device->dev, request, sizeof(request));
+        int size = SDL_hid_write(device->dev, request, sizeof(request));
+        if (size < 0) {
+            break;
+        }

        // Read the reply
        for (int i = 0; i < 100; ++i) {
            SDL_Delay(1);

            Uint8 data[USB_PACKET_LENGTH];
-            int size = SDL_hid_read_timeout(device->dev, data, sizeof(data), 0);
+            size = SDL_hid_read_timeout(device->dev, data, sizeof(data), 0);
            if (size < 0) {
                break;
            }
@ -210,7 +211,6 @@ static void UpdateDeviceIdentity(SDL_HIDAPI_Device *device)
        ctx->sensor_timestamp_step_ns = ctx->wireless ? SENSOR_INTERVAL_VADER4_PRO_DONGLE_NS : SENSOR_INTERVAL_VADER_PRO4_WIRED_NS;
        break;
    case 85:
-    case 105:
        HIDAPI_SetDeviceName(device, "Flydigi Vader 4 Pro");
        ctx->has_cz = true;
        ctx->sensors_supported = true;
@ -218,7 +218,6 @@ static void UpdateDeviceIdentity(SDL_HIDAPI_Device *device)
        ctx->sensor_timestamp_step_ns = ctx->wireless ? SENSOR_INTERVAL_VADER4_PRO_DONGLE_NS : SENSOR_INTERVAL_VADER_PRO4_WIRED_NS;
        break;
    default:
-        SDL_LogDebug(SDL_LOG_CATEGORY_INPUT, "Unknown FlyDigi controller with ID %d, name '%s'", ctx->deviceID, device->name);
        break;
    }
 }
--- a/src/joystick/hidapi/SDL_hidapi_switch.c
+++ b/src/joystick/hidapi/SDL_hidapi_switch.c
@ -979,7 +979,7 @@ static bool LoadStickCalibration(SDL_DriverSwitch_Context *ctx)
    /* Stick calibration values are 12-bits each and are packed by bit
     * For whatever reason the fields are in a different order for each stick
     * Left:  X-Max, Y-Max, X-Center, Y-Center, X-Min, Y-Min
-     * Right: X-Center, Y-Center, X-Max, Y-Max, X-Min, Y-Min
+     * Right: X-Center, Y-Center, X-Min, Y-Min, X-Max, Y-Max
     */

    // Left stick
@ -993,10 +993,10 @@ static bool LoadStickCalibration(SDL_DriverSwitch_Context *ctx)
    // Right stick
    ctx->m_StickCalData[1].axis[0].sCenter = ((pRightStickCal[1] << 8) & 0xF00) | pRightStickCal[0]; // X Axis center
    ctx->m_StickCalData[1].axis[1].sCenter = (pRightStickCal[2] << 4) | (pRightStickCal[1] >> 4);    // Y Axis center
-    ctx->m_StickCalData[1].axis[0].sMax = ((pRightStickCal[4] << 8) & 0xF00) | pRightStickCal[3];    // X Axis max above center
-    ctx->m_StickCalData[1].axis[1].sMax = (pRightStickCal[5] << 4) | (pRightStickCal[4] >> 4);       // Y Axis max above center
-    ctx->m_StickCalData[1].axis[0].sMin = ((pRightStickCal[7] << 8) & 0xF00) | pRightStickCal[6];    // X Axis min below center
-    ctx->m_StickCalData[1].axis[1].sMin = (pRightStickCal[8] << 4) | (pRightStickCal[7] >> 4);       // Y Axis min below center
+    ctx->m_StickCalData[1].axis[0].sMin = ((pRightStickCal[4] << 8) & 0xF00) | pRightStickCal[3];    // X Axis min below center
+    ctx->m_StickCalData[1].axis[1].sMin = (pRightStickCal[5] << 4) | (pRightStickCal[4] >> 4);       // Y Axis min below center
+    ctx->m_StickCalData[1].axis[0].sMax = ((pRightStickCal[7] << 8) & 0xF00) | pRightStickCal[6];    // X Axis max above center
+    ctx->m_StickCalData[1].axis[1].sMax = (pRightStickCal[8] << 4) | (pRightStickCal[7] >> 4);       // Y Axis max above center

    // Filter out any values that were uninitialized (0xFFF) in the SPI read
    for (stick = 0; stick < 2; ++stick) {
@ -1109,17 +1109,14 @@ static Sint16 ApplyStickCalibration(SDL_DriverSwitch_Context *ctx, int nStick, i
 {
    sRawValue -= ctx->m_StickCalData[nStick].axis[nAxis].sCenter;

-    if (sRawValue >= 0) {
    if (sRawValue > ctx->m_StickExtents[nStick].axis[nAxis].sMax) {
        ctx->m_StickExtents[nStick].axis[nAxis].sMax = sRawValue;
    }
-        return (Sint16)HIDAPI_RemapVal(sRawValue, 0, ctx->m_StickExtents[nStick].axis[nAxis].sMax, 0, SDL_MAX_SINT16);
-    } else {
    if (sRawValue < ctx->m_StickExtents[nStick].axis[nAxis].sMin) {
        ctx->m_StickExtents[nStick].axis[nAxis].sMin = sRawValue;
    }
-        return (Sint16)HIDAPI_RemapVal(sRawValue, ctx->m_StickExtents[nStick].axis[nAxis].sMin, 0, SDL_MIN_SINT16, 0);
-    }
+
+    return (Sint16)HIDAPI_RemapVal(sRawValue, ctx->m_StickExtents[nStick].axis[nAxis].sMin, ctx->m_StickExtents[nStick].axis[nAxis].sMax, SDL_MIN_SINT16, SDL_MAX_SINT16);
 }

 static Sint16 ApplySimpleStickCalibration(SDL_DriverSwitch_Context *ctx, int nStick, int nAxis, Sint16 sRawValue)
@ -1129,17 +1126,14 @@ static Sint16 ApplySimpleStickCalibration(SDL_DriverSwitch_Context *ctx, int nSt

    sRawValue -= usJoystickCenter;

-    if (sRawValue >= 0) {
    if (sRawValue > ctx->m_SimpleStickExtents[nStick].axis[nAxis].sMax) {
        ctx->m_SimpleStickExtents[nStick].axis[nAxis].sMax = sRawValue;
    }
-        return (Sint16)HIDAPI_RemapVal(sRawValue, 0, ctx->m_SimpleStickExtents[nStick].axis[nAxis].sMax, 0, SDL_MAX_SINT16);
-    } else {
    if (sRawValue < ctx->m_SimpleStickExtents[nStick].axis[nAxis].sMin) {
        ctx->m_SimpleStickExtents[nStick].axis[nAxis].sMin = sRawValue;
    }
-        return (Sint16)HIDAPI_RemapVal(sRawValue, ctx->m_SimpleStickExtents[nStick].axis[nAxis].sMin, 0, SDL_MIN_SINT16, 0);
-    }
+
+    return (Sint16)HIDAPI_RemapVal(sRawValue, ctx->m_SimpleStickExtents[nStick].axis[nAxis].sMin, ctx->m_SimpleStickExtents[nStick].axis[nAxis].sMax, SDL_MIN_SINT16, SDL_MAX_SINT16);
 }

 static Uint8 RemapButton(SDL_DriverSwitch_Context *ctx, Uint8 button)
--- a/src/render/vitagxm/SDL_render_vita_gxm.c
+++ b/src/render/vitagxm/SDL_render_vita_gxm.c
@ -820,35 +820,6 @@ static SceGxmTextureAddrMode TranslateAddressMode(SDL_TextureAddressMode mode)
    }
 }

-static void ClampCliprectToViewport(SDL_Rect *clip, const SDL_Rect *viewport)
-{
-    int max_x_v, max_y_v, max_x_c, max_y_c;
-
-    if (clip->x < 0) {
-        clip->w += clip->x;
-        clip->x = 0;
-    }
-
-    if (clip->y < 0) {
-        clip->h += clip->y;
-        clip->y = 0;
-    }
-
-    max_x_c = clip->x + clip->w;
-    max_y_c = clip->y + clip->h;
-
-    max_x_v = viewport->x + viewport->w;
-    max_y_v = viewport->y + viewport->h;
-
-    if (max_x_c > max_x_v) {
-        clip->w -= (max_x_v - max_x_c);
-    }
-
-    if (max_y_c > max_y_v) {
-        clip->h -= (max_y_v - max_y_c);
-    }
-}
-
 static bool SetDrawState(VITA_GXM_RenderData *data, const SDL_RenderCommand *cmd)
 {
    SDL_Texture *texture = cmd->data.draw.texture;
@ -891,13 +862,9 @@ static bool SetDrawState(VITA_GXM_RenderData *data, const SDL_RenderCommand *cmd
        data->drawstate.cliprect_enabled_dirty = false;
    }

-    if ((data->drawstate.cliprect_enabled || data->drawstate.viewport_is_set) && data->drawstate.cliprect_dirty) {
-        SDL_Rect rect;
-        SDL_copyp(&rect, &data->drawstate.cliprect);
-        if (data->drawstate.viewport_is_set) {
-            ClampCliprectToViewport(&rect, &data->drawstate.viewport);
-        }
-        set_clip_rectangle(data, rect.x, rect.y, rect.x + rect.w, rect.y + rect.h);
+    if (data->drawstate.cliprect_enabled && data->drawstate.cliprect_dirty) {
+        const SDL_Rect *rect = &data->drawstate.cliprect;
+        set_clip_rectangle(data, rect->x, rect->y, rect->x + rect->w, rect->y + rect->h);
        data->drawstate.cliprect_dirty = false;
    }

@ -985,30 +952,19 @@ static void VITA_GXM_InvalidateCachedState(SDL_Renderer *renderer)
 static bool VITA_GXM_RunCommandQueue(SDL_Renderer *renderer, SDL_RenderCommand *cmd, void *vertices, size_t vertsize)
 {
    VITA_GXM_RenderData *data = (VITA_GXM_RenderData *)renderer->internal;
-    int w, h;
-
    StartDrawing(renderer);

    data->drawstate.target = renderer->target;
    if (!data->drawstate.target) {
+        int w, h;
        SDL_GetWindowSizeInPixels(renderer->window, &w, &h);
-    } else {
-        float fw, fh;
-        if (!SDL_GetTextureSize(renderer->target, &fw, &fh)) {
-            w = data->drawstate.drawablew;
-            h = data->drawstate.drawableh;
-        } else {
-            w = (int)SDL_roundf(fw);
-            h = (int)SDL_roundf(fh);
-        }
-    }
-
        if ((w != data->drawstate.drawablew) || (h != data->drawstate.drawableh)) {
            data->drawstate.viewport_dirty = true; // if the window dimensions changed, invalidate the current viewport, etc.
            data->drawstate.cliprect_dirty = true;
            data->drawstate.drawablew = w;
            data->drawstate.drawableh = h;
        }
+    }

    while (cmd) {
        switch (cmd->command) {
@ -1020,16 +976,6 @@ static bool VITA_GXM_RunCommandQueue(SDL_Renderer *renderer, SDL_RenderCommand *
                SDL_copyp(viewport, &cmd->data.viewport.rect);
                data->drawstate.viewport_dirty = true;
                data->drawstate.cliprect_dirty = true;
-                data->drawstate.viewport_is_set = viewport->x != 0 || viewport->y != 0 || viewport->w != data->drawstate.drawablew || viewport->h != data->drawstate.drawableh;
-                if (!data->drawstate.cliprect_enabled) {
-                    if (data->drawstate.viewport_is_set) {
-                        SDL_copyp(&data->drawstate.cliprect, viewport);
-                        data->drawstate.cliprect.x = 0;
-                        data->drawstate.cliprect.y = 0;
-                    } else {
-                        data->drawstate.cliprect_enabled_dirty = true;
-                    }
-                }
            }
            break;
        }
@ -1037,15 +983,9 @@ static bool VITA_GXM_RunCommandQueue(SDL_Renderer *renderer, SDL_RenderCommand *
        case SDL_RENDERCMD_SETCLIPRECT:
        {
            const SDL_Rect *rect = &cmd->data.cliprect.rect;
-            const SDL_Rect *viewport = &data->drawstate.viewport;
            if (data->drawstate.cliprect_enabled != cmd->data.cliprect.enabled) {
                data->drawstate.cliprect_enabled = cmd->data.cliprect.enabled;
                data->drawstate.cliprect_enabled_dirty = true;
-                if (!data->drawstate.cliprect_enabled && data->drawstate.viewport_is_set) {
-                    SDL_copyp(&data->drawstate.cliprect, viewport);
-                    data->drawstate.cliprect.x = 0;
-                    data->drawstate.cliprect.y = 0;
-                }
            }

            if (SDL_memcmp(&data->drawstate.cliprect, rect, sizeof(*rect)) != 0) {
--- a/src/render/vitagxm/SDL_render_vita_gxm_types.h
+++ b/src/render/vitagxm/SDL_render_vita_gxm_types.h
@ -105,7 +105,6 @@ typedef struct
 {
    SDL_Rect viewport;
    bool viewport_dirty;
-    bool viewport_is_set;
    SDL_Texture *texture;
    SDL_Texture *target;
    SDL_FColor color;
--- a/src/video/SDL_video.c
+++ b/src/video/SDL_video.c
@ -3672,10 +3672,6 @@ bool SDL_SetWindowParent(SDL_Window *window, SDL_Window *parent)
        CHECK_WINDOW_NOT_POPUP(parent, false);
    }

-    if (window == parent) {
-        return SDL_SetError("Cannot set the parent of a window to itself.");
-    }
-
    if (!_this->SetWindowParent) {
        return SDL_Unsupported();
    }
@ -4139,7 +4135,7 @@ void SDL_OnWindowLiveResizeUpdate(SDL_Window *window)
        SDL_IterateMainCallbacks(false);
    } else {
        // Send an expose event so the application can redraw
-        SDL_SendWindowEvent(window, SDL_EVENT_WINDOW_EXPOSED, 1, 0);
+        SDL_SendWindowEvent(window, SDL_EVENT_WINDOW_EXPOSED, 0, 0);
    }

    SDL_PumpEventMaintenance();
--- a/src/video/android/SDL_androidvulkan.c
+++ b/src/video/android/SDL_androidvulkan.c
@ -110,7 +110,8 @@ void Android_Vulkan_UnloadLibrary(SDL_VideoDevice *_this)
    }
 }

-char const * const *Android_Vulkan_GetInstanceExtensions(SDL_VideoDevice *_this, Uint32 *count)
+char const* const* Android_Vulkan_GetInstanceExtensions(SDL_VideoDevice *_this,
+                                              Uint32 *count)
 {
    static const char *const extensionsForAndroid[] = {
        VK_KHR_SURFACE_EXTENSION_NAME, VK_KHR_ANDROID_SURFACE_EXTENSION_NAME
--- a/src/video/cocoa/SDL_cocoavulkan.m
+++ b/src/video/cocoa/SDL_cocoavulkan.m
@ -161,7 +161,8 @@ void Cocoa_Vulkan_UnloadLibrary(SDL_VideoDevice *_this)
    }
 }

-char const * const *Cocoa_Vulkan_GetInstanceExtensions(SDL_VideoDevice *_this, Uint32 *count)
+char const* const* Cocoa_Vulkan_GetInstanceExtensions(SDL_VideoDevice *_this,
+                                            Uint32 *count)
 {
    static const char *const extensionsForCocoa[] = {
        VK_KHR_SURFACE_EXTENSION_NAME, VK_EXT_METAL_SURFACE_EXTENSION_NAME, VK_KHR_PORTABILITY_ENUMERATION_EXTENSION_NAME
--- a/src/video/kmsdrm/SDL_kmsdrmvulkan.c
+++ b/src/video/kmsdrm/SDL_kmsdrmvulkan.c
@ -140,7 +140,8 @@ void KMSDRM_Vulkan_UnloadLibrary(SDL_VideoDevice *_this)
 // members of the VkInstanceCreateInfo struct passed to
 // vkCreateInstance().
 /*********************************************************************/
-char const * const *KMSDRM_Vulkan_GetInstanceExtensions(SDL_VideoDevice *_this, Uint32 *count)
+char const* const* KMSDRM_Vulkan_GetInstanceExtensions(SDL_VideoDevice *_this,
+                                             Uint32 *count)
 {
    static const char *const extensionsForKMSDRM[] = {
        VK_KHR_SURFACE_EXTENSION_NAME, VK_KHR_DISPLAY_EXTENSION_NAME
--- a/src/video/uikit/SDL_uikitvulkan.m
+++ b/src/video/uikit/SDL_uikitvulkan.m
@ -167,7 +167,8 @@ void UIKit_Vulkan_UnloadLibrary(SDL_VideoDevice *_this)
    }
 }

-char const * const *UIKit_Vulkan_GetInstanceExtensions(SDL_VideoDevice *_this, Uint32 *count)
+char const* const* UIKit_Vulkan_GetInstanceExtensions(SDL_VideoDevice *_this,
+                                            Uint32 *count)
 {
    static const char *const extensionsForUIKit[] = {
        VK_KHR_SURFACE_EXTENSION_NAME, VK_EXT_METAL_SURFACE_EXTENSION_NAME
--- a/src/video/vivante/SDL_vivantevulkan.c
+++ b/src/video/vivante/SDL_vivantevulkan.c
@ -117,7 +117,8 @@ void VIVANTE_Vulkan_UnloadLibrary(SDL_VideoDevice *_this)
    }
 }

-char const * const *VIVANTE_Vulkan_GetInstanceExtensions(SDL_VideoDevice *_this, Uint32 *count)
+char const* const* VIVANTE_Vulkan_GetInstanceExtensions(SDL_VideoDevice *_this,
+                                              Uint32 *count)
 {
    static const char *const extensionsForVivante[] = {
        VK_KHR_SURFACE_EXTENSION_NAME, VK_KHR_DISPLAY_EXTENSION_NAME
--- a/src/video/windows/SDL_windowsevents.c
+++ b/src/video/windows/SDL_windowsevents.c
@ -701,10 +701,6 @@ static void WIN_HandleRawMouseInput(Uint64 timestamp, SDL_VideoData *data, HANDL
            float fAmount = (float)amount / WHEEL_DELTA;
            SDL_SendMouseWheel(WIN_GetEventTimestamp(), window, mouseID, fAmount, 0.0f, SDL_MOUSEWHEEL_NORMAL);
        }
-
-        /* Invalidate the mouse button flags. If we don't do this then disabling raw input
-           will cause held down mouse buttons to persist when released. */
-        windowdata->mouse_button_flags = (WPARAM)-1;
    }
 }

--- a/src/video/windows/SDL_windowsgameinput.cpp
+++ b/src/video/windows/SDL_windowsgameinput.cpp
@ -279,9 +279,6 @@ static void GAMEINPUT_InitialMouseReading(WIN_GameInputData *data, SDL_Window *w
            bool down = ((state.buttons & mask) != 0);
            SDL_SendMouseButton(timestamp, window, mouseID, GAMEINPUT_button_map[i], down);
        }
-
-        // Invalidate mouse button flags
-        window->internal->mouse_button_flags = (WPARAM)-1;
    }
 }

@ -311,9 +308,6 @@ static void GAMEINPUT_HandleMouseDelta(WIN_GameInputData *data, SDL_Window *wind
                    SDL_SendMouseButton(timestamp, window, mouseID, GAMEINPUT_button_map[i], down);
                }
            }
-
-            // Invalidate mouse button flags
-            window->internal->mouse_button_flags = (WPARAM)-1;
        }
        if (delta.wheelX || delta.wheelY) {
            float fAmountX = (float)delta.wheelX / WHEEL_DELTA;
--- a/src/video/windows/SDL_windowsvulkan.c
+++ b/src/video/windows/SDL_windowsvulkan.c
@ -110,7 +110,8 @@ void WIN_Vulkan_UnloadLibrary(SDL_VideoDevice *_this)
    }
 }

-char const * const *WIN_Vulkan_GetInstanceExtensions(SDL_VideoDevice *_this, Uint32 *count)
+char const* const* WIN_Vulkan_GetInstanceExtensions(SDL_VideoDevice *_this,
+                                          Uint32 *count)
 {
    static const char *const extensionsForWin32[] = {
        VK_KHR_SURFACE_EXTENSION_NAME, VK_KHR_WIN32_SURFACE_EXTENSION_NAME
--- a/src/video/x11/SDL_x11vulkan.c
+++ b/src/video/x11/SDL_x11vulkan.c
@ -144,7 +144,8 @@ void X11_Vulkan_UnloadLibrary(SDL_VideoDevice *_this)
    }
 }

-char const * const *X11_Vulkan_GetInstanceExtensions(SDL_VideoDevice *_this, Uint32 *count)
+char const* const* X11_Vulkan_GetInstanceExtensions(SDL_VideoDevice *_this,
+                                          Uint32 *count)
 {
    SDL_VideoData *videoData = _this->internal;
    if (videoData->vulkan_xlib_xcb_library) {
--- a/test/gamepadutils.c
+++ b/test/gamepadutils.c
@ -1611,7 +1611,8 @@ void RenderGamepadDisplay(GamepadDisplay *ctx, SDL_Gamepad *gamepad)
        has_gyro = SDL_GamepadHasSensor(gamepad, SDL_SENSOR_GYRO);

        if (has_accel || has_gyro) {
-            const int SENSOR_UPDATE_INTERVAL_MS = 100;
+            const float gyro_sensor_rate = has_gyro ? SDL_GetGamepadSensorDataRate(gamepad, SDL_SENSOR_GYRO) : 0;
+            const int SENSOR_UPDATE_INTERVAL_MS = gyro_sensor_rate > 0.0f ? (int)( 1000.0f / gyro_sensor_rate ) : 100;
            Uint64 now = SDL_GetTicks();

            if (now >= ctx->last_sensor_update + SENSOR_UPDATE_INTERVAL_MS) {
@ -1621,7 +1622,6 @@ void RenderGamepadDisplay(GamepadDisplay *ctx, SDL_Gamepad *gamepad)
                if (has_gyro) {
                    SDL_GetGamepadSensorData(gamepad, SDL_SENSOR_GYRO, ctx->gyro_data, SDL_arraysize(ctx->gyro_data));
                }
-                ctx->last_sensor_update = now;
            }

            if (has_accel) {
@ -1639,7 +1639,8 @@ void RenderGamepadDisplay(GamepadDisplay *ctx, SDL_Gamepad *gamepad)
                SDLTest_DrawString(ctx->renderer, x + center + 2.0f, y, text);
           

-                /* Display the testcontroller tool's evaluation of drift. This is also useful to get an average rate of turn in calibrated turntable tests. */
+                /* Display a smoothed version of the above for the sake of turntable tests */
+
                if (ctx->gyro_drift_correction_data[0] != 0.0f && ctx->gyro_drift_correction_data[2] != 0.0f && ctx->gyro_drift_correction_data[2] != 0.0f )
                {
                    y += ctx->button_height + 2.0f;
@ -1651,7 +1652,7 @@ void RenderGamepadDisplay(GamepadDisplay *ctx, SDL_Gamepad *gamepad)

            }

-
+            ctx->last_sensor_update = now;
        }
    }
    SDL_free(mapping);
--- a/test/gamepadutils.h
+++ b/test/gamepadutils.h
@ -143,7 +143,7 @@ extern void DestroyGamepadButton(GamepadButton *ctx);

 /* Gyro element Display */
 /* If you want to calbirate against a known rotation (i.e. a turn table test) Increase ACCELEROMETER_NOISE_THRESHOLD to about 5, or drift correction will be constantly reset.*/
-#define ACCELEROMETER_NOISE_THRESHOLD 0.5f
+#define ACCELEROMETER_NOISE_THRESHOLD 0.125f
 typedef struct Quaternion Quaternion;
 typedef struct GyroDisplay GyroDisplay;

--- a/test/testcontroller.c
+++ b/test/testcontroller.c
@ -1409,13 +1409,11 @@ static void UpdateGamepadOrientation( Uint64 delta_time_ns )

 static void HandleGamepadSensorEvent( SDL_Event* event )
 {
-    if (!controller) {
+    if (!controller)
        return;   
-    }

-    if (controller->id != event->gsensor.which) {
+    if (controller->id != event->gsensor.which)
        return;
-    }

    if (event->gsensor.sensor == SDL_SENSOR_GYRO) {
        HandleGamepadGyroEvent(event);
--- a/test/testffmpeg_vulkan.c
+++ b/test/testffmpeg_vulkan.c
@ -679,16 +679,6 @@ void SetupVulkanRenderProperties(VulkanVideoContext *context, SDL_PropertiesID p
    SDL_SetNumberProperty(props, SDL_PROP_RENDERER_CREATE_VULKAN_GRAPHICS_QUEUE_FAMILY_INDEX_NUMBER, context->graphicsQueueFamilyIndex);
 }

-#if LIBAVUTIL_VERSION_MAJOR >= 59
-static void AddQueueFamily(AVVulkanDeviceContext *ctx, int idx, int num, VkQueueFlagBits flags)
-{
-    AVVulkanDeviceQueueFamily *entry = &ctx->qf[ctx->nb_qf++];
-    entry->idx = idx;
-    entry->num = num;
-    entry->flags = flags;
-}
-#endif /* LIBAVUTIL_VERSION_MAJOR */
-
 void SetupVulkanDeviceContextData(VulkanVideoContext *context, AVVulkanDeviceContext *ctx)
 {
    ctx->get_proc_addr = context->vkGetInstanceProcAddr;
@ -700,12 +690,6 @@ void SetupVulkanDeviceContextData(VulkanVideoContext *context, AVVulkanDeviceCon
    ctx->nb_enabled_inst_extensions = context->instanceExtensionsCount;
    ctx->enabled_dev_extensions = context->deviceExtensions;
    ctx->nb_enabled_dev_extensions = context->deviceExtensionsCount;
-#if LIBAVUTIL_VERSION_MAJOR >= 59
-    AddQueueFamily(ctx, context->graphicsQueueFamilyIndex, context->graphicsQueueCount, VK_QUEUE_GRAPHICS_BIT);
-    AddQueueFamily(ctx, context->transferQueueFamilyIndex, context->transferQueueCount, VK_QUEUE_TRANSFER_BIT);
-    AddQueueFamily(ctx, context->computeQueueFamilyIndex, context->computeQueueCount, VK_QUEUE_COMPUTE_BIT);
-    AddQueueFamily(ctx, context->decodeQueueFamilyIndex, context->decodeQueueCount, VK_QUEUE_VIDEO_DECODE_BIT_KHR);
-#else
    ctx->queue_family_index = context->graphicsQueueFamilyIndex;
    ctx->nb_graphics_queues = context->graphicsQueueCount;
    ctx->queue_family_tx_index = context->transferQueueFamilyIndex;
@ -716,7 +700,6 @@ void SetupVulkanDeviceContextData(VulkanVideoContext *context, AVVulkanDeviceCon
    ctx->nb_encode_queues = 0;
    ctx->queue_family_decode_index = context->decodeQueueFamilyIndex;
    ctx->nb_decode_queues = context->decodeQueueCount;
-#endif /* LIBAVUTIL_VERSION_MAJOR */
 }

 static int CreateCommandBuffers(VulkanVideoContext *context, SDL_Renderer *renderer)
--- a/test/testmodal.c
+++ b/test/testmodal.c
@ -97,7 +97,7 @@ int main(int argc, char *argv[])
                    }

                    if (e.key.key == SDLK_M) {
-                        if (SDL_SetWindowParent(w2, w1)) {
+                        if (SDL_SetWindowParent(w2, w2)) {
                            if (SDL_SetWindowModal(w2, true)) {
                                SDL_SetWindowTitle(w2, "Modal Window");
                            }