From 7ca40027e0091f4bfd3ef3b1251cbac4a9066b29 Mon Sep 17 00:00:00 2001
From: Sasha Szpakowski <slime73@gmail.com>
Date: Thu, 17 Oct 2024 23:10:10 -0300
Subject: [PATCH] update SDL3 to libsdl-org/SDL@186c6e5

---
 libs/SDL3/.gitignore                          |    1 +
 libs/SDL3/CMakeLists.txt                      |   51 +-
 libs/SDL3/Xcode/SDL/Info-Framework.plist      |    4 +-
 .../Xcode/SDL/SDL.xcodeproj/project.pbxproj   |   30 +-
 libs/SDL3/Xcode/SDL/config.xcconfig           |   12 +
 libs/SDL3/Xcode/SDL/pkg-support/SDL.info      |    2 +-
 .../SDL3/Xcode/SDL/pkg-support/build.xcconfig |    8 +
 .../resources/CMake/sdl3-config-version.cmake |   57 -
 .../SDL3Config.cmake}                         |    0
 .../cmake/SDL3/sdl3-config-version.cmake      |   76 -
 .../cmake/SDL3/SDL3Config.cmake}              |   24 +-
 .../SDLTest/SDLTest.xcodeproj/project.pbxproj |    2 +-
 .../app/src/main/AndroidManifest.xml          |    6 +-
 .../main/java/org/libsdl/app/SDLActivity.java |    2 +-
 libs/SDL3/build-scripts/SDL_migration.cocci   |   13 +-
 libs/SDL3/build-scripts/androidbuildlibs.sh   |    2 +-
 libs/SDL3/build-scripts/build-release.py      | 1642 +++++---
 .../build-scripts/create-android-project.py   |    5 +-
 libs/SDL3/build-scripts/create-release.py     |   43 +
 libs/SDL3/build-scripts/create-release.sh     |    6 -
 libs/SDL3/build-scripts/fnsince.pl            |   39 +-
 .../pkg-support/android/INSTALL.md.in         |   23 +-
 .../pkg-support/android/__main__.py.in        |   14 +-
 .../android/cmake/SDL3ConfigVersion.cmake.in  |   38 +
 .../pkg-support/android/description.json.in   |    5 +
 .../build-scripts/pkg-support/mingw/Makefile  |    2 +
 .../msvc/cmake/SDL3Config.cmake.in}           |    6 +-
 .../msvc/cmake/SDL3ConfigVersion.cmake.in}    |   25 +-
 .../source/SDL_revision.h.cmake.in            |   41 +
 .../pkg-support/source/SDL_revision.h.in      |   56 +
 libs/SDL3/build-scripts/release-info.json     |  215 ++
 libs/SDL3/build-scripts/updaterev.sh          |    1 -
 .../android/FindSdlAndroidPlatform.cmake      |    5 +-
 libs/SDL3/cmake/sdlchecks.cmake               |   51 +-
 libs/SDL3/cmake/sdlcompilers.cmake            |    2 +-
 libs/SDL3/cmake/sdlcpu.cmake                  |   10 +-
 libs/SDL3/docs/README-android.md              |   28 +-
 libs/SDL3/docs/README-highdpi.md              |   30 +-
 libs/SDL3/docs/README-migration.md            |    2 +-
 libs/SDL3/docs/README-wayland.md              |    6 +
 libs/SDL3/docs/release_checklist.md           |   14 +-
 libs/SDL3/examples/CMakeLists.txt             |    1 +
 .../01-simple-playback/simple-playback.c      |    8 +-
 .../simple-playback-callback.c                |    8 +-
 .../examples/audio/03-load-wav/load-wav.c     |   10 +-
 .../camera/01-read-and-draw/read-and-draw.c   |   13 +-
 libs/SDL3/examples/game/01-snake/snake.c      |   61 +-
 .../pen/01-drawing-lines/drawing-lines.c      |    8 +-
 libs/SDL3/examples/renderer/01-clear/clear.c  |    6 +-
 .../renderer/02-primitives/primitives.c       |    6 +-
 libs/SDL3/examples/renderer/03-lines/lines.c  |    6 +-
 .../SDL3/examples/renderer/04-points/points.c |    6 +-
 .../renderer/05-rectangles/rectangles.c       |    6 +-
 .../examples/renderer/06-textures/textures.c  |   10 +-
 .../streaming-textures.c                      |    8 +-
 .../08-rotating-textures/rotating-textures.c  |   10 +-
 .../09-scaling-textures/scaling-textures.c    |   10 +-
 .../examples/renderer/10-geometry/geometry.c  |   10 +-
 .../renderer/11-color-mods/color-mods.c       |   10 +-
 .../examples/renderer/14-viewport/viewport.c  |   10 +-
 .../examples/renderer/15-cliprect/cliprect.c  |   10 +-
 .../renderer/17-read-pixels/read-pixels.c     |   12 +-
 .../renderer/18-debug-text/README.txt         |    4 +
 .../renderer/18-debug-text/debug-text.c       |   75 +
 libs/SDL3/examples/template.c                 |    6 +-
 libs/SDL3/include/SDL3/SDL.h                  |    2 +-
 libs/SDL3/include/SDL3/SDL_bits.h             |    2 +-
 libs/SDL3/include/SDL3/SDL_camera.h           |   18 +-
 libs/SDL3/include/SDL3/SDL_error.h            |   18 +
 libs/SDL3/include/SDL3/SDL_events.h           |   10 +-
 libs/SDL3/include/SDL3/SDL_gamepad.h          |   30 +-
 libs/SDL3/include/SDL3/SDL_gpu.h              |  114 +-
 libs/SDL3/include/SDL3/SDL_hints.h            |   31 +-
 libs/SDL3/include/SDL3/SDL_keyboard.h         |    8 +-
 libs/SDL3/include/SDL3/SDL_keycode.h          |  498 +--
 libs/SDL3/include/SDL3/SDL_log.h              |   16 +
 libs/SDL3/include/SDL3/SDL_main.h             |  105 +-
 libs/SDL3/include/SDL3/SDL_main_impl.h        |   17 +-
 libs/SDL3/include/SDL3/SDL_oldnames.h         |    8 +-
 libs/SDL3/include/SDL3/SDL_opengl.h           |  988 +++++
 libs/SDL3/include/SDL3/SDL_render.h           |   51 +
 libs/SDL3/include/SDL3/SDL_stdinc.h           |   45 +-
 libs/SDL3/include/SDL3/SDL_system.h           |   34 +-
 libs/SDL3/include/SDL3/SDL_timer.h            |   17 +-
 libs/SDL3/include/SDL3/SDL_version.h          |    2 +-
 libs/SDL3/include/SDL3/SDL_video.h            |   76 +-
 .../include/build_config/SDL_build_config.h   |    6 +-
 .../build_config/SDL_build_config.h.cmake     |    8 +-
 .../build_config/SDL_build_config_android.h   |    2 +
 .../SDL_build_config_emscripten.h             |  214 --
 .../build_config/SDL_build_config_ios.h       |    4 +
 .../build_config/SDL_build_config_macos.h     |    1 +
 .../build_config/SDL_build_config_minimal.h   |    3 +
 .../build_config/SDL_build_config_ngage.h     |    3 +
 .../build_config/SDL_build_config_xbox.h      |    3 +
 .../include/build_config/SDL_revision.h.cmake |   16 +-
 libs/SDL3/src/SDL.c                           |   63 +-
 libs/SDL3/src/SDL_assert.c                    |    8 +-
 libs/SDL3/src/SDL_error.c                     |   25 +-
 libs/SDL3/src/SDL_hashtable.c                 |   23 +-
 libs/SDL3/src/SDL_hints.c                     |   27 +-
 libs/SDL3/src/SDL_log.c                       |    8 +
 libs/SDL3/src/SDL_utils.c                     |    4 +-
 libs/SDL3/src/audio/SDL_audio.c               |    3 +
 libs/SDL3/src/audio/SDL_sysaudio.h            |    1 +
 libs/SDL3/src/audio/SDL_wave.c                |   18 +-
 .../audio/emscripten/SDL_emscriptenaudio.c    |    9 +-
 libs/SDL3/src/camera/SDL_camera.c             |    3 +
 libs/SDL3/src/camera/SDL_syscamera.h          |    3 +-
 libs/SDL3/src/camera/vita/SDL_camera_vita.c   |  258 ++
 libs/SDL3/src/core/SDL_core_unsupported.c     |    4 +-
 libs/SDL3/src/core/android/SDL_android.c      |    2 +-
 libs/SDL3/src/core/android/SDL_android.h      |    1 +
 libs/SDL3/src/core/linux/SDL_dbus.c           |    3 +-
 libs/SDL3/src/core/linux/SDL_sandbox.c        |   47 -
 libs/SDL3/src/core/linux/SDL_sandbox.h        |   37 -
 libs/SDL3/src/core/windows/SDL_windows.h      |    2 +-
 libs/SDL3/src/core/windows/version.rc         |    8 +-
 libs/SDL3/src/dialog/cocoa/SDL_cocoadialog.m  |    9 +-
 libs/SDL3/src/dialog/dummy/SDL_dummydialog.c  |    4 +
 libs/SDL3/src/dynapi/SDL_dynapi.c             |    5 -
 libs/SDL3/src/dynapi/SDL_dynapi.h             |    4 +-
 libs/SDL3/src/dynapi/SDL_dynapi.sym           |    7 +
 libs/SDL3/src/dynapi/SDL_dynapi_overrides.h   |    7 +
 libs/SDL3/src/dynapi/SDL_dynapi_procs.h       |    9 +-
 libs/SDL3/src/dynapi/gendynapi.py             |  468 ++-
 libs/SDL3/src/events/SDL_keyboard.c           |    7 +-
 libs/SDL3/src/file/SDL_iostream.c             |   21 +-
 libs/SDL3/src/gpu/SDL_gpu.c                   |   92 +-
 libs/SDL3/src/gpu/SDL_sysgpu.h                |  191 +-
 libs/SDL3/src/gpu/d3d11/SDL_gpu_d3d11.c       |   84 +-
 libs/SDL3/src/gpu/d3d12/SDL_gpu_d3d12.c       |   77 +-
 libs/SDL3/src/gpu/metal/SDL_gpu_metal.m       |  103 +-
 libs/SDL3/src/gpu/vulkan/SDL_gpu_vulkan.c     |  242 +-
 libs/SDL3/src/hidapi/SDL_hidapi.c             |    3 +-
 libs/SDL3/src/hidapi/android/hid.cpp          |  210 +-
 libs/SDL3/src/joystick/SDL_gamepad.c          |   34 +-
 libs/SDL3/src/joystick/SDL_gamepad_c.h        |    2 +-
 libs/SDL3/src/joystick/SDL_gamepad_db.h       |    5 +-
 libs/SDL3/src/joystick/SDL_joystick.c         |   72 +-
 libs/SDL3/src/joystick/SDL_joystick_c.h       |    5 +-
 .../src/joystick/SDL_steam_virtual_gamepad.c  |    5 +
 libs/SDL3/src/joystick/SDL_sysjoystick.h      |    1 +
 .../SDL3/src/joystick/apple/SDL_mfijoystick.m |   15 +-
 libs/SDL3/src/joystick/bsd/SDL_bsdjoystick.c  |    2 +-
 .../src/joystick/darwin/SDL_iokitjoystick.c   |   14 +-
 .../src/joystick/gdk/SDL_gameinputjoystick.c  |    9 +-
 .../src/joystick/hidapi/SDL_hidapi_steam.c    |    3 +
 .../src/joystick/hidapi/SDL_hidapi_xbox360.c  |   52 +-
 .../src/joystick/hidapi/SDL_hidapi_xboxone.c  |   11 +-
 .../src/joystick/hidapi/SDL_hidapijoystick.c  |   64 +-
 .../joystick/hidapi/SDL_hidapijoystick_c.h    |    1 +
 .../SDL3/src/joystick/linux/SDL_sysjoystick.c |    8 +-
 .../src/joystick/windows/SDL_dinputjoystick.c |    6 +-
 .../joystick/windows/SDL_rawinputjoystick.c   |    2 +
 .../windows/SDL_windows_gaming_input.c        |   23 +-
 .../src/joystick/windows/SDL_xinputjoystick.c |   19 +-
 libs/SDL3/src/libm/e_exp.c                    |    2 +-
 libs/SDL3/src/main/SDL_main_callbacks.c       |    5 +
 .../src/main/generic/SDL_sysmain_callbacks.c  |    2 +-
 .../src/process/windows/SDL_windowsprocess.c  |    8 +
 libs/SDL3/src/render/SDL_render.c             |  131 +-
 libs/SDL3/src/render/SDL_render_debug_font.h  | 2331 ++++++++++++
 libs/SDL3/src/render/SDL_sysrender.h          |    2 +
 libs/SDL3/src/render/gpu/SDL_render_gpu.c     |    8 +-
 libs/SDL3/src/render/gpu/SDL_shaders_gpu.c    |    8 +-
 libs/SDL3/src/render/opengl/SDL_render_gl.c   |   15 +-
 libs/SDL3/src/render/opengl/SDL_shaders_gl.c  |   14 +-
 .../src/render/opengles2/SDL_render_gles2.c   |   15 +-
 .../src/render/vitagxm/SDL_render_vita_gxm.c  |   18 +-
 .../vitagxm/SDL_render_vita_gxm_tools.c       |    8 +-
 .../src/render/vulkan/SDL_render_vulkan.c     |  155 +-
 libs/SDL3/src/stdlib/SDL_string.c             |   20 +
 libs/SDL3/src/test/SDL_test_font.c            | 3363 +----------------
 libs/SDL3/src/thread/generic/SDL_syscond.c    |   94 +-
 libs/SDL3/src/thread/pthread/SDL_systhread.c  |    8 +
 libs/SDL3/src/thread/windows/SDL_systhread.c  |   13 +-
 libs/SDL3/src/timer/SDL_timer.c               |   80 +-
 libs/SDL3/src/timer/windows/SDL_systimer.c    |   50 +-
 libs/SDL3/src/video/SDL_RLEaccel.c            |   13 +-
 libs/SDL3/src/video/SDL_blit.h                |   46 +-
 libs/SDL3/src/video/SDL_blit_0.c              |   68 +-
 libs/SDL3/src/video/SDL_blit_1.c              |   16 +-
 libs/SDL3/src/video/SDL_blit_A.c              |   22 +-
 libs/SDL3/src/video/SDL_blit_N.c              |   55 +-
 libs/SDL3/src/video/SDL_bmp.c                 |  107 +-
 libs/SDL3/src/video/SDL_clipboard.c           |   10 +-
 libs/SDL3/src/video/SDL_egl.c                 |    5 +-
 libs/SDL3/src/video/SDL_pixels.c              |   12 +-
 libs/SDL3/src/video/SDL_rect_impl.h           |    4 +-
 libs/SDL3/src/video/SDL_surface.c             |    6 +
 libs/SDL3/src/video/SDL_sysvideo.h            |    1 +
 libs/SDL3/src/video/SDL_video.c               |   26 +-
 libs/SDL3/src/video/SDL_yuv.c                 |   31 +-
 libs/SDL3/src/video/cocoa/SDL_cocoaopengl.m   |    2 +-
 libs/SDL3/src/video/cocoa/SDL_cocoawindow.m   |   10 +-
 .../emscripten/SDL_emscriptenframebuffer.c    |    2 +-
 .../video/emscripten/SDL_emscriptenmouse.c    |    2 +-
 libs/SDL3/src/video/uikit/SDL_uikitview.m     |   23 +-
 libs/SDL3/src/video/uikit/SDL_uikitwindow.m   |    2 +
 .../video/wayland/SDL_waylanddatamanager.c    |    4 +-
 .../src/video/wayland/SDL_waylandevents.c     |   38 +-
 .../SDL3/src/video/wayland/SDL_waylandvideo.c |  260 +-
 .../SDL3/src/video/wayland/SDL_waylandvideo.h |    5 +-
 .../src/video/windows/SDL_windowsevents.c     |    2 +-
 .../SDL3/src/video/windows/SDL_windowsmodes.c |    7 +-
 .../src/video/windows/SDL_windowswindow.c     |   75 +-
 libs/SDL3/src/video/x11/SDL_x11events.c       |    7 +
 libs/SDL3/src/video/x11/SDL_x11opengles.c     |   29 +-
 libs/SDL3/src/video/yuv2rgb/yuv_rgb_common.h  |    1 +
 .../SDL3/src/video/yuv2rgb/yuv_rgb_internal.h |    8 +-
 libs/SDL3/test/CMakeLists.txt                 |    7 +-
 libs/SDL3/test/LICENSE.txt                    |   41 +
 libs/SDL3/test/README                         |   18 -
 libs/SDL3/test/childprocess.c                 |   19 +
 libs/SDL3/test/testaudio-art.txt              |    8 -
 libs/SDL3/test/testautomation_mouse.c         |   12 +-
 libs/SDL3/test/testautomation_rect.c          |   11 +
 libs/SDL3/test/testautomation_stdlib.c        |   10 +-
 libs/SDL3/test/testdrawchessboard.c           |   28 +-
 libs/SDL3/test/testprocess.c                  |    4 +
 libs/SDL3/test/testshape.c                    |    7 +-
 libs/SDL3/test/testtimer.c                    |   32 +-
 libs/SDL3/test/testyuv.c                      |  144 +-
 224 files changed, 8865 insertions(+), 6441 deletions(-)
 create mode 100644 libs/SDL3/Xcode/SDL/config.xcconfig
 create mode 100644 libs/SDL3/Xcode/SDL/pkg-support/build.xcconfig
 delete mode 100644 libs/SDL3/Xcode/SDL/pkg-support/resources/CMake/sdl3-config-version.cmake
 rename libs/SDL3/Xcode/SDL/pkg-support/resources/{CMake/sdl3-config.cmake => cmake/SDL3Config.cmake} (100%)
 delete mode 100644 libs/SDL3/Xcode/SDL/pkg-support/resources/share/cmake/SDL3/sdl3-config-version.cmake
 rename libs/SDL3/Xcode/SDL/pkg-support/{resources/share/cmake/SDL3/sdl3-config.cmake => share/cmake/SDL3/SDL3Config.cmake} (87%)
 create mode 100644 libs/SDL3/build-scripts/create-release.py
 delete mode 100644 libs/SDL3/build-scripts/create-release.sh
 create mode 100644 libs/SDL3/build-scripts/pkg-support/android/cmake/SDL3ConfigVersion.cmake.in
 create mode 100644 libs/SDL3/build-scripts/pkg-support/android/description.json.in
 rename libs/SDL3/{VisualC/pkg-support/cmake/sdl3-config.cmake => build-scripts/pkg-support/msvc/cmake/SDL3Config.cmake.in} (95%)
 rename libs/SDL3/{VisualC/pkg-support/cmake/sdl3-config-version.cmake => build-scripts/pkg-support/msvc/cmake/SDL3ConfigVersion.cmake.in} (55%)
 create mode 100644 libs/SDL3/build-scripts/pkg-support/source/SDL_revision.h.cmake.in
 create mode 100644 libs/SDL3/build-scripts/pkg-support/source/SDL_revision.h.in
 create mode 100644 libs/SDL3/build-scripts/release-info.json
 create mode 100644 libs/SDL3/examples/renderer/18-debug-text/README.txt
 create mode 100644 libs/SDL3/examples/renderer/18-debug-text/debug-text.c
 delete mode 100644 libs/SDL3/include/build_config/SDL_build_config_emscripten.h
 create mode 100644 libs/SDL3/src/camera/vita/SDL_camera_vita.c
 delete mode 100644 libs/SDL3/src/core/linux/SDL_sandbox.c
 delete mode 100644 libs/SDL3/src/core/linux/SDL_sandbox.h
 create mode 100644 libs/SDL3/src/render/SDL_render_debug_font.h
 create mode 100644 libs/SDL3/test/LICENSE.txt
 delete mode 100644 libs/SDL3/test/README
 delete mode 100644 libs/SDL3/test/testaudio-art.txt

diff --git a/libs/SDL3/.gitignore b/libs/SDL3/.gitignore
index 3c45e91b7..a92f38693 100644
--- a/libs/SDL3/.gitignore
+++ b/libs/SDL3/.gitignore
@@ -51,6 +51,7 @@ cmake-build-*
 .DS_Store
 xcuserdata
 *.xcworkspace
+Xcode/build.xcconfig
 
 # for Visual Studio Code
 .vscode/
diff --git a/libs/SDL3/CMakeLists.txt b/libs/SDL3/CMakeLists.txt
index 24c03d0a7..1bade6c07 100644
--- a/libs/SDL3/CMakeLists.txt
+++ b/libs/SDL3/CMakeLists.txt
@@ -5,7 +5,7 @@ if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
 endif()
 
 # See docs/release_checklist.md
-project(SDL3 LANGUAGES C VERSION "3.1.3")
+project(SDL3 LANGUAGES C VERSION "3.1.5")
 
 if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
   set(SDL3_SUBPROJECT OFF)
@@ -1042,6 +1042,8 @@ if(SDL_LIBC)
   cmake_pop_check_state()
 
   if(NOT WINDOWS)
+    check_symbol_exists(fdatasync "unistd.h" HAVE_FDATASYNC)
+    check_symbol_exists(gethostname "unistd.h" HAVE_GETHOSTNAME)
     check_symbol_exists(getpagesize "unistd.h" HAVE_GETPAGESIZE)
     check_symbol_exists(sigaction "signal.h" HAVE_SIGACTION)
     check_symbol_exists(setjmp "setjmp.h" HAVE_SETJMP)
@@ -1415,13 +1417,20 @@ if(ANDROID)
         set(javadoc_index_html "${javadocdir}/index.html")
         add_custom_command(
           OUTPUT "${javadoc_index_html}"
-          COMMAND ${CMAKE_COMMAND} -E rm -rf "${javadocdir}"
+          COMMAND ${CMAKE_COMMAND} -E rm -rf "${javadocdir}" "${javadocjar}"
           COMMAND ${Java_JAVADOC_EXECUTABLE} -encoding utf8 -d "${javadocdir}"
             -classpath "${path_android_jar}"
             -author -use -version ${SDL_JAVA_SOURCES}
           DEPENDS ${SDL_JAVA_SOURCES} "${path_android_jar}"
         )
-        add_custom_target(SDL3-javadoc ALL DEPENDS "${javadoc_index_html}")
+        add_custom_command(
+          OUTPUT "${javadocjar}"
+          COMMAND ${Java_JAR_EXECUTABLE} -c -f "${javadocjar}"
+            -C "${javadocdir}" *
+          WORKING_DIRECTORY "${javadocdir}"
+          DEPENDS ${javadoc_index_html}
+        )
+        add_custom_target(SDL3-javadoc ALL DEPENDS "${javadoc_index_html}" "${javadocjar}")
         set_property(TARGET SDL3-javadoc PROPERTY OUTPUT_DIR "${javadocdir}")
       endif()
     endif()
@@ -1717,7 +1726,6 @@ elseif(UNIX AND NOT APPLE AND NOT RISCOS AND NOT HAIKU)
     sdl_sources(
       "${SDL3_SOURCE_DIR}/src/core/linux/SDL_evdev_capabilities.c"
       "${SDL3_SOURCE_DIR}/src/core/linux/SDL_threadprio.c"
-      "${SDL3_SOURCE_DIR}/src/core/linux/SDL_sandbox.c"
     )
 
     # src/core/unix/*.c is included in a generic if(UNIX) section, elsewhere.
@@ -2518,7 +2526,9 @@ elseif(VITA)
   sdl_glob_sources("${SDL3_SOURCE_DIR}/src/filesystem/vita/*.c")
   set(HAVE_SDL_FILESYSTEM TRUE)
 
-  # !!! FIXME: do we need a FSops implementation for this?
+  set(SDL_FSOPS_POSIX 1)
+  sdl_sources("${SDL3_SOURCE_DIR}/src/filesystem/posix/SDL_sysfsops.c")
+  set(HAVE_SDL_FSOPS TRUE)
 
   if(SDL_JOYSTICK)
     set(SDL_JOYSTICK_VITA 1)
@@ -2560,6 +2570,12 @@ elseif(VITA)
     sdl_glob_sources("${SDL3_SOURCE_DIR}/src/sensor/vita/*.c")
   endif()
 
+  if(SDL_CAMERA)
+    set(SDL_CAMERA_DRIVER_VITA 1)
+    set(HAVE_CAMERA TRUE)
+    sdl_glob_sources("${SDL3_SOURCE_DIR}/src/camera/vita/*.c")
+  endif()
+
   if(SDL_VIDEO)
     set(SDL_VIDEO_DRIVER_VITA 1)
     sdl_glob_sources("${SDL3_SOURCE_DIR}/src/video/vita/*.c")
@@ -2640,6 +2656,7 @@ elseif(VITA)
         SceMotion_stub
         ScePower_stub
         SceProcessmgr_stub
+        SceCamera_stub
     )
   endif()
 
@@ -3044,21 +3061,17 @@ foreach(_hdr IN LISTS SDL3_INCLUDE_FILES)
   endif()
 endforeach()
 
-set(SDL_REVISION "" CACHE STRING "Custom SDL revision (overrides SDL_REVISION_SUFFIX)")
-if(NOT SDL_REVISION)
-  set(SDL_REVISION_SUFFIX "" CACHE STRING "Suffix for the SDL revision")
-  if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/VERSION.txt")
-    # If VERSION.txt exists, it contains the SDL version
-    file(READ "${CMAKE_CURRENT_SOURCE_DIR}/VERSION.txt" SDL_REVISION_CENTER)
-    string(STRIP "${SDL_REVISION_CENTER}" SDL_REVISION_CENTER)
+# If REVISION.txt exists, then we are building from a SDL release.
+# SDL_revision.h(.cmake) in source releases have SDL_REVISION baked into them.
+if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/REVISION.txt")
+  set(SDL_REVISION "" CACHE STRING "Custom SDL revision")
+  if(SDL_REVISION)
+    set(SDL_REVISION_CENTER "${SDL_VERSION_MAJOR}.${SDL_VERSION_MINOR}.${SDL_VERSION_MICRO}-${SDL_REVISION}")
   else()
-    # If VERSION does not exist, use git to calculate a version
+    # If SDL_REVISION is not overrided, use git to describe
     git_describe(SDL_REVISION_CENTER)
-    if(NOT SDL_REVISION_CENTER)
-      set(SDL_REVISION_CENTER "${SDL3_VERSION}-no-vcs")
-    endif()
   endif()
-  set(SDL_REVISION "SDL-${SDL_REVISION_CENTER}${SDL_REVISION_SUFFIX}")
+  set(SDL_REVISION "SDL3-${SDL_REVISION_CENTER}")
 endif()
 
 execute_process(COMMAND "${CMAKE_COMMAND}" -E make_directory "${SDL3_BINARY_DIR}/include/SDL3")
@@ -3645,7 +3658,7 @@ if(NOT SDL_DISABLE_INSTALL)
       )
     endif()
     if(TARGET SDL3-javasources)
-      install(FILES  "${SDL3_BINARY_DIR}/SDL3-${SDL3_VERSION}-sources.jar"
+      install(FILES "${SDL3_BINARY_DIR}/SDL3-${SDL3_VERSION}-sources.jar"
         DESTINATION "${SDL_INSTALL_JAVADIR}/SDL3")
     endif()
   endif()
@@ -3659,7 +3672,7 @@ if(NOT SDL_DISABLE_INSTALL)
     )
     if(TARGET SDL3-javadoc)
       set(SDL_INSTALL_JAVADOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/javadoc" CACHE PATH "Path where to install SDL3 javadoc")
-      install(DIRECTORY "${SDL3_BINARY_DIR}/docs/javadoc/"
+      install(FILES "${SDL3_BINARY_DIR}/SDL3-${SDL3_VERSION}-javadoc.jar"
         DESTINATION "${SDL_INSTALL_JAVADOCDIR}/SDL3")
     endif()
   endif()
diff --git a/libs/SDL3/Xcode/SDL/Info-Framework.plist b/libs/SDL3/Xcode/SDL/Info-Framework.plist
index 5cd967ee3..41879e24f 100644
--- a/libs/SDL3/Xcode/SDL/Info-Framework.plist
+++ b/libs/SDL3/Xcode/SDL/Info-Framework.plist
@@ -19,10 +19,10 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.1.3</string>
+	<string>3.1.5</string>
 	<key>CFBundleSignature</key>
 	<string>SDLX</string>
 	<key>CFBundleVersion</key>
-	<string>3.1.3</string>
+	<string>3.1.5</string>
 </dict>
 </plist>
diff --git a/libs/SDL3/Xcode/SDL/SDL.xcodeproj/project.pbxproj b/libs/SDL3/Xcode/SDL/SDL.xcodeproj/project.pbxproj
index de62829a9..bfd2584dc 100644
--- a/libs/SDL3/Xcode/SDL/SDL.xcodeproj/project.pbxproj
+++ b/libs/SDL3/Xcode/SDL/SDL.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 55;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXAggregateTarget section */
@@ -43,7 +43,7 @@
 		000080903BC03006F24E0000 /* SDL_filesystem.c in Sources */ = {isa = PBXBuildFile; fileRef = 00002B010DB1A70931C20000 /* SDL_filesystem.c */; };
 		000095FA1BDE436CF3AF0000 /* SDL_time.c in Sources */ = {isa = PBXBuildFile; fileRef = 0000641A9BAC11AB3FBE0000 /* SDL_time.c */; };
 		000098E9DAA43EF6FF7F0000 /* SDL_camera.c in Sources */ = {isa = PBXBuildFile; fileRef = 0000035D38C3899C7EFD0000 /* SDL_camera.c */; };
-		0000A4DA2F45A31DC4F00000 /* SDL_sysmain_callbacks.m in Sources */ = {isa = PBXBuildFile; fileRef = 0000BB287BA0A0178C1A0000 /* SDL_sysmain_callbacks.m */; platformFilters = (ios, maccatalyst, macos, tvos, watchos, ); };
+		0000A4DA2F45A31DC4F00000 /* SDL_sysmain_callbacks.m in Sources */ = {isa = PBXBuildFile; fileRef = 0000BB287BA0A0178C1A0000 /* SDL_sysmain_callbacks.m */; };
 		0000D5B526B85DE7AB1C0000 /* SDL_cocoapen.m in Sources */ = {isa = PBXBuildFile; fileRef = 0000CCA310B73A7B59910000 /* SDL_cocoapen.m */; };
 		007317A40858DECD00B2BC32 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0073179D0858DECD00B2BC32 /* Cocoa.framework */; platformFilters = (macos, ); };
 		007317A60858DECD00B2BC32 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0073179F0858DECD00B2BC32 /* IOKit.framework */; platformFilters = (ios, maccatalyst, macos, ); };
@@ -421,8 +421,8 @@
 		F37A8E1A28405AA100C38E95 /* CMake in Resources */ = {isa = PBXBuildFile; fileRef = F37A8E1928405AA100C38E95 /* CMake */; };
 		F37E184E2B8C097D0098C111 /* SDL_camera.h in Headers */ = {isa = PBXBuildFile; fileRef = 000084ED0A56E3ED52F90000 /* SDL_camera.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		F37E18522BA50E760098C111 /* SDL_dialog.h in Headers */ = {isa = PBXBuildFile; fileRef = F37E18512BA50E750098C111 /* SDL_dialog.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		F37E18582BA50F3B0098C111 /* SDL_cocoadialog.m in Sources */ = {isa = PBXBuildFile; fileRef = F37E18572BA50F3B0098C111 /* SDL_cocoadialog.m */; platformFilters = (macos, ); };
-		F37E185A2BA50F450098C111 /* SDL_dummydialog.c in Sources */ = {isa = PBXBuildFile; fileRef = F37E18592BA50F450098C111 /* SDL_dummydialog.c */; platformFilters = (ios, maccatalyst, tvos, xros, ); };
+		F37E18582BA50F3B0098C111 /* SDL_cocoadialog.m in Sources */ = {isa = PBXBuildFile; fileRef = F37E18572BA50F3B0098C111 /* SDL_cocoadialog.m */; };
+		F37E185A2BA50F450098C111 /* SDL_dummydialog.c in Sources */ = {isa = PBXBuildFile; fileRef = F37E18592BA50F450098C111 /* SDL_dummydialog.c */; };
 		F37E185C2BAA3EF90098C111 /* SDL_time.h in Headers */ = {isa = PBXBuildFile; fileRef = F37E185B2BAA3EF90098C111 /* SDL_time.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		F37E18622BAA40090098C111 /* SDL_sysfilesystem.h in Headers */ = {isa = PBXBuildFile; fileRef = F37E18612BAA40090098C111 /* SDL_sysfilesystem.h */; };
 		F37E18642BAA40670098C111 /* SDL_time_c.h in Headers */ = {isa = PBXBuildFile; fileRef = F37E18632BAA40670098C111 /* SDL_time_c.h */; };
@@ -1049,6 +1049,7 @@
 		F3F528C82C29E1C300E6CC26 /* s_isnan.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = s_isnan.c; sourceTree = "<group>"; };
 		F3F528C92C29E1C300E6CC26 /* s_modf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = s_modf.c; sourceTree = "<group>"; };
 		F3F528CA2C29E1C300E6CC26 /* s_isinff.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = s_isinff.c; sourceTree = "<group>"; };
+		F3F7BE3B2CBD79D200C984AF /* config.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = config.xcconfig; sourceTree = "<group>"; };
 		F3F7D8AA2933074900816151 /* SDL_audio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_audio.h; path = SDL3/SDL_audio.h; sourceTree = "<group>"; };
 		F3F7D8AB2933074900816151 /* SDL_platform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_platform.h; path = SDL3/SDL_platform.h; sourceTree = "<group>"; };
 		F3F7D8AC2933074900816151 /* SDL_stdinc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_stdinc.h; path = SDL3/SDL_stdinc.h; sourceTree = "<group>"; };
@@ -1314,6 +1315,7 @@
 		0867D691FE84028FC02AAC07 /* SDLFramework */ = {
 			isa = PBXGroup;
 			children = (
+				F3F7BE3B2CBD79D200C984AF /* config.xcconfig */,
 				F5A2EF3900C6A39A01000001 /* BUGS.txt */,
 				F59C70FC00D5CB5801000001 /* pkg-support */,
 				0153844A006D81B07F000001 /* Public Headers */,
@@ -2793,7 +2795,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "set -ex\n\nmkdir -p build/dmg-tmp/share/cmake/SDL3\ncp -a build/SDL3.xcframework build/dmg-tmp/\n\ncp pkg-support/resources/License.txt build/dmg-tmp\ncp pkg-support/resources/ReadMe.txt build/dmg-tmp\ncp pkg-support/resources/share/cmake/SDL3/sdl3-config.cmake build/dmg-tmp/share/cmake/SDL3\ncp pkg-support/resources/share/cmake/SDL3/sdl3-config-version.cmake build/dmg-tmp/share/cmake/SDL3\n\n# remove the .DS_Store files if any (we may want to provide one in the future for fancy .dmgs)\nfind build/dmg-tmp -name .DS_Store -exec rm -f \"{}\" \\;\n\n# for fancy .dmg\nmkdir -p build/dmg-tmp/.logo\ncp pkg-support/resources/SDL_DS_Store build/dmg-tmp/.DS_Store\ncp pkg-support/sdl_logo.pdf build/dmg-tmp/.logo\n\n# create the dmg\nhdiutil create -ov -fs HFS+ -volname SDL3 -srcfolder build/dmg-tmp build/SDL3.dmg\n\n# clean up\nrm -rf build/dmg-tmp\n";
+			shellScript = "set -ex\n\nmkdir -p build/dmg-tmp/share/cmake/SDL3\ncp -a build/SDL3.xcframework build/dmg-tmp/\n\ncp pkg-support/resources/License.txt build/dmg-tmp\ncp pkg-support/resources/ReadMe.txt build/dmg-tmp\ncp pkg-support/share/cmake/SDL3/SDL3Config.cmake build/dmg-tmp/share/cmake/SDL3\ncp pkg-support/share/cmake/SDL3/SDL3ConfigVersion.cmake build/dmg-tmp/share/cmake/SDL3\n\n# remove the .DS_Store files if any (we may want to provide one in the future for fancy .dmgs)\nfind build/dmg-tmp -name .DS_Store -exec rm -f \"{}\" \\;\n\n# for fancy .dmg\nmkdir -p build/dmg-tmp/.logo\ncp pkg-support/resources/SDL_DS_Store build/dmg-tmp/.DS_Store\ncp pkg-support/sdl_logo.pdf build/dmg-tmp/.logo\n\n# create the dmg\nhdiutil create -ov -fs HFS+ -volname SDL3 -srcfolder build/dmg-tmp build/SDL3.dmg\n\n# clean up\nrm -rf build/dmg-tmp\n";
 		};
 		F3B38CF0296F63D1005DA6D3 /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -3079,8 +3081,8 @@
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				DEPLOYMENT_POSTPROCESSING = YES;
-				DYLIB_COMPATIBILITY_VERSION = 104.0.0;
-				DYLIB_CURRENT_VERSION = 104.0.0;
+				DYLIB_COMPATIBILITY_VERSION = 106.0.0;
+				DYLIB_CURRENT_VERSION = 106.0.0;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_ALTIVEC_EXTENSIONS = YES;
@@ -3089,6 +3091,7 @@
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 3;
+				GCC_PREPROCESSOR_DEFINITIONS = "$(CONFIG_PREPROCESSOR_DEFINITIONS)";
 				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
 				HEADER_SEARCH_PATHS = (
 					../../include,
@@ -3111,7 +3114,8 @@
 					"@loader_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
-				MARKETING_VERSION = 3.1.3;
+				MARKETING_VERSION = 3.1.5;
+				OTHER_LDFLAGS = "$(CONFIG_FRAMEWORK_LDFLAGS)";
 				PRODUCT_BUNDLE_IDENTIFIER = org.libsdl.SDL3;
 				PRODUCT_NAME = SDL3;
 				STRIP_STYLE = "non-global";
@@ -3124,6 +3128,7 @@
 		};
 		00CFA622106A567900758660 /* Release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = F3F7BE3B2CBD79D200C984AF /* config.xcconfig */;
 			buildSettings = {
 				CLANG_LINK_OBJC_RUNTIME = NO;
 				OTHER_LDFLAGS = "-liconv";
@@ -3137,8 +3142,8 @@
 				ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
-				DYLIB_COMPATIBILITY_VERSION = 104.0.0;
-				DYLIB_CURRENT_VERSION = 104.0.0;
+				DYLIB_COMPATIBILITY_VERSION = 106.0.0;
+				DYLIB_CURRENT_VERSION = 106.0.0;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -3147,6 +3152,7 @@
 				GCC_ENABLE_SSE3_EXTENSIONS = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = "$(CONFIG_PREPROCESSOR_DEFINITIONS)";
 				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
 				HEADER_SEARCH_PATHS = (
 					../../include,
@@ -3169,8 +3175,9 @@
 					"@loader_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
-				MARKETING_VERSION = 3.1.3;
+				MARKETING_VERSION = 3.1.5;
 				ONLY_ACTIVE_ARCH = YES;
+				OTHER_LDFLAGS = "$(CONFIG_FRAMEWORK_LDFLAGS)";
 				PRODUCT_BUNDLE_IDENTIFIER = org.libsdl.SDL3;
 				PRODUCT_NAME = SDL3;
 				STRIP_INSTALLED_PRODUCT = NO;
@@ -3183,6 +3190,7 @@
 		};
 		00CFA628106A568900758660 /* Debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = F3F7BE3B2CBD79D200C984AF /* config.xcconfig */;
 			buildSettings = {
 				CLANG_LINK_OBJC_RUNTIME = NO;
 				OTHER_LDFLAGS = "-liconv";
diff --git a/libs/SDL3/Xcode/SDL/config.xcconfig b/libs/SDL3/Xcode/SDL/config.xcconfig
new file mode 100644
index 000000000..eb9903006
--- /dev/null
+++ b/libs/SDL3/Xcode/SDL/config.xcconfig
@@ -0,0 +1,12 @@
+//
+//  config.xcconfig
+//
+
+// Configuration settings file format documentation can be found at:
+// https://help.apple.com/xcode/#/dev745c5c974
+
+// Include any optional config for this build
+#include? "build.xcconfig"
+
+CONFIG_PREPROCESSOR_DEFINITIONS = $(inherited) $(SDL_PREPROCESSOR_DEFINITIONS)
+CONFIG_FRAMEWORK_LDFLAGS = $(inherited)
diff --git a/libs/SDL3/Xcode/SDL/pkg-support/SDL.info b/libs/SDL3/Xcode/SDL/pkg-support/SDL.info
index 610ab5e70..670e3e9b2 100644
--- a/libs/SDL3/Xcode/SDL/pkg-support/SDL.info
+++ b/libs/SDL3/Xcode/SDL/pkg-support/SDL.info
@@ -1,4 +1,4 @@
-Title SDL 3.1.3
+Title SDL 3.1.5
 Version 1
 Description SDL Library for macOS (http://www.libsdl.org)
 DefaultLocation /Library/Frameworks
diff --git a/libs/SDL3/Xcode/SDL/pkg-support/build.xcconfig b/libs/SDL3/Xcode/SDL/pkg-support/build.xcconfig
new file mode 100644
index 000000000..6541759ec
--- /dev/null
+++ b/libs/SDL3/Xcode/SDL/pkg-support/build.xcconfig
@@ -0,0 +1,8 @@
+//
+//  build.xcconfig
+//
+
+// Configuration settings file format documentation can be found at:
+// https://help.apple.com/xcode/#/dev745c5c974
+
+SDL_PREPROCESSOR_DEFINITIONS = SDL_VENDOR_INFO=\"libsdl.org\"
diff --git a/libs/SDL3/Xcode/SDL/pkg-support/resources/CMake/sdl3-config-version.cmake b/libs/SDL3/Xcode/SDL/pkg-support/resources/CMake/sdl3-config-version.cmake
deleted file mode 100644
index 74329c438..000000000
--- a/libs/SDL3/Xcode/SDL/pkg-support/resources/CMake/sdl3-config-version.cmake
+++ /dev/null
@@ -1,57 +0,0 @@
-# based on the files generated by CMake's write_basic_package_version_file
-
-# SDL CMake version configuration file:
-# This file is meant to be placed in Resources/CMake of a SDL3 framework
-
-cmake_minimum_required(VERSION 3.12)
-
-if(NOT EXISTS "${CMAKE_CURRENT_LIST_DIR}/../../Headers/SDL_version.h")
-    message(AUTHOR_WARNING "Could not find SDL_version.h. This script is meant to be placed in the Resources/CMake directory of SDL2.framework")
-    return()
-endif()
-
-file(READ "${CMAKE_CURRENT_LIST_DIR}/../../Headers/SDL_version.h" _sdl_version_h)
-string(REGEX MATCH "#define[ \t]+SDL_MAJOR_VERSION[ \t]+([0-9]+)" _sdl_major_re "${_sdl_version_h}")
-set(_sdl_major "${CMAKE_MATCH_1}")
-string(REGEX MATCH "#define[ \t]+SDL_MINOR_VERSION[ \t]+([0-9]+)" _sdl_minor_re "${_sdl_version_h}")
-set(_sdl_minor "${CMAKE_MATCH_1}")
-string(REGEX MATCH "#define[ \t]+SDL_MICRO_VERSION[ \t]+([0-9]+)" _sdl_micro_re "${_sdl_version_h}")
-set(_sdl_micro "${CMAKE_MATCH_1}")
-if(_sdl_major_re AND _sdl_minor_re AND _sdl_micro_re)
-    set(PACKAGE_VERSION "${_sdl_major}.${_sdl_minor}.${_sdl_micro}")
-else()
-    message(AUTHOR_WARNING "Could not extract version from SDL_version.h.")
-    return()
-endif()
-
-unset(_sdl_major_re)
-unset(_sdl_major)
-unset(_sdl_minor_re)
-unset(_sdl_minor)
-unset(_sdl_micro_re)
-unset(_sdl_micro)
-
-if(PACKAGE_FIND_VERSION_RANGE)
-    # Package version must be in the requested version range
-    if ((PACKAGE_FIND_VERSION_RANGE_MIN STREQUAL "INCLUDE" AND PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION_MIN)
-        OR ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND PACKAGE_VERSION VERSION_GREATER PACKAGE_FIND_VERSION_MAX)
-        OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND PACKAGE_VERSION VERSION_GREATER_EQUAL PACKAGE_FIND_VERSION_MAX)))
-        set(PACKAGE_VERSION_COMPATIBLE FALSE)
-    else()
-        set(PACKAGE_VERSION_COMPATIBLE TRUE)
-    endif()
-else()
-    if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
-        set(PACKAGE_VERSION_COMPATIBLE FALSE)
-    else()
-        set(PACKAGE_VERSION_COMPATIBLE TRUE)
-        if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
-            set(PACKAGE_VERSION_EXACT TRUE)
-        endif()
-    endif()
-endif()
-
-# The SDL3.xcframework only contains 64-bit archives
-if(NOT "${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-    set(PACKAGE_VERSION_UNSUITABLE TRUE)
-endif()
diff --git a/libs/SDL3/Xcode/SDL/pkg-support/resources/CMake/sdl3-config.cmake b/libs/SDL3/Xcode/SDL/pkg-support/resources/cmake/SDL3Config.cmake
similarity index 100%
rename from libs/SDL3/Xcode/SDL/pkg-support/resources/CMake/sdl3-config.cmake
rename to libs/SDL3/Xcode/SDL/pkg-support/resources/cmake/SDL3Config.cmake
diff --git a/libs/SDL3/Xcode/SDL/pkg-support/resources/share/cmake/SDL3/sdl3-config-version.cmake b/libs/SDL3/Xcode/SDL/pkg-support/resources/share/cmake/SDL3/sdl3-config-version.cmake
deleted file mode 100644
index 6c833a7f2..000000000
--- a/libs/SDL3/Xcode/SDL/pkg-support/resources/share/cmake/SDL3/sdl3-config-version.cmake
+++ /dev/null
@@ -1,76 +0,0 @@
-# based on the files generated by CMake's write_basic_package_version_file
-
-# SDL CMake version configuration file:
-# This file is meant to be placed in share/cmake/SDL3, next to SDL3.xcframework
-
-cmake_minimum_required(VERSION 3.12)
-
-get_filename_component(_sdl3_xcframework_parent_path "${CMAKE_CURRENT_LIST_DIR}" REALPATH)              # /share/cmake/SDL3/
-get_filename_component(_sdl3_xcframework_parent_path "${_sdl3_xcframework_parent_path}" REALPATH)       # /share/cmake/SDL3/
-get_filename_component(_sdl3_xcframework_parent_path "${_sdl3_xcframework_parent_path}" PATH)           # /share/cmake
-get_filename_component(_sdl3_xcframework_parent_path "${_sdl3_xcframework_parent_path}" PATH)           # /share
-get_filename_component(_sdl3_xcframework_parent_path "${_sdl3_xcframework_parent_path}" PATH)           # /
-set(_sdl3_xcframework "${_sdl3_xcframework_parent_path}/SDL3.xcframework")                              # /SDL3.xcframework
-set(_sdl3_framework "${_sdl3_xcframework}/macos-arm64_x86_64/SDL3.framework")                           # /SDL3.xcframework/macos-arm64_x86_64/SDL3.framework
-set(_sdl3_version_h "${_sdl3_framework}/Headers/SDL_version.h")                                         # /SDL3.xcframework/macos-arm64_x86_64/SDL3.framework/Headers/SDL_version.h
-
-if(NOT EXISTS "${_sdl3_version_h}")
-    message(AUTHOR_WARNING "Cannot not find ${_sdl3_framework}. This script is meant to be placed in share/cmake/SDL3, next to SDL3.xcframework")
-    return()
-endif()
-
-file(READ "${_sdl3_version_h}" _sdl_version_h)
-
-unset(_sdl3_xcframework_parent_path)
-unset(_sdl3_framework)
-unset(_sdl3_xcframework)
-unset(_sdl3_version_h)
-
-string(REGEX MATCH "#define[ \t]+SDL_MAJOR_VERSION[ \t]+([0-9]+)" _sdl_major_re "${_sdl_version_h}")
-set(_sdl_major "${CMAKE_MATCH_1}")
-string(REGEX MATCH "#define[ \t]+SDL_MINOR_VERSION[ \t]+([0-9]+)" _sdl_minor_re "${_sdl_version_h}")
-set(_sdl_minor "${CMAKE_MATCH_1}")
-string(REGEX MATCH "#define[ \t]+SDL_MICRO_VERSION[ \t]+([0-9]+)" _sdl_micro_re "${_sdl_version_h}")
-set(_sdl_micro "${CMAKE_MATCH_1}")
-if(_sdl_major_re AND _sdl_minor_re AND _sdl_micro_re)
-    set(PACKAGE_VERSION "${_sdl_major}.${_sdl_minor}.${_sdl_micro}")
-else()
-    message(AUTHOR_WARNING "Could not extract version from SDL_version.h.")
-    return()
-endif()
-
-unset(_sdl_major_re)
-unset(_sdl_major)
-unset(_sdl_minor_re)
-unset(_sdl_minor)
-unset(_sdl_micro_re)
-unset(_sdl_micro)
-
-if(PACKAGE_FIND_VERSION_RANGE)
-    # Package version must be in the requested version range
-    if ((PACKAGE_FIND_VERSION_RANGE_MIN STREQUAL "INCLUDE" AND PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION_MIN)
-        OR ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND PACKAGE_VERSION VERSION_GREATER PACKAGE_FIND_VERSION_MAX)
-        OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND PACKAGE_VERSION VERSION_GREATER_EQUAL PACKAGE_FIND_VERSION_MAX)))
-        set(PACKAGE_VERSION_COMPATIBLE FALSE)
-    else()
-        set(PACKAGE_VERSION_COMPATIBLE TRUE)
-    endif()
-else()
-    if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
-        set(PACKAGE_VERSION_COMPATIBLE FALSE)
-    else()
-        set(PACKAGE_VERSION_COMPATIBLE TRUE)
-        if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
-            set(PACKAGE_VERSION_EXACT TRUE)
-        endif()
-    endif()
-endif()
-
-# The SDL3.xcframework only contains 64-bit archives
-if(NOT "${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-    set(PACKAGE_VERSION_UNSUITABLE TRUE)
-endif()
-
-if(NOT CMAKE_SYSTEM_NAME MATCHES "^(Darwin|iOS|tvOS)$")
-    set(PACKAGE_VERSION_UNSUITABLE TRUE)
-endif()
diff --git a/libs/SDL3/Xcode/SDL/pkg-support/resources/share/cmake/SDL3/sdl3-config.cmake b/libs/SDL3/Xcode/SDL/pkg-support/share/cmake/SDL3/SDL3Config.cmake
similarity index 87%
rename from libs/SDL3/Xcode/SDL/pkg-support/resources/share/cmake/SDL3/sdl3-config.cmake
rename to libs/SDL3/Xcode/SDL/pkg-support/share/cmake/SDL3/SDL3Config.cmake
index 278cd3b20..9d29aae9a 100644
--- a/libs/SDL3/Xcode/SDL/pkg-support/resources/share/cmake/SDL3/sdl3-config.cmake
+++ b/libs/SDL3/Xcode/SDL/pkg-support/share/cmake/SDL3/SDL3Config.cmake
@@ -32,14 +32,24 @@ endmacro()
 set(SDL3_FOUND TRUE)
 
 macro(_check_target_is_simulator)
-    include(CheckCSourceCompiles)
-    check_c_source_compiles([===[
+    set(src [===[
     #include <TargetConditionals.h>
-    #if defined(TARGET_OS_SIMULATOR)
+    #if defined(TARGET_OS_SIMULATOR) && TARGET_OS_SIMULATOR
     int target_is_simulator;
     #endif
     int main(int argc, char *argv[]) { return target_is_simulator; }
-    ]===] SDL_TARGET_IS_SIMULATOR)
+    ]===])
+    if(CMAKE_C_COMPILER)
+        include(CheckCSourceCompiles)
+        check_c_source_compiles("${src}" SDL_TARGET_IS_SIMULATOR)
+    elseif(CMAKE_CXX_COMPILER)
+        include(CheckCXXSourceCompiles)
+        check_cxx_source_compiles("${src}" SDL_TARGET_IS_SIMULATOR)
+    else()
+        enable_language(C)
+        include(CheckCSourceCompiles)
+        check_c_source_compiles("${src}" SDL_TARGET_IS_SIMULATOR)
+    endif()
 endmacro()
 
 if(CMAKE_SYSTEM_NAME STREQUAL "iOS")
@@ -59,7 +69,7 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "tvOS")
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
     set(_xcfw_target_subdir "macos-arm64_x86_64")
 else()
-    message(WARNING "Unsupported Apple platform (${CMAKE_SYSTEM_NAME}) and broken sdl3-config-version.cmake")
+    message(WARNING "Unsupported Apple platform (${CMAKE_SYSTEM_NAME}) and broken SDL3ConfigVersion.cmake")
     set(SDL3_FOUND FALSE)
     return()
 endif()
@@ -89,7 +99,9 @@ set(SDL3_Headers_FOUND TRUE)
 
 if(NOT TARGET SDL3::SDL3-shared)
     add_library(SDL3::SDL3-shared SHARED IMPORTED)
-    if(CMAKE_VERSION GREATER_EQUAL "3.28")
+    # CMake does not automatically add RPATHS when using xcframeworks
+    # https://gitlab.kitware.com/cmake/cmake/-/issues/25998
+    if(0)  # if(CMAKE_VERSION GREATER_EQUAL "3.28")
         set_target_properties(SDL3::SDL3-shared
             PROPERTIES
                 FRAMEWORK "TRUE"
diff --git a/libs/SDL3/Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj b/libs/SDL3/Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj
index b1b49715a..bfeae4e5a 100644
--- a/libs/SDL3/Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj
+++ b/libs/SDL3/Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 55;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXAggregateTarget section */
diff --git a/libs/SDL3/android-project/app/src/main/AndroidManifest.xml b/libs/SDL3/android-project/app/src/main/AndroidManifest.xml
index acefc495d..cecee4e5c 100644
--- a/libs/SDL3/android-project/app/src/main/AndroidManifest.xml
+++ b/libs/SDL3/android-project/app/src/main/AndroidManifest.xml
@@ -33,6 +33,7 @@
 
     <!-- Audio recording support -->
     <!-- if you want to record audio, uncomment this. -->
+    <!-- <uses-permission android:name="android.permission.RECORD_AUDIO" /> -->
     <!-- <uses-feature
         android:name="android.hardware.microphone"
         android:required="false" /> -->
@@ -55,9 +56,6 @@
     <!-- Allow access to the vibrator -->
     <uses-permission android:name="android.permission.VIBRATE" />
 
-    <!-- if you want to record audio, uncomment this. -->
-    <!-- <uses-permission android:name="android.permission.RECORD_AUDIO" /> -->
-
     <!-- Create a Java class extending SDLActivity and place it in a
          directory under app/src/main/java matching the package, e.g. app/src/main/java/com/gamemaker/game/MyGame.java
 
@@ -80,7 +78,7 @@
             android:label="@string/app_name"
             android:alwaysRetainTaskState="true"
             android:launchMode="singleInstance"
-            android:configChanges="layoutDirection|locale|orientation|uiMode|screenLayout|screenSize|smallestScreenSize|keyboard|keyboardHidden|navigation"
+            android:configChanges="layoutDirection|locale|grammaticalGender|fontScale|fontWeightAdjustment|orientation|uiMode|screenLayout|screenSize|smallestScreenSize|keyboard|keyboardHidden|navigation"
             android:preferMinimalPostProcessing="true"
             android:exported="true"
             >
diff --git a/libs/SDL3/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java b/libs/SDL3/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
index a0807c60c..ae1f62eb5 100644
--- a/libs/SDL3/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
+++ b/libs/SDL3/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
@@ -60,7 +60,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
     private static final String TAG = "SDL";
     private static final int SDL_MAJOR_VERSION = 3;
     private static final int SDL_MINOR_VERSION = 1;
-    private static final int SDL_MICRO_VERSION = 3;
+    private static final int SDL_MICRO_VERSION = 5;
 /*
     // Display InputType.SOURCE/CLASS of events and devices
     //
diff --git a/libs/SDL3/build-scripts/SDL_migration.cocci b/libs/SDL3/build-scripts/SDL_migration.cocci
index 8e2dcc10a..019b2ecdf 100644
--- a/libs/SDL3/build-scripts/SDL_migration.cocci
+++ b/libs/SDL3/build-scripts/SDL_migration.cocci
@@ -65,7 +65,7 @@ SDL_OpenAudioDevice(...)
 expression e;
 @@
 - SDL_PauseAudio(e)
-+ e == SDL_TRUE ? SDL_PauseAudioDevice(g_audio_id) : SDL_PlayAudioDevice(g_audio_id)
++ e ? SDL_PauseAudioDevice(g_audio_id) : SDL_PlayAudioDevice(g_audio_id)
 
 @@
 @@
@@ -92,13 +92,13 @@ expression e1;
 @@
 (
 - SDL_EventState(e1, SDL_IGNORE)
-+ SDL_SetEventEnabled(e1, SDL_FALSE)
++ SDL_SetEventEnabled(e1, false)
 |
 - SDL_EventState(e1, SDL_DISABLE)
-+ SDL_SetEventEnabled(e1, SDL_FALSE)
++ SDL_SetEventEnabled(e1, false)
 |
 - SDL_EventState(e1, SDL_ENABLE)
-+ SDL_SetEventEnabled(e1, SDL_TRUE)
++ SDL_SetEventEnabled(e1, true)
 |
 - SDL_EventState(e1, SDL_QUERY)
 + SDL_EventEnabled(e1)
@@ -3633,11 +3633,11 @@ typedef SDL_JoystickGUID, SDL_GUID;
 @@
 @@
 - SDL_PRESSED
-+ SDL_TRUE
++ true
 @@
 @@
 - SDL_RELEASED
-+ SDL_FALSE
++ false
 
 // This should be the last rule in the file, since it works on SDL3 functions and previous rules may have renamed old functions.
 @ bool_return_type  @
@@ -3689,6 +3689,7 @@ identifier func =~ "^(SDL_AddEventWatch|SDL_AddHintCallback|SDL_AddSurfaceAltern
 + SDL_GetNumLogicalCPUCores
   (...)
 @@
+typedef SDL_bool, bool;
 @@
 - SDL_bool
 + bool
diff --git a/libs/SDL3/build-scripts/androidbuildlibs.sh b/libs/SDL3/build-scripts/androidbuildlibs.sh
index 0aa4aeaa6..a903f36ee 100644
--- a/libs/SDL3/build-scripts/androidbuildlibs.sh
+++ b/libs/SDL3/build-scripts/androidbuildlibs.sh
@@ -25,7 +25,7 @@ cd $srcdir
 
 build=build
 buildandroid=$build/android
-platform=android-16
+platform=android-21
 abi="arm64-v8a" # "armeabi-v7a arm64-v8a x86 x86_64"
 obj=
 lib=
diff --git a/libs/SDL3/build-scripts/build-release.py b/libs/SDL3/build-scripts/build-release.py
index e84dcd5fd..5ef2a3487 100644
--- a/libs/SDL3/build-scripts/build-release.py
+++ b/libs/SDL3/build-scripts/build-release.py
@@ -1,17 +1,28 @@
 #!/usr/bin/env python
 
+"""
+This script is shared between SDL2, SDL3, and all satellite libraries.
+Don't specialize this script for doing project-specific modifications.
+Rather, modify release-info.json.
+"""
+
 import argparse
 import collections
+import dataclasses
+from collections.abc import Callable
 import contextlib
 import datetime
+import fnmatch
 import glob
 import io
 import json
 import logging
+import multiprocessing
 import os
 from pathlib import Path
 import platform
 import re
+import shlex
 import shutil
 import subprocess
 import sys
@@ -21,21 +32,55 @@
 import typing
 import zipfile
 
-logger = logging.getLogger(__name__)
-
 
-VcArchDevel = collections.namedtuple("VcArchDevel", ("dll", "pdb", "imp", "test"))
+logger = logging.getLogger(__name__)
 GIT_HASH_FILENAME = ".git-hash"
-
-ANDROID_AVAILABLE_ABIS = [
-    "armeabi-v7a",
-    "arm64-v8a",
-    "x86",
-    "x86_64",
-]
-ANDROID_MINIMUM_API = 19
-ANDROID_TARGET_API = 29
-ANDROID_MINIMUM_NDK = 21
+REVISION_TXT = "REVISION.txt"
+
+
+def safe_isotime_to_datetime(str_isotime: str) -> datetime.datetime:
+    try:
+        return datetime.datetime.fromisoformat(str_isotime)
+    except ValueError:
+        pass
+    logger.warning("Invalid iso time: %s", str_isotime)
+    if str_isotime[-6:-5] in ("+", "-"):
+        # Commits can have isotime with invalid timezone offset (e.g. "2021-07-04T20:01:40+32:00")
+        modified_str_isotime = str_isotime[:-6] + "+00:00"
+        try:
+            return datetime.datetime.fromisoformat(modified_str_isotime)
+        except ValueError:
+            pass
+    raise ValueError(f"Invalid isotime: {str_isotime}")
+
+
+def arc_join(*parts: list[str]) -> str:
+    assert all(p[:1] != "/" and p[-1:] != "/" for p in parts), f"None of {parts} may start or end with '/'"
+    return "/".join(p for p in parts if p)
+
+
+@dataclasses.dataclass(frozen=True)
+class VsArchPlatformConfig:
+    arch: str
+    configuration: str
+    platform: str
+
+    def extra_context(self):
+        return {
+            "ARCH": self.arch,
+            "CONFIGURATION": self.configuration,
+            "PLATFORM": self.platform,
+        }
+
+
+@contextlib.contextmanager
+def chdir(path):
+    original_cwd = os.getcwd()
+    try:
+        os.chdir(path)
+        yield
+    finally:
+        os.chdir(original_cwd)
 
 
 class Executer:
@@ -43,14 +88,18 @@ def __init__(self, root: Path, dry: bool=False):
         self.root = root
         self.dry = dry
 
-    def run(self, cmd, stdout=False, dry_out=None, force=False):
+    def run(self, cmd, cwd=None, env=None):
+        logger.info("Executing args=%r", cmd)
         sys.stdout.flush()
+        if not self.dry:
+            subprocess.check_call(cmd, cwd=cwd or self.root, env=env, text=True)
+
+    def check_output(self, cmd, cwd=None, dry_out=None, env=None, text=True):
         logger.info("Executing args=%r", cmd)
-        if self.dry and not force:
-            if stdout:
-                return subprocess.run(["echo", "-E", dry_out or ""], stdout=subprocess.PIPE if stdout else None, text=True, check=True, cwd=self.root)
-        else:
-            return subprocess.run(cmd, stdout=subprocess.PIPE if stdout else None, text=True, check=True, cwd=self.root)
+        sys.stdout.flush()
+        if self.dry:
+            return dry_out
+        return subprocess.check_output(cmd, cwd=cwd or self.root, env=env, text=text)
 
 
 class SectionPrinter:
@@ -103,7 +152,7 @@ def find_vsdevcmd(self, year: typing.Optional[str]=None) -> typing.Optional[Path
                 return None
             vswhere_spec.extend(["-version", f"[{version},{version+1})"])
         vswhere_cmd = ["vswhere"] + vswhere_spec + ["-property", "installationPath"]
-        vs_install_path = Path(self.executer.run(vswhere_cmd, stdout=True, dry_out="/tmp").stdout.strip())
+        vs_install_path = Path(self.executer.check_output(vswhere_cmd, dry_out="/tmp").strip())
         logger.info("VS install_path = %s", vs_install_path)
         assert vs_install_path.is_dir(), "VS installation path does not exist"
         vsdevcmd_path = vs_install_path / "Common7/Tools/vsdevcmd.bat"
@@ -116,7 +165,7 @@ def find_vsdevcmd(self, year: typing.Optional[str]=None) -> typing.Optional[Path
 
     def find_msbuild(self) -> typing.Optional[Path]:
         vswhere_cmd = ["vswhere", "-latest", "-requires", "Microsoft.Component.MSBuild", "-find", r"MSBuild\**\Bin\MSBuild.exe"]
-        msbuild_path = Path(self.executer.run(vswhere_cmd, stdout=True, dry_out="/tmp/MSBuild.exe").stdout.strip())
+        msbuild_path = Path(self.executer.check_output(vswhere_cmd, dry_out="/tmp/MSBuild.exe").strip())
         logger.info("MSBuild path = %s", msbuild_path)
         if self.dry:
             msbuild_path.parent.mkdir(parents=True, exist_ok=True)
@@ -124,11 +173,11 @@ def find_msbuild(self) -> typing.Optional[Path]:
         assert msbuild_path.is_file(), "MSBuild.exe does not exist"
         return msbuild_path
 
-    def build(self, arch: str, platform: str, configuration: str, projects: list[Path]):
+    def build(self, arch_platform: VsArchPlatformConfig, projects: list[Path]):
         assert projects, "Need at least one project to build"
 
-        vsdev_cmd_str = f"\"{self.vsdevcmd}\" -arch={arch}"
-        msbuild_cmd_str = " && ".join([f"\"{self.msbuild}\" \"{project}\" /m /p:BuildInParallel=true /p:Platform={platform} /p:Configuration={configuration}" for project in projects])
+        vsdev_cmd_str = f"\"{self.vsdevcmd}\" -arch={arch_platform.arch}"
+        msbuild_cmd_str = " && ".join([f"\"{self.msbuild}\" \"{project}\" /m /p:BuildInParallel=true /p:Platform={arch_platform.platform} /p:Configuration={arch_platform.configuration}" for project in projects])
         bat_contents = f"{vsdev_cmd_str} && {msbuild_cmd_str}\n"
         bat_path = Path(tempfile.gettempdir()) / "cmd.bat"
         with bat_path.open("w") as f:
@@ -139,35 +188,308 @@ def build(self, arch: str, platform: str, configuration: str, projects: list[Pat
         self.executer.run(cmd)
 
 
-class Releaser:
-    def __init__(self, project: str, commit: str, root: Path, dist_path: Path, section_printer: SectionPrinter, executer: Executer, cmake_generator: str):
-        self.project = project
-        self.version = self.extract_sdl_version(root=root, project=project)
+class Archiver:
+    def __init__(self, zip_path: typing.Optional[Path]=None, tgz_path: typing.Optional[Path]=None, txz_path: typing.Optional[Path]=None):
+        self._zip_files = []
+        self._tar_files = []
+        self._added_files = set()
+        if zip_path:
+            self._zip_files.append(zipfile.ZipFile(zip_path, "w", compression=zipfile.ZIP_DEFLATED))
+        if tgz_path:
+            self._tar_files.append(tarfile.open(tgz_path, "w:gz"))
+        if txz_path:
+            self._tar_files.append(tarfile.open(txz_path, "w:xz"))
+
+    @property
+    def added_files(self) -> set[str]:
+        return self._added_files
+
+    def add_file_data(self, arcpath: str, data: bytes, mode: int, time: datetime.datetime):
+        for zf in self._zip_files:
+            file_data_time = (time.year, time.month, time.day, time.hour, time.minute, time.second)
+            zip_info = zipfile.ZipInfo(filename=arcpath, date_time=file_data_time)
+            zip_info.external_attr = mode << 16
+            zip_info.compress_type = zipfile.ZIP_DEFLATED
+            zf.writestr(zip_info, data=data)
+        for tf in self._tar_files:
+            tar_info = tarfile.TarInfo(arcpath)
+            tar_info.type = tarfile.REGTYPE
+            tar_info.mode = mode
+            tar_info.size = len(data)
+            tar_info.mtime = int(time.timestamp())
+            tf.addfile(tar_info, fileobj=io.BytesIO(data))
+
+        self._added_files.add(arcpath)
+
+    def add_symlink(self, arcpath: str, target: str, time: datetime.datetime, files_for_zip):
+        logger.debug("Adding symlink (target=%r) -> %s", target, arcpath)
+        for zf in self._zip_files:
+            file_data_time = (time.year, time.month, time.day, time.hour, time.minute, time.second)
+            for f in files_for_zip:
+                zip_info = zipfile.ZipInfo(filename=f["arcpath"], date_time=file_data_time)
+                zip_info.external_attr = f["mode"] << 16
+                zip_info.compress_type = zipfile.ZIP_DEFLATED
+                zf.writestr(zip_info, data=f["data"])
+        for tf in self._tar_files:
+            tar_info = tarfile.TarInfo(arcpath)
+            tar_info.type = tarfile.SYMTYPE
+            tar_info.mode = 0o777
+            tar_info.mtime = int(time.timestamp())
+            tar_info.linkname = target
+            tf.addfile(tar_info)
+
+        self._added_files.update(f["arcpath"] for f in files_for_zip)
+
+    def add_git_hash(self, arcdir: str, commit: str, time: datetime.datetime):
+        arcpath = arc_join(arcdir, GIT_HASH_FILENAME)
+        data = f"{commit}\n".encode()
+        self.add_file_data(arcpath=arcpath, data=data, mode=0o100644, time=time)
+
+    def add_file_path(self, arcpath: str, path: Path):
+        assert path.is_file(), f"{path} should be a file"
+        logger.debug("Adding %s -> %s", path, arcpath)
+        for zf in self._zip_files:
+            zf.write(path, arcname=arcpath)
+        for tf in self._tar_files:
+            tf.add(path, arcname=arcpath)
+
+    def add_file_directory(self, arcdirpath: str, dirpath: Path):
+        assert dirpath.is_dir()
+        if arcdirpath and arcdirpath[-1:] != "/":
+            arcdirpath += "/"
+        for f in dirpath.iterdir():
+            if f.is_file():
+                arcpath = f"{arcdirpath}{f.name}"
+                logger.debug("Adding %s to %s", f, arcpath)
+                self.add_file_path(arcpath=arcpath, path=f)
+
+    def close(self):
+        # Archiver is intentionally made invalid after this function
+        del self._zip_files
+        self._zip_files = None
+        del self._tar_files
+        self._tar_files = None
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, type, value, traceback):
+        self.close()
+
+
+class NodeInArchive:
+    def __init__(self, arcpath: str, path: typing.Optional[Path]=None, data: typing.Optional[bytes]=None, mode: typing.Optional[int]=None, symtarget: typing.Optional[str]=None, time: typing.Optional[datetime.datetime]=None, directory: bool=False):
+        self.arcpath = arcpath
+        self.path = path
+        self.data = data
+        self.mode = mode
+        self.symtarget = symtarget
+        self.time = time
+        self.directory = directory
+
+    @classmethod
+    def from_fs(cls, arcpath: str, path: Path, mode: int=0o100644, time: typing.Optional[datetime.datetime]=None) -> "NodeInArchive":
+        if time is None:
+            time = datetime.datetime.fromtimestamp(os.stat(path).st_mtime)
+        return cls(arcpath=arcpath, path=path, mode=mode)
+
+    @classmethod
+    def from_data(cls, arcpath: str, data: bytes, time: datetime.datetime) -> "NodeInArchive":
+        return cls(arcpath=arcpath, data=data, time=time, mode=0o100644)
+
+    @classmethod
+    def from_text(cls, arcpath: str, text: str, time: datetime.datetime) -> "NodeInArchive":
+        return cls.from_data(arcpath=arcpath, data=text.encode(), time=time)
+
+    @classmethod
+    def from_symlink(cls, arcpath: str, symtarget: str) -> "NodeInArchive":
+        return cls(arcpath=arcpath, symtarget=symtarget)
+
+    @classmethod
+    def from_directory(cls, arcpath: str) -> "NodeInArchive":
+        return cls(arcpath=arcpath, directory=True)
+
+    def __repr__(self) -> str:
+        return f"<{type(self).__name__}:arcpath={self.arcpath},path='{str(self.path)}',len(data)={len(self.data) if self.data else 'n/a'},directory={self.directory},symtarget={self.symtarget}>"
+
+
+def configure_file(path: Path, context: dict[str, str]) -> bytes:
+    text = path.read_text()
+    return configure_text(text, context=context).encode()
+
+
+def configure_text(text: str, context: dict[str, str]) -> str:
+    original_text = text
+    for txt, repl in context.items():
+        text = text.replace(f"@<@{txt}@>@", repl)
+    success = all(thing not in text for thing in ("@<@", "@>@"))
+    if not success:
+        raise ValueError(f"Failed to configure {repr(original_text)}")
+    return text
+
+
+class ArchiveFileTree:
+    def __init__(self):
+        self._tree: dict[str, NodeInArchive] = {}
+
+    def add_file(self, file: NodeInArchive):
+        self._tree[file.arcpath] = file
+
+    def get_latest_mod_time(self) -> datetime.datetime:
+        return max(item.time for item in self._tree.values() if item.time)
+
+    def add_to_archiver(self, archive_base: str, archiver: Archiver):
+        remaining_symlinks = set()
+        added_files = dict()
+
+        def calculate_symlink_target(s: NodeInArchive) -> str:
+            dest_dir = os.path.dirname(s.path)
+            if dest_dir:
+                dest_dir += "/"
+            target = dest_dir + s.symtarget
+            while True:
+                new_target, n = re.subn(r"([^/]+/+[.]{2}/)", "", target)
+                print(f"{target=} {new_target=}")
+                target = new_target
+                if not n:
+                    break
+            return target
+
+        # Add files in first pass
+        for arcpath, node in self._tree.items():
+            if node.data is not None:
+                archiver.add_file_data(arcpath=arc_join(archive_base, arcpath), data=node.data, time=node.time, mode=node.mode)
+                added_files[node.path] = node
+            elif node.path is not None:
+                archiver.add_file_path(arcpath=arc_join(archive_base, arcpath), path=node.path)
+                added_files[node.path] = node
+            elif node.symtarget is not None:
+                remaining_symlinks.add(node)
+            elif node.directory:
+                pass
+            else:
+                raise ValueError(f"Invalid Archive Node: {repr(node)}")
+
+        # Resolve symlinks in second pass: zipfile does not support symlinks, so add files to zip archive
+        while True:
+            if not remaining_symlinks:
+                break
+            symlinks_this_time = set()
+            extra_added_files = {}
+            for symlink in remaining_symlinks:
+                symlink_files_for_zip = {}
+                symlink_target_path = calculate_symlink_target(symlink)
+                if symlink_target_path in added_files:
+                    symlink_files_for_zip[symlink.path] = added_files[symlink_target_path]
+                else:
+                    symlink_target_path_slash = symlink_target_path + "/"
+                    for added_file in added_files:
+                        if added_file.startswith(symlink_target_path_slash):
+                            path_in_symlink = symlink.path + "/" + added_file.removeprefix(symlink_target_path_slash)
+                            symlink_files_for_zip[path_in_symlink] = added_files[added_file]
+                if symlink_files_for_zip:
+                    symlinks_this_time.add(symlink)
+                    extra_added_files.update(symlink_files_for_zip)
+                    files_for_zip = [{"arcpath": f"{archive_base}/{sym_path}", "data": sym_info.data, "mode": sym_info.mode} for sym_path, sym_info in symlink_files_for_zip.items()]
+                    archiver.add_symlink(arcpath=f"{archive_base}/{symlink.path}", target=symlink.symtarget, time=symlink.time, files_for_zip=files_for_zip)
+            # if not symlinks_this_time:
+            #     logger.info("files added: %r", set(path for path in added_files.keys()))
+            assert symlinks_this_time, f"No targets found for symlinks: {remaining_symlinks}"
+            remaining_symlinks.difference_update(symlinks_this_time)
+            added_files.update(extra_added_files)
+
+    def add_directory_tree(self, arc_dir: str, path: Path, time: datetime.datetime):
+        assert path.is_dir()
+        for files_dir, _, filenames in os.walk(path):
+            files_dir_path = Path(files_dir)
+            rel_files_path = files_dir_path.relative_to(path)
+            for filename in filenames:
+                self.add_file(NodeInArchive.from_fs(arcpath=arc_join(arc_dir, str(rel_files_path), filename), path=files_dir_path / filename, time=time))
+
+    def _add_files_recursively(self, arc_dir: str, paths: list[Path], time: datetime.datetime):
+        logger.debug(f"_add_files_recursively({arc_dir=} {paths=})")
+        for path in paths:
+            arcpath = arc_join(arc_dir, path.name)
+            if path.is_file():
+                logger.debug("Adding %s as %s", path, arcpath)
+                self.add_file(NodeInArchive.from_fs(arcpath=arcpath, path=path, time=time))
+            elif path.is_dir():
+                self._add_files_recursively(arc_dir=arc_join(arc_dir, path.name), paths=list(path.iterdir()), time=time)
+            else:
+                raise ValueError(f"Unsupported file type to add recursively: {path}")
+
+    def add_file_mapping(self, arc_dir: str, file_mapping: dict[str, list[str]], file_mapping_root: Path, context: dict[str, str], time: datetime.datetime):
+        for meta_rel_destdir, meta_file_globs in file_mapping.items():
+            rel_destdir = configure_text(meta_rel_destdir, context=context)
+            assert "@" not in rel_destdir, f"archive destination should not contain an @ after configuration ({repr(meta_rel_destdir)}->{repr(rel_destdir)})"
+            for meta_file_glob in meta_file_globs:
+                file_glob = configure_text(meta_file_glob, context=context)
+                assert "@" not in rel_destdir, f"archive glob should not contain an @ after configuration ({repr(meta_file_glob)}->{repr(file_glob)})"
+                if ":" in file_glob:
+                    original_path, new_filename = file_glob.rsplit(":", 1)
+                    assert ":" not in original_path, f"Too many ':' in {repr(file_glob)}"
+                    assert "/" not in new_filename, f"New filename cannot contain a '/' in {repr(file_glob)}"
+                    path = file_mapping_root / original_path
+                    arcpath = arc_join(arc_dir, rel_destdir, new_filename)
+                    if path.suffix == ".in":
+                        data = configure_file(path, context=context)
+                        logger.debug("Adding processed %s -> %s", path, arcpath)
+                        self.add_file(NodeInArchive.from_data(arcpath=arcpath, data=data, time=time))
+                    else:
+                        logger.debug("Adding %s -> %s", path, arcpath)
+                        self.add_file(NodeInArchive.from_fs(arcpath=arcpath, path=path, time=time))
+                else:
+                    relative_file_paths = glob.glob(file_glob, root_dir=file_mapping_root)
+                    assert relative_file_paths, f"Glob '{file_glob}' does not match any file"
+                    self._add_files_recursively(arc_dir=arc_join(arc_dir, rel_destdir), paths=[file_mapping_root / p for p in relative_file_paths], time=time)
+
+
+class SourceCollector:
+    # TreeItem = collections.namedtuple("TreeItem", ("path", "mode", "data", "symtarget", "directory", "time"))
+    def __init__(self, root: Path, commit: str, filter: typing.Optional[Callable[[str], bool]], executer: Executer):
         self.root = root
         self.commit = commit
-        self.dist_path = dist_path
-        self.section_printer = section_printer
+        self.filter = filter
         self.executer = executer
-        self.cmake_generator = cmake_generator
-
-        self.artifacts: dict[str, Path] = {}
 
-    @property
-    def dry(self) -> bool:
-        return self.executer.dry
-
-    def prepare(self):
-        logger.debug("Creating dist folder")
-        self.dist_path.mkdir(parents=True, exist_ok=True)
+    def get_archive_file_tree(self) -> ArchiveFileTree:
+        git_archive_args = ["git", "archive", "--format=tar.gz", self.commit, "-o", "/dev/stdout"]
+        logger.info("Executing args=%r", git_archive_args)
+        contents_tgz = subprocess.check_output(git_archive_args, cwd=self.root, text=False)
+        tar_archive = tarfile.open(fileobj=io.BytesIO(contents_tgz), mode="r:gz")
+        filenames = tuple(m.name for m in tar_archive if (m.isfile() or m.issym()))
+
+        file_times = self._get_file_times(paths=filenames)
+        git_contents = ArchiveFileTree()
+        for ti in tar_archive:
+            if self.filter and not self.filter(ti.name):
+                continue
+            data = None
+            symtarget = None
+            directory = False
+            file_time = None
+            if ti.isfile():
+                contents_file = tar_archive.extractfile(ti.name)
+                data = contents_file.read()
+                file_time = file_times[ti.name]
+            elif ti.issym():
+                symtarget = ti.linkname
+                file_time = file_times[ti.name]
+            elif ti.isdir():
+                directory = True
+            else:
+                raise ValueError(f"{ti.name}: unknown type")
+            node = NodeInArchive(arcpath=ti.name, data=data, mode=ti.mode, symtarget=symtarget, time=file_time, directory=directory)
+            git_contents.add_file(node)
+        return git_contents
 
-    TreeItem = collections.namedtuple("TreeItem", ("path", "mode", "data", "time"))
     def _get_file_times(self, paths: tuple[str, ...]) -> dict[str, datetime.datetime]:
         dry_out = textwrap.dedent("""\
             time=2024-03-14T15:40:25-07:00
 
             M\tCMakeLists.txt
         """)
-        git_log_out = self.executer.run(["git", "log", "--name-status", '--pretty=time=%cI', self.commit], stdout=True, dry_out=dry_out).stdout.splitlines(keepends=False)
+        git_log_out = self.executer.check_output(["git", "log", "--name-status", '--pretty=time=%cI', self.commit], dry_out=dry_out, cwd=self.root).splitlines(keepends=False)
         current_time = None
         set_paths = set(paths)
         path_times: dict[str, datetime.datetime] = {}
@@ -175,103 +497,159 @@ def _get_file_times(self, paths: tuple[str, ...]) -> dict[str, datetime.datetime
             if not line:
                 continue
             if line.startswith("time="):
-                current_time = datetime.datetime.fromisoformat(line.removeprefix("time="))
+                current_time = safe_isotime_to_datetime(line.removeprefix("time="))
                 continue
             mod_type, file_paths = line.split(maxsplit=1)
             assert current_time is not None
             for file_path in file_paths.split("\t"):
                 if file_path in set_paths and file_path not in path_times:
                     path_times[file_path] = current_time
-        assert set(path_times.keys()) == set_paths
+
+        # FIXME: find out why some files are not shown in "git log"
+        # assert set(path_times.keys()) == set_paths
+        if set(path_times.keys()) != set_paths:
+            found_times = set(path_times.keys())
+            paths_without_times = set_paths.difference(found_times)
+            logger.warning("No times found for these paths: %s", paths_without_times)
+            max_time = max(time for time in path_times.values())
+            for path in paths_without_times:
+                path_times[path] = max_time
+
         return path_times
 
-    @staticmethod
-    def _path_filter(path: str):
+
+class Releaser:
+    def __init__(self, release_info: dict, commit: str, revision: str, root: Path, dist_path: Path, section_printer: SectionPrinter, executer: Executer, cmake_generator: str, deps_path: Path, overwrite: bool, github: bool, fast: bool):
+        self.release_info = release_info
+        self.project = release_info["name"]
+        self.version = self.extract_sdl_version(root=root, release_info=release_info)
+        self.root = root
+        self.commit = commit
+        self.revision = revision
+        self.dist_path = dist_path
+        self.section_printer = section_printer
+        self.executer = executer
+        self.cmake_generator = cmake_generator
+        self.cpu_count = multiprocessing.cpu_count()
+        self.deps_path = deps_path
+        self.overwrite = overwrite
+        self.github = github
+        self.fast = fast
+        self.arc_time = datetime.datetime.now()
+
+        self.artifacts: dict[str, Path] = {}
+
+    def get_context(self, extra_context: typing.Optional[dict[str, str]]=None) -> dict[str, str]:
+        ctx = {
+            "PROJECT_NAME": self.project,
+            "PROJECT_VERSION": self.version,
+            "PROJECT_COMMIT": self.commit,
+            "PROJECT_REVISION": self.revision,
+        }
+        if extra_context:
+            ctx.update(extra_context)
+        return ctx
+
+    @property
+    def dry(self) -> bool:
+        return self.executer.dry
+
+    def prepare(self):
+        logger.debug("Creating dist folder")
+        self.dist_path.mkdir(parents=True, exist_ok=True)
+
+    @classmethod
+    def _path_filter(cls, path: str) -> bool:
+        if ".gitmodules" in path:
+            return True
         if path.startswith(".git"):
             return False
         return True
 
-    def _get_git_contents(self) -> dict[str, TreeItem]:
-        contents_tgz = subprocess.check_output(["git", "archive", "--format=tar.gz", self.commit, "-o", "/dev/stdout"], text=False)
-        contents = tarfile.open(fileobj=io.BytesIO(contents_tgz), mode="r:gz")
-        filenames = tuple(m.name for m in contents if m.isfile())
-        assert "src/SDL.c" in filenames
-        assert "include/SDL3/SDL.h" in filenames
-        file_times = self._get_file_times(filenames)
-        git_contents = {}
-        for ti in contents:
-            if not ti.isfile():
-                continue
-            if not self._path_filter(ti.name):
-                continue
-            contents_file = contents.extractfile(ti.name)
-            assert contents_file, f"{ti.name} is not a file"
-            git_contents[ti.name] = self.TreeItem(path=ti.name, mode=ti.mode, data=contents_file.read(), time=file_times[ti.name])
-        return git_contents
+    @classmethod
+    def _external_repo_path_filter(cls, path: str) -> bool:
+        if not cls._path_filter(path):
+            return False
+        if path.startswith("test/") or path.startswith("tests/"):
+            return False
+        return True
 
     def create_source_archives(self) -> None:
+        source_collector = SourceCollector(root=self.root, commit=self.commit, executer=self.executer, filter=self._path_filter)
+        print(f"Collecting sources of {self.project}...")
+        archive_tree = source_collector.get_archive_file_tree()
+        latest_mod_time = archive_tree.get_latest_mod_time()
+        archive_tree.add_file(NodeInArchive.from_text(arcpath=REVISION_TXT, text=f"{self.revision}\n", time=latest_mod_time))
+        archive_tree.add_file(NodeInArchive.from_text(arcpath=f"{GIT_HASH_FILENAME}", text=f"{self.commit}\n", time=latest_mod_time))
+        archive_tree.add_file_mapping(arc_dir="", file_mapping=self.release_info["source"].get("files", {}), file_mapping_root=self.root, context=self.get_context(), time=latest_mod_time)
+
         archive_base = f"{self.project}-{self.version}"
+        zip_path = self.dist_path / f"{archive_base}.zip"
+        tgz_path = self.dist_path / f"{archive_base}.tar.gz"
+        txz_path = self.dist_path / f"{archive_base}.tar.xz"
 
-        git_contents = self._get_git_contents()
-        git_files = list(git_contents.values())
-        assert len(git_contents) == len(git_files)
+        logger.info("Creating zip/tgz/txz source archives ...")
+        if self.dry:
+            zip_path.touch()
+            tgz_path.touch()
+            txz_path.touch()
+        else:
+            with Archiver(zip_path=zip_path, tgz_path=tgz_path, txz_path=txz_path) as archiver:
+                print(f"Adding source files of {self.project}...")
+                archive_tree.add_to_archiver(archive_base=archive_base, archiver=archiver)
 
-        latest_mod_time = max(item.time for item in git_files)
+                for extra_repo in self.release_info["source"].get("extra-repos", []):
+                    extra_repo_root = self.root / extra_repo
+                    assert (extra_repo_root / ".git").exists(), f"{extra_repo_root} must be a git repo"
+                    extra_repo_commit = self.executer.check_output(["git", "rev-parse", "HEAD"], dry_out=f"gitsha-extra-repo-{extra_repo}", cwd=extra_repo_root).strip()
+                    extra_repo_source_collector = SourceCollector(root=extra_repo_root, commit=extra_repo_commit, executer=self.executer, filter=self._external_repo_path_filter)
+                    print(f"Collecting sources of {extra_repo} ...")
+                    extra_repo_archive_tree = extra_repo_source_collector.get_archive_file_tree()
+                    print(f"Adding source files of {extra_repo} ...")
+                    extra_repo_archive_tree.add_to_archiver(archive_base=f"{archive_base}/{extra_repo}", archiver=archiver)
 
-        git_files.append(self.TreeItem(path="VERSION.txt", data=f"{self.version}\n".encode(), mode=0o100644, time=latest_mod_time))
-        git_files.append(self.TreeItem(path=GIT_HASH_FILENAME, data=f"{self.commit}\n".encode(), mode=0o100644, time=latest_mod_time))
+            for file in self.release_info["source"]["checks"]:
+                assert f"{archive_base}/{file}" in archiver.added_files, f"'{archive_base}/{file}' must exist"
 
-        git_files.sort(key=lambda v: v.time)
+        logger.info("... done")
 
-        zip_path = self.dist_path / f"{archive_base}.zip"
-        logger.info("Creating .zip source archive (%s)...", zip_path)
-        if self.dry:
-            zip_path.touch()
-        else:
-            with zipfile.ZipFile(zip_path, "w", compression=zipfile.ZIP_DEFLATED) as zip_object:
-                for git_file in git_files:
-                    file_data_time = (git_file.time.year, git_file.time.month, git_file.time.day, git_file.time.hour, git_file.time.minute, git_file.time.second)
-                    zip_info = zipfile.ZipInfo(filename=f"{archive_base}/{git_file.path}", date_time=file_data_time)
-                    zip_info.external_attr = git_file.mode << 16
-                    zip_info.compress_type = zipfile.ZIP_DEFLATED
-                    zip_object.writestr(zip_info, data=git_file.data)
         self.artifacts["src-zip"] = zip_path
+        self.artifacts["src-tar-gz"] = tgz_path
+        self.artifacts["src-tar-xz"] = txz_path
 
-        tar_types = (
-            (".tar.gz", "gz"),
-            (".tar.xz", "xz"),
-        )
-        for ext, comp in tar_types:
-            tar_path = self.dist_path / f"{archive_base}{ext}"
-            logger.info("Creating %s source archive (%s)...", ext, tar_path)
-            if self.dry:
-                tar_path.touch()
-            else:
-                with tarfile.open(tar_path, f"w:{comp}") as tar_object:
-                    for git_file in git_files:
-                        tar_info = tarfile.TarInfo(f"{archive_base}/{git_file.path}")
-                        tar_info.mode = git_file.mode
-                        tar_info.size = len(git_file.data)
-                        tar_info.mtime = git_file.time.timestamp()
-                        tar_object.addfile(tar_info, fileobj=io.BytesIO(git_file.data))
-
-            if tar_path.suffix == ".gz":
+        if not self.dry:
+            with tgz_path.open("r+b") as f:
                 # Zero the embedded timestamp in the gzip'ed tarball
-                with open(tar_path, "r+b") as f:
-                    f.seek(4, 0)
-                    f.write(b"\x00\x00\x00\x00")
-
-            self.artifacts[f"src-tar-{comp}"] = tar_path
-
-    def create_xcframework(self, configuration: str="Release") -> None:
-        dmg_in = self.root / f"Xcode/SDL/build/{self.project}.dmg"
-        dmg_in.unlink(missing_ok=True)
-        self.executer.run(["xcodebuild", "-project", str(self.root / "Xcode/SDL/SDL.xcodeproj"), "-target", "SDL3.dmg", "-configuration", configuration])
+                f.seek(4, 0)
+                f.write(b"\x00\x00\x00\x00")
+
+    def create_dmg(self, configuration: str="Release") -> None:
+        dmg_in = self.root / self.release_info["dmg"]["path"]
+        xcode_project = self.root / self.release_info["dmg"]["project"]
+        assert xcode_project.is_dir(), f"{xcode_project} must be a directory"
+        assert (xcode_project / "project.pbxproj").is_file, f"{xcode_project} must contain project.pbxproj"
+        if not self.fast:
+            dmg_in.unlink(missing_ok=True)
+        build_xcconfig = self.release_info["dmg"].get("build-xcconfig")
+        if build_xcconfig:
+            shutil.copy(self.root / build_xcconfig, xcode_project.parent / "build.xcconfig")
+
+        xcode_scheme = self.release_info["dmg"].get("scheme")
+        xcode_target = self.release_info["dmg"].get("target")
+        assert xcode_scheme or xcode_target, "dmg needs scheme or target"
+        assert not (xcode_scheme and xcode_target), "dmg cannot have both scheme and target set"
+        if xcode_scheme:
+            scheme_or_target = "-scheme"
+            target_like = xcode_scheme
+        else:
+            scheme_or_target = "-target"
+            target_like = xcode_target
+        self.executer.run(["xcodebuild", "ONLY_ACTIVE_ARCH=NO", "-project", xcode_project, scheme_or_target, target_like, "-configuration", configuration])
         if self.dry:
             dmg_in.parent.mkdir(parents=True, exist_ok=True)
             dmg_in.touch()
 
-        assert dmg_in.is_file(), "SDL3.dmg was not created by xcodebuild"
+        assert dmg_in.is_file(), f"{self.project}.dmg was not created by xcodebuild"
 
         dmg_out = self.dist_path / f"{self.project}-{self.version}.dmg"
         shutil.copy(dmg_in, dmg_out)
@@ -281,271 +659,169 @@ def create_xcframework(self, configuration: str="Release") -> None:
     def git_hash_data(self) -> bytes:
         return f"{self.commit}\n".encode()
 
-    def _tar_add_git_hash(self, tar_object: tarfile.TarFile, root: typing.Optional[str]=None, time: typing.Optional[datetime.datetime]=None):
-        if not time:
-            time = datetime.datetime(year=2024, month=4, day=1)
-        path = GIT_HASH_FILENAME
-        if root:
-            path = f"{root}/{path}"
-
-        tar_info = tarfile.TarInfo(path)
-        tar_info.mode = 0o100644
-        tar_info.size = len(self.git_hash_data)
-        tar_info.mtime = int(time.timestamp())
-        tar_object.addfile(tar_info, fileobj=io.BytesIO(self.git_hash_data))
-
-    def _zip_add_git_hash(self, zip_file: zipfile.ZipFile, root: typing.Optional[str]=None, time: typing.Optional[datetime.datetime]=None):
-        if not time:
-            time = datetime.datetime(year=2024, month=4, day=1)
-        path = GIT_HASH_FILENAME
-        if root:
-            path = f"{root}/{path}"
-
-        file_data_time = (time.year, time.month, time.day, time.hour, time.minute, time.second)
-        zip_info = zipfile.ZipInfo(filename=path, date_time=file_data_time)
-        zip_info.external_attr = 0o100644 << 16
-        zip_info.compress_type = zipfile.ZIP_DEFLATED
-        zip_file.writestr(zip_info, data=self.git_hash_data)
-
     def create_mingw_archives(self) -> None:
         build_type = "Release"
-        mingw_archs = ("i686", "x86_64")
         build_parent_dir = self.root / "build-mingw"
-
+        ARCH_TO_GNU_ARCH = {
+            # "arm64": "aarch64",
+            "x86": "i686",
+            "x64": "x86_64",
+        }
+        ARCH_TO_TRIPLET = {
+            # "arm64": "aarch64-w64-mingw32",
+            "x86": "i686-w64-mingw32",
+            "x64": "x86_64-w64-mingw32",
+        }
+
+        new_env = dict(os.environ)
+
+        cmake_prefix_paths = []
+        mingw_deps_path = self.deps_path / "mingw-deps"
+
+        if "dependencies" in self.release_info["mingw"]:
+            shutil.rmtree(mingw_deps_path, ignore_errors=True)
+            mingw_deps_path.mkdir()
+
+            for triplet in ARCH_TO_TRIPLET.values():
+                (mingw_deps_path / triplet).mkdir()
+
+            def extract_filter(member: tarfile.TarInfo, path: str, /):
+                if member.name.startswith("SDL"):
+                    member.name = "/".join(Path(member.name).parts[1:])
+                return member
+            for dep in self.release_info.get("dependencies", {}):
+                extract_path = mingw_deps_path / f"extract-{dep}"
+                extract_path.mkdir()
+                with chdir(extract_path):
+                    tar_path = self.deps_path / glob.glob(self.release_info["mingw"]["dependencies"][dep]["artifact"], root_dir=self.deps_path)[0]
+                    logger.info("Extracting %s to %s", tar_path, mingw_deps_path)
+                    assert tar_path.suffix in (".gz", ".xz")
+                    with tarfile.open(tar_path, mode=f"r:{tar_path.suffix.strip('.')}") as tarf:
+                        tarf.extractall(filter=extract_filter)
+                    for arch, triplet in ARCH_TO_TRIPLET.items():
+                        install_cmd = self.release_info["mingw"]["dependencies"][dep]["install-command"]
+                        extra_configure_data = {
+                            "ARCH": ARCH_TO_GNU_ARCH[arch],
+                            "TRIPLET": triplet,
+                            "PREFIX": str(mingw_deps_path / triplet),
+                        }
+                        install_cmd = configure_text(install_cmd, context=self.get_context(extra_configure_data))
+                        self.executer.run(shlex.split(install_cmd), cwd=str(extract_path))
+
+            dep_binpath = mingw_deps_path / triplet / "bin"
+            assert dep_binpath.is_dir(), f"{dep_binpath} for PATH should exist"
+            dep_pkgconfig = mingw_deps_path / triplet / "lib/pkgconfig"
+            assert dep_pkgconfig.is_dir(), f"{dep_pkgconfig} for PKG_CONFIG_PATH should exist"
+
+            new_env["PATH"] = os.pathsep.join([str(dep_binpath), new_env["PATH"]])
+            new_env["PKG_CONFIG_PATH"] = str(dep_pkgconfig)
+            cmake_prefix_paths.append(mingw_deps_path)
+
+        new_env["CFLAGS"] = f"-O2 -ffile-prefix-map={self.root}=/src/{self.project}"
+        new_env["CXXFLAGS"] = f"-O2 -ffile-prefix-map={self.root}=/src/{self.project}"
+
+        assert any(system in self.release_info["mingw"] for system in ("autotools", "cmake"))
+        assert not all(system in self.release_info["mingw"] for system in ("autotools", "cmake"))
+
+        mingw_archs = set()
+        arc_root = f"{self.project}-{self.version}"
+        archive_file_tree = ArchiveFileTree()
+
+        if "autotools" in self.release_info["mingw"]:
+            for arch in self.release_info["mingw"]["autotools"]["archs"]:
+                triplet = ARCH_TO_TRIPLET[arch]
+                new_env["CC"] = f"{triplet}-gcc"
+                new_env["CXX"] = f"{triplet}-g++"
+                new_env["RC"] = f"{triplet}-windres"
+
+                assert arch not in mingw_archs
+                mingw_archs.add(arch)
+
+                build_path = build_parent_dir / f"build-{triplet}"
+                install_path = build_parent_dir / f"install-{triplet}"
+                shutil.rmtree(install_path, ignore_errors=True)
+                build_path.mkdir(parents=True, exist_ok=True)
+                with self.section_printer.group(f"Configuring MinGW {triplet} (autotools)"):
+                    extra_args = [arg.replace("@DEP_PREFIX@", str(mingw_deps_path / triplet)) for arg in self.release_info["mingw"]["autotools"]["args"]]
+                    assert "@" not in " ".join(extra_args), f"@ should not be present in extra arguments ({extra_args})"
+                    self.executer.run([
+                        self.root / "configure",
+                        f"--prefix={install_path}",
+                        f"--includedir={install_path}/include",
+                        f"--libdir={install_path}/lib",
+                        f"--bindir={install_path}/bin",
+                        f"--host={triplet}",
+                        f"--build=x86_64-none-linux-gnu",
+                    ] + extra_args, cwd=build_path, env=new_env)
+                with self.section_printer.group(f"Build MinGW {triplet} (autotools)"):
+                    self.executer.run(["make", f"-j{self.cpu_count}"], cwd=build_path, env=new_env)
+                with self.section_printer.group(f"Install MinGW {triplet} (autotools)"):
+                    self.executer.run(["make", "install"], cwd=build_path, env=new_env)
+                archive_file_tree.add_directory_tree(arc_dir=arc_join(arc_root, triplet), path=install_path)
+
+        if "cmake" in self.release_info["mingw"]:
+            assert self.release_info["mingw"]["cmake"]["shared-static"] in ("args", "both")
+            for arch in self.release_info["mingw"]["cmake"]["archs"]:
+                triplet = ARCH_TO_TRIPLET[arch]
+                new_env["CC"] = f"{triplet}-gcc"
+                new_env["CXX"] = f"{triplet}-g++"
+                new_env["RC"] = f"{triplet}-windres"
+
+                assert arch not in mingw_archs
+                mingw_archs.add(arch)
+
+                build_path = build_parent_dir / f"build-{triplet}"
+                install_path = build_parent_dir / f"install-{triplet}"
+                shutil.rmtree(install_path, ignore_errors=True)
+                build_path.mkdir(parents=True, exist_ok=True)
+                if self.release_info["mingw"]["cmake"]["shared-static"] == "args":
+                    args_for_shared_static = ([], )
+                elif self.release_info["mingw"]["cmake"]["shared-static"] == "both":
+                    args_for_shared_static = (["-DBUILD_SHARED_LIBS=ON"], ["-DBUILD_SHARED_LIBS=OFF"])
+                for arg_for_shared_static in args_for_shared_static:
+                    with self.section_printer.group(f"Configuring MinGW {triplet} (CMake)"):
+                        extra_args = [arg.replace("@DEP_PREFIX@", str(mingw_deps_path / triplet)) for arg in self.release_info["mingw"]["cmake"]["args"]]
+                        assert "@" not in " ".join(extra_args), f"@ should not be present in extra arguments ({extra_args})"
+                        self.executer.run([
+                            f"cmake",
+                            f"-S", str(self.root), "-B", str(build_path),
+                            f"-DCMAKE_BUILD_TYPE={build_type}",
+                            f'''-DCMAKE_C_FLAGS="-ffile-prefix-map={self.root}=/src/{self.project}"''',
+                            f'''-DCMAKE_CXX_FLAGS="-ffile-prefix-map={self.root}=/src/{self.project}"''',
+                            f"-DCMAKE_PREFIX_PATH={mingw_deps_path / triplet}",
+                            f"-DCMAKE_INSTALL_PREFIX={install_path}",
+                            f"-DCMAKE_INSTALL_INCLUDEDIR=include",
+                            f"-DCMAKE_INSTALL_LIBDIR=lib",
+                            f"-DCMAKE_INSTALL_BINDIR=bin",
+                            f"-DCMAKE_INSTALL_DATAROOTDIR=share",
+                            f"-DCMAKE_TOOLCHAIN_FILE={self.root}/build-scripts/cmake-toolchain-mingw64-{ARCH_TO_GNU_ARCH[arch]}.cmake",
+                            f"-G{self.cmake_generator}",
+                        ] + extra_args + ([] if self.fast else ["--fresh"]) + arg_for_shared_static, cwd=build_path, env=new_env)
+                    with self.section_printer.group(f"Build MinGW {triplet} (CMake)"):
+                        self.executer.run(["cmake", "--build", str(build_path), "--verbose", "--config", build_type], cwd=build_path, env=new_env)
+                    with self.section_printer.group(f"Install MinGW {triplet} (CMake)"):
+                        self.executer.run(["cmake", "--install", str(build_path)], cwd=build_path, env=new_env)
+                archive_file_tree.add_directory_tree(arc_dir=arc_join(arc_root, triplet), path=install_path, time=self.arc_time)
+
+        print("Recording extra files for MinGW development archive ...")
+        archive_file_tree.add_file_mapping(arc_dir=arc_root, file_mapping=self.release_info["mingw"].get("files", {}), file_mapping_root=self.root, context=self.get_context(), time=self.arc_time)
+        print("... done")
+
+        print("Creating zip/tgz/txz development archives ...")
         zip_path = self.dist_path / f"{self.project}-devel-{self.version}-mingw.zip"
-        tar_exts = ("gz", "xz")
-        tar_paths = { ext: self.dist_path / f"{self.project}-devel-{self.version}-mingw.tar.{ext}" for ext in tar_exts}
-
-        arch_install_paths = {}
-        arch_files = {}
-
-        for arch in mingw_archs:
-            build_path = build_parent_dir / f"build-{arch}"
-            install_path = build_parent_dir / f"install-{arch}"
-            arch_install_paths[arch] = install_path
-            shutil.rmtree(install_path, ignore_errors=True)
-            build_path.mkdir(parents=True, exist_ok=True)
-            with self.section_printer.group(f"Configuring MinGW {arch}"):
-                self.executer.run([
-                    "cmake", "-S", str(self.root), "-B", str(build_path),
-                    "--fresh",
-                    f'''-DCMAKE_C_FLAGS="-ffile-prefix-map={self.root}=/src/{self.project}"''',
-                    f'''-DCMAKE_CXX_FLAGS="-ffile-prefix-map={self.root}=/src/{self.project}"''',
-                    "-DSDL_SHARED=ON",
-                    "-DSDL_STATIC=ON",
-                    "-DSDL_DISABLE_INSTALL_DOCS=ON",
-                    "-DSDL_TEST_LIBRARY=ON",
-                    "-DSDL_TESTS=OFF",
-                    "-DCMAKE_INSTALL_BINDIR=bin",
-                    "-DCMAKE_INSTALL_DATAROOTDIR=share",
-                    "-DCMAKE_INSTALL_INCLUDEDIR=include",
-                    "-DCMAKE_INSTALL_LIBDIR=lib",
-                    f"-DCMAKE_BUILD_TYPE={build_type}",
-                    f"-DCMAKE_TOOLCHAIN_FILE={self.root}/build-scripts/cmake-toolchain-mingw64-{arch}.cmake",
-                    f"-G{self.cmake_generator}",
-                    f"-DCMAKE_INSTALL_PREFIX={install_path}",
-                ])
-            with self.section_printer.group(f"Build MinGW {arch}"):
-                self.executer.run(["cmake", "--build", str(build_path), "--verbose", "--config", build_type])
-            with self.section_printer.group(f"Install MinGW {arch}"):
-                self.executer.run(["cmake", "--install", str(build_path), "--strip", "--config", build_type])
-            arch_files[arch] = list(Path(r) / f for r, _, files in os.walk(install_path) for f in files)
-
-        extra_files = (
-            ("build-scripts/pkg-support/mingw/INSTALL.txt", ""),
-            ("build-scripts/pkg-support/mingw/Makefile", ""),
-            ("build-scripts/pkg-support/mingw/cmake/SDL3Config.cmake", "cmake/"),
-            ("build-scripts/pkg-support/mingw/cmake/SDL3ConfigVersion.cmake", "cmake/"),
-            ("BUGS.txt", ""),
-            ("CREDITS.md", ""),
-            ("README-SDL.txt", ""),
-            ("WhatsNew.txt", ""),
-            ("LICENSE.txt", ""),
-            ("README.md", ""),
-            ("docs/*", "docs/"),
-        )
-        test_files = list(Path(r) / f for r, _, files in os.walk(self.root / "test") for f in files)
-
-        # FIXME: split SDL3.dll debug information into debug library
-        # objcopy --only-keep-debug SDL3.dll SDL3.debug.dll
-        # objcopy --add-gnu-debuglink=SDL3.debug.dll SDL3.dll
-        # objcopy --strip-debug SDL3.dll
-
-        for comp in tar_exts:
-            logger.info("Creating %s...", tar_paths[comp])
-            with tarfile.open(tar_paths[comp], f"w:{comp}") as tar_object:
-                arc_root = f"{self.project}-{self.version}"
-                for file_path_glob, arcdirname in extra_files:
-                    assert not arcdirname or arcdirname[-1] == "/"
-                    for file_path in glob.glob(file_path_glob, root_dir=self.root):
-                        file_path = self.root / file_path
-                        arcname = f"{arc_root}/{arcdirname}{Path(file_path).name}"
-                        tar_object.add(file_path, arcname=arcname)
-                for arch in mingw_archs:
-                    install_path = arch_install_paths[arch]
-                    arcname_parent = f"{arc_root}/{arch}-w64-mingw32"
-                    for file in arch_files[arch]:
-                        arcname = os.path.join(arcname_parent, file.relative_to(install_path))
-                        tar_object.add(file, arcname=arcname)
-                for test_file in test_files:
-                    arcname = f"{arc_root}/test/{test_file.relative_to(self.root/'test')}"
-                    tar_object.add(test_file, arcname=arcname)
-                self._tar_add_git_hash(tar_object=tar_object, root=arc_root)
-
-                self.artifacts[f"mingw-devel-tar-{comp}"] = tar_paths[comp]
-
-    def build_vs(self, arch: str, platform: str, vs: VisualStudio, configuration: str="Release") -> VcArchDevel:
-        dll_path = self.root / f"VisualC/SDL/{platform}/{configuration}/{self.project}.dll"
-        pdb_path = self.root / f"VisualC/SDL/{platform}/{configuration}/{self.project}.pdb"
-        imp_path = self.root / f"VisualC/SDL/{platform}/{configuration}/{self.project}.lib"
-        test_path = self.root / f"VisualC/SDL_test/{platform}/{configuration}/{self.project}_test.lib"
-
-        dll_path.unlink(missing_ok=True)
-        pdb_path.unlink(missing_ok=True)
-        imp_path.unlink(missing_ok=True)
-        test_path.unlink(missing_ok=True)
-
-        projects = [
-            self.root / "VisualC/SDL/SDL.vcxproj",
-            self.root / "VisualC/SDL_test/SDL_test.vcxproj",
-        ]
-
-        with self.section_printer.group(f"Build {arch} VS binary"):
-            vs.build(arch=arch, platform=platform, configuration=configuration, projects=projects)
-
-        if self.dry:
-            dll_path.parent.mkdir(parents=True, exist_ok=True)
-            dll_path.touch()
-            pdb_path.touch()
-            imp_path.touch()
-            test_path.parent.mkdir(parents=True, exist_ok=True)
-            test_path.touch()
-
-        assert dll_path.is_file(), "SDL3.dll has not been created"
-        assert pdb_path.is_file(), "SDL3.pdb has not been created"
-        assert imp_path.is_file(), "SDL3.lib has not been created"
-        assert test_path.is_file(), "SDL3_test.lib has not been created"
-
-        zip_path = self.dist_path / f"{self.project}-{self.version}-win32-{arch}.zip"
-        zip_path.unlink(missing_ok=True)
-        logger.info("Creating %s", zip_path)
-        with zipfile.ZipFile(zip_path, mode="w", compression=zipfile.ZIP_DEFLATED) as zf:
-            logger.debug("Adding %s", dll_path.name)
-            zf.write(dll_path, arcname=dll_path.name)
-            logger.debug("Adding %s", "README-SDL.txt")
-            zf.write(self.root / "README-SDL.txt", arcname="README-SDL.txt")
-            self._zip_add_git_hash(zip_file=zf)
-        self.artifacts[f"VC-{arch}"] = zip_path
-
-        return VcArchDevel(dll=dll_path, pdb=pdb_path, imp=imp_path, test=test_path)
-
-    def build_vs_cmake(self, arch: str, arch_cmake: str) -> VcArchDevel:
-        build_path = self.root / f"build-vs-{arch}"
-        install_path = build_path / "prefix"
-        dll_path = install_path / f"bin/{self.project}.dll"
-        pdb_path = install_path / f"bin/{self.project}.pdb"
-        imp_path = install_path / f"lib/{self.project}.lib"
-        test_path = install_path / f"lib/{self.project}_test.lib"
-
-        dll_path.unlink(missing_ok=True)
-        pdb_path.unlink(missing_ok=True)
-        imp_path.unlink(missing_ok=True)
-        test_path.unlink(missing_ok=True)
-
-        build_type = "Release"
-
-        shutil.rmtree(install_path, ignore_errors=True)
-        build_path.mkdir(parents=True, exist_ok=True)
-        with self.section_printer.group(f"Configure VC CMake project for {arch}"):
-            self.executer.run([
-                "cmake", "-S", str(self.root), "-B", str(build_path),
-                "--fresh",
-                "-A", arch_cmake,
-                "-DSDL_SHARED=ON",
-                "-DSDL_STATIC=OFF",
-                "-DSDL_DISABLE_INSTALL_DOCS=ON",
-                "-DSDL_TEST_LIBRARY=ON",
-                "-DSDL_TESTS=OFF",
-                "-DCMAKE_INSTALL_BINDIR=bin",
-                "-DCMAKE_INSTALL_DATAROOTDIR=share",
-                "-DCMAKE_INSTALL_INCLUDEDIR=include",
-                "-DCMAKE_INSTALL_LIBDIR=lib",
-                f"-DCMAKE_BUILD_TYPE={build_type}",
-                f"-DCMAKE_INSTALL_PREFIX={install_path}",
-                # MSVC debug information format flags are selected by an abstraction
-                "-DCMAKE_POLICY_DEFAULT_CMP0141=NEW",
-                # MSVC debug information format
-                "-DCMAKE_MSVC_DEBUG_INFORMATION_FORMAT=ProgramDatabase",
-                # Linker flags for executables
-                "-DCMAKE_EXE_LINKER_FLAGS=-DEBUG",
-                # Linker flag for shared libraries
-                "-DCMAKE_SHARED_LINKER_FLAGS=-INCREMENTAL:NO -DEBUG -OPT:REF -OPT:ICF",
-                # MSVC runtime library flags are selected by an abstraction
-                "-DCMAKE_POLICY_DEFAULT_CMP0091=NEW",
-                # Use statically linked runtime (-MT) (ideally, should be "MultiThreaded$<$<CONFIG:Debug>:Debug>")
-                "-DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded",
-            ])
+        tgz_path = self.dist_path / f"{self.project}-devel-{self.version}-mingw.tar.gz"
+        txz_path = self.dist_path / f"{self.project}-devel-{self.version}-mingw.tar.xz"
 
-        with self.section_printer.group(f"Build VC CMake project for {arch}"):
-            self.executer.run(["cmake", "--build", str(build_path), "--verbose", "--config", build_type])
-        with self.section_printer.group(f"Install VC CMake project for {arch}"):
-            self.executer.run(["cmake", "--install", str(build_path), "--config", build_type])
+        with Archiver(zip_path=zip_path, tgz_path=tgz_path, txz_path=txz_path) as archiver:
+            archive_file_tree.add_to_archiver(archive_base="", archiver=archiver)
+            archiver.add_git_hash(arcdir=arc_root, commit=self.commit, time=self.arc_time)
+        print("... done")
 
-        assert dll_path.is_file(), "SDL3.dll has not been created"
-        assert pdb_path.is_file(), "SDL3.pdb has not been created"
-        assert imp_path.is_file(), "SDL3.lib has not been created"
-        assert test_path.is_file(), "SDL3_test.lib has not been created"
+        self.artifacts["mingw-devel-zip"] = zip_path
+        self.artifacts["mingw-devel-tar-gz"] = tgz_path
+        self.artifacts["mingw-devel-tar-xz"] = txz_path
 
-        zip_path = self.dist_path / f"{self.project}-{self.version}-win32-{arch}.zip"
-        zip_path.unlink(missing_ok=True)
-        logger.info("Creating %s", zip_path)
-        with zipfile.ZipFile(zip_path, mode="w", compression=zipfile.ZIP_DEFLATED) as zf:
-            logger.debug("Adding %s", dll_path.name)
-            zf.write(dll_path, arcname=dll_path.name)
-            logger.debug("Adding %s", "README-SDL.txt")
-            zf.write(self.root / "README-SDL.txt", arcname="README-SDL.txt")
-            self._zip_add_git_hash(zip_file=zf)
-        self.artifacts[f"VC-{arch}"] = zip_path
-
-        return VcArchDevel(dll=dll_path, pdb=pdb_path, imp=imp_path, test=test_path)
-
-    def build_vs_devel(self, arch_vc: dict[str, VcArchDevel]) -> None:
-        zip_path = self.dist_path / f"{self.project}-devel-{self.version}-VC.zip"
-        archive_prefix = f"{self.project}-{self.version}"
-
-        def zip_file(zf: zipfile.ZipFile, path: Path, arcrelpath: str):
-            arcname = f"{archive_prefix}/{arcrelpath}"
-            logger.debug("Adding %s to %s", path, arcname)
-            zf.write(path, arcname=arcname)
-
-        def zip_directory(zf: zipfile.ZipFile, directory: Path, arcrelpath: str):
-            for f in directory.iterdir():
-                if f.is_file():
-                    arcname = f"{archive_prefix}/{arcrelpath}/{f.name}"
-                    logger.debug("Adding %s to %s", f, arcname)
-                    zf.write(f, arcname=arcname)
-
-        with zipfile.ZipFile(zip_path, mode="w", compression=zipfile.ZIP_DEFLATED) as zf:
-            for arch, binaries in arch_vc.items():
-                zip_file(zf, path=binaries.dll, arcrelpath=f"lib/{arch}/{binaries.dll.name}")
-                zip_file(zf, path=binaries.imp, arcrelpath=f"lib/{arch}/{binaries.imp.name}")
-                zip_file(zf, path=binaries.pdb, arcrelpath=f"lib/{arch}/{binaries.pdb.name}")
-                zip_file(zf, path=binaries.test, arcrelpath=f"lib/{arch}/{binaries.test.name}")
-
-            zip_directory(zf, directory=self.root / "include/SDL3", arcrelpath="include/SDL3")
-            zip_directory(zf, directory=self.root / "docs", arcrelpath="docs")
-            zip_directory(zf, directory=self.root / "VisualC/pkg-support/cmake", arcrelpath="cmake")
-            zip_file(zf, path=self.root / "cmake/sdlcpu.cmake", arcrelpath="cmake/sdlcpu.cmake")
-
-            for txt in ("BUGS.txt", "README-SDL.txt", "WhatsNew.txt"):
-                zip_file(zf, path=self.root / txt, arcrelpath=txt)
-            zip_file(zf, path=self.root / "LICENSE.txt", arcrelpath="COPYING.txt")
-            zip_file(zf, path=self.root / "README.md", arcrelpath="README.txt")
-
-            self._zip_add_git_hash(zip_file=zf, root=archive_prefix)
-        self.artifacts["VC-devel"] = zip_path
-
-    def detect_android_api(self, android_home: str) -> typing.Optional[int]:
+    def _detect_android_api(self, android_home: str) -> typing.Optional[int]:
         platform_dirs = list(Path(p) for p in glob.glob(f"{android_home}/platforms/android-*"))
         re_platform = re.compile("android-([0-9]+)")
         platform_versions = []
@@ -555,15 +831,15 @@ def detect_android_api(self, android_home: str) -> typing.Optional[int]:
                 platform_versions.append(int(m.group(1)))
         platform_versions.sort()
         logger.info("Available platform versions: %s", platform_versions)
-        platform_versions = list(filter(lambda v: v >= ANDROID_MINIMUM_API, platform_versions))
-        logger.info("Valid platform versions (>=%d): %s", ANDROID_MINIMUM_API, platform_versions)
+        platform_versions = list(filter(lambda v: v >= self._android_api_minimum, platform_versions))
+        logger.info("Valid platform versions (>=%d): %s", self._android_api_minimum, platform_versions)
         if not platform_versions:
             return None
         android_api = platform_versions[0]
         logger.info("Selected API version %d", android_api)
         return android_api
 
-    def get_prefab_json_text(self) -> str:
+    def _get_prefab_json_text(self) -> str:
         return textwrap.dedent(f"""\
             {{
                 "schema_version": 2,
@@ -573,195 +849,445 @@ def get_prefab_json_text(self) -> str:
             }}
         """)
 
-    def get_prefab_module_json_text(self, library_name: str, extra_libs: list[str]) -> str:
-        export_libraries_str = ", ".join(f"\"-l{lib}\"" for lib in extra_libs)
-        return textwrap.dedent(f"""\
-            {{
-                "export_libraries": [{export_libraries_str}],
-                "library_name": "lib{library_name}"
-            }}
-        """)
+    def _get_prefab_module_json_text(self, library_name: typing.Optional[str], export_libraries: list[str]) -> str:
+        for lib in export_libraries:
+            assert isinstance(lib, str), f"{lib} must be a string"
+        module_json_dict = {
+            "export_libraries": export_libraries,
+        }
+        if library_name:
+            module_json_dict["library_name"] = f"lib{library_name}"
+        return json.dumps(module_json_dict, indent=4)
 
-    def get_prefab_abi_json_text(self, abi: str, cpp: bool, shared: bool) -> str:
-        return textwrap.dedent(f"""\
-            {{
-              "abi": "{abi}",
-              "api": {ANDROID_MINIMUM_API},
-              "ndk": {ANDROID_MINIMUM_NDK},
-              "stl": "{'c++_shared' if cpp else 'none'}",
-              "static": {'true' if not shared else 'false'}
-            }}
-        """)
+    @property
+    def _android_api_minimum(self):
+        return self.release_info["android"]["api-minimum"]
 
-    def get_android_manifest_text(self) -> str:
+    @property
+    def _android_api_target(self):
+        return self.release_info["android"]["api-target"]
+
+    @property
+    def _android_ndk_minimum(self):
+        return self.release_info["android"]["ndk-minimum"]
+
+    def _get_prefab_abi_json_text(self, abi: str, cpp: bool, shared: bool) -> str:
+        abi_json_dict = {
+            "abi": abi,
+            "api": self._android_api_minimum,
+            "ndk": self._android_ndk_minimum,
+            "stl": "c++_shared" if cpp else "none",
+            "static": not shared,
+        }
+        return json.dumps(abi_json_dict, indent=4)
+
+    def _get_android_manifest_text(self) -> str:
         return textwrap.dedent(f"""\
             <manifest
                 xmlns:android="http://schemas.android.com/apk/res/android"
                 package="org.libsdl.android.{self.project}" android:versionCode="1"
                 android:versionName="1.0">
-                <uses-sdk android:minSdkVersion="{ANDROID_MINIMUM_API}"
-                          android:targetSdkVersion="{ANDROID_TARGET_API}" />
+                <uses-sdk android:minSdkVersion="{self._android_api_minimum}"
+                          android:targetSdkVersion="{self._android_api_target}" />
             </manifest>
         """)
 
-    def create_android_archives(self, android_api: int, android_home: Path, android_ndk_home: Path, android_abis: list[str]) -> None:
+    def create_android_archives(self, android_api: int, android_home: Path, android_ndk_home: Path) -> None:
         cmake_toolchain_file = Path(android_ndk_home) / "build/cmake/android.toolchain.cmake"
         if not cmake_toolchain_file.exists():
             logger.error("CMake toolchain file does not exist (%s)", cmake_toolchain_file)
             raise SystemExit(1)
         aar_path =  self.dist_path / f"{self.project}-{self.version}.aar"
-        added_global_files = False
-        with zipfile.ZipFile(aar_path, "w", compression=zipfile.ZIP_DEFLATED) as zip_object:
-            def configure_file(path: Path) -> str:
-                text = path.read_text()
-                text = text.replace("@PROJECT_VERSION@", self.version)
-                text = text.replace("@PROJECT_NAME@", self.project)
-                return text
-
-            install_txt = configure_file(self.root / "build-scripts/pkg-support/android/INSTALL.md.in")
-            zip_object.writestr("INSTALL.md", install_txt)
-
-            project_description = {
-                "name": self.project,
-                "version": self.version,
-                "git-hash": self.commit,
-            }
-            zip_object.writestr("description.json", json.dumps(project_description, indent=0))
-            main_py = configure_file(self.root / "build-scripts/pkg-support/android/__main__.py.in")
-            zip_object.writestr("__main__.py", main_py)
-
-            zip_object.writestr("AndroidManifest.xml", self.get_android_manifest_text())
-            zip_object.write(self.root / "android-project/app/proguard-rules.pro", arcname="proguard.txt")
-            zip_object.write(self.root / "LICENSE.txt", arcname="META-INF/LICENSE.txt")
-            zip_object.write(self.root / "cmake/sdlcpu.cmake", arcname="cmake/sdlcpu.cmake")
-            zip_object.write(self.root / "build-scripts/pkg-support/android/cmake/SDL3Config.cmake", arcname="cmake/SDL3Config.cmake")
-            zip_object.write(self.root / "build-scripts/pkg-support/android/cmake/SDL3ConfigVersion.cmake", arcname="cmake/SDL3ConfigVersion.cmake")
-            zip_object.writestr("prefab/prefab.json", self.get_prefab_json_text())
-            self._zip_add_git_hash(zip_file=zip_object)
-
-            for android_abi in android_abis:
-                with self.section_printer.group(f"Building for Android {android_api} {android_abi}"):
-                    build_dir = self.root / "build-android" / f"{android_abi}-build"
-                    install_dir = self.root / "install-android" / f"{android_abi}-install"
-                    shutil.rmtree(install_dir, ignore_errors=True)
-                    assert not install_dir.is_dir(), f"{install_dir} should not exist prior to build"
-                    cmake_args = [
-                        "cmake",
-                        "-S", str(self.root),
-                        "-B", str(build_dir),
-                        "--fresh",
-                        f'''-DCMAKE_C_FLAGS="-ffile-prefix-map={self.root}=/src/{self.project}"''',
-                        f'''-DCMAKE_CXX_FLAGS="-ffile-prefix-map={self.root}=/src/{self.project}"''',
-                        "-DCMAKE_BUILD_TYPE=RelWithDebInfo",
-                        f"-DCMAKE_TOOLCHAIN_FILE={cmake_toolchain_file}",
-                        f"-DANDROID_PLATFORM={android_api}",
-                        f"-DANDROID_ABI={android_abi}",
-                        "-DCMAKE_POSITION_INDEPENDENT_CODE=ON",
-                        "-DSDL_SHARED=ON",
-                        "-DSDL_STATIC=OFF",
-                        "-DSDL_TEST_LIBRARY=ON",
-                        "-DSDL_DISABLE_ANDROID_JAR=OFF",
-                        "-DSDL_TESTS=OFF",
-                        f"-DCMAKE_INSTALL_PREFIX={install_dir}",
-                        "-DSDL_DISABLE_INSTALL=OFF",
-                        "-DSDL_DISABLE_INSTALL_DOCS=OFF",
-                        "-DCMAKE_INSTALL_INCLUDEDIR=include ",
-                        "-DCMAKE_INSTALL_LIBDIR=lib",
-                        "-DCMAKE_INSTALL_DATAROOTDIR=share",
-                        "-DCMAKE_BUILD_TYPE=Release",
-                        f"-DSDL_ANDROID_HOME={android_home}",
-                        f"-G{self.cmake_generator}",
-                    ]
-                    build_args = [
-                        "cmake",
-                        "--build", str(build_dir),
-                        "--config", "RelWithDebInfo",
-                    ]
-                    install_args = [
-                        "cmake",
-                        "--install", str(build_dir),
-                        "--config", "RelWithDebInfo",
-                    ]
-                    self.executer.run(cmake_args)
-                    self.executer.run(build_args)
-                    self.executer.run(install_args)
-
-                    main_so_library = install_dir / "lib" / f"lib{self.project}.so"
-                    logger.debug("Expecting library %s", main_so_library)
-                    assert main_so_library.is_file(), "CMake should have built a shared library (e.g. libSDL3.so)"
-
-                    test_library = install_dir / "lib" / f"lib{self.project}_test.a"
-                    logger.debug("Expecting library %s", test_library)
-                    assert test_library.is_file(), "CMake should have built a static test library (e.g. libSDL3_test.a)"
-
-                    java_jar = install_dir / f"share/java/{self.project}/{self.project}-{self.version}.jar"
-                    logger.debug("Expecting java archive: %s", java_jar)
-                    assert java_jar.is_file(), "CMake should have compiled the java sources and archived them into a JAR"
-
-                    javasources_jar = install_dir / f"share/java/{self.project}/{self.project}-{self.version}-sources.jar"
-                    logger.debug("Expecting java sources archive %s", javasources_jar)
-                    assert javasources_jar.is_file(), "CMake should have archived the java sources into a JAR"
-
-                    javadoc_dir = install_dir / "share/javadoc" / self.project
-                    logger.debug("Expecting javadoc archive %s", javadoc_dir)
-                    assert javadoc_dir.is_dir(), "CMake should have built javadoc documentation for the java sources"
-                    if not added_global_files:
-                        zip_object.write(java_jar, arcname="classes.jar")
-                        zip_object.write(javasources_jar, arcname="classes-sources.jar", )
-                        doc_jar_path = install_dir / "classes-doc.jar"
-
-                        javadoc_jar_args = ["jar", "--create", "--file", str(doc_jar_path)]
-                        for fn in javadoc_dir.iterdir():
-                            javadoc_jar_args.extend(["-C", str(javadoc_dir), fn.name])
-                        self.executer.run(javadoc_jar_args)
-                        zip_object.write(doc_jar_path, arcname="classes-doc.jar")
-
-                        for header in (install_dir / "include" / self.project).iterdir():
-                            zip_object.write(header, arcname=f"prefab/modules/{self.project}/include/{self.project}/{header.name}")
-
-                        zip_object.writestr(f"prefab/modules/{self.project}/module.json", self.get_prefab_module_json_text(library_name=self.project, extra_libs=[]))
-                        zip_object.writestr(f"prefab/modules/{self.project}_test/module.json", self.get_prefab_module_json_text(library_name=f"{self.project}_test", extra_libs=list()))
-                        added_global_files = True
-
-                    zip_object.write(main_so_library, arcname=f"prefab/modules/{self.project}/libs/android.{android_abi}/lib{self.project}.so")
-                    zip_object.writestr(f"prefab/modules/{self.project}/libs/android.{android_abi}/abi.json", self.get_prefab_abi_json_text(abi=android_abi, cpp=False, shared=True))
-                    zip_object.write(test_library, arcname=f"prefab/modules/{self.project}_test/libs/android.{android_abi}/lib{self.project}_test.a")
-                    zip_object.writestr(f"prefab/modules/{self.project}_test/libs/android.{android_abi}/abi.json", self.get_prefab_abi_json_text(abi=android_abi, cpp=False, shared=False))
-
+        android_abis = self.release_info["android"]["abis"]
+        java_jars_added = False
+        module_data_added = False
+        android_deps_path = self.deps_path / "android-deps"
+        shutil.rmtree(android_deps_path, ignore_errors=True)
+
+        for dep, depinfo in self.release_info["android"].get("dependencies", {}).items():
+            android_aar = self.deps_path / glob.glob(depinfo["artifact"], root_dir=self.deps_path)[0]
+            with self.section_printer.group(f"Extracting Android dependency {dep} ({android_aar.name})"):
+                self.executer.run([sys.executable, str(android_aar), "-o", str(android_deps_path)])
+
+        for module_name, module_info in self.release_info["android"]["modules"].items():
+            assert "type" in module_info and module_info["type"] in ("interface", "library"), f"module {module_name} must have a valid type"
+
+        archive_file_tree = ArchiveFileTree()
+
+        for android_abi in android_abis:
+            with self.section_printer.group(f"Building for Android {android_api} {android_abi}"):
+                build_dir = self.root / "build-android" / f"{android_abi}-build"
+                install_dir = self.root / "install-android" / f"{android_abi}-install"
+                shutil.rmtree(install_dir, ignore_errors=True)
+                assert not install_dir.is_dir(), f"{install_dir} should not exist prior to build"
+                build_type = "Release"
+                cmake_args = [
+                    "cmake",
+                    "-S", str(self.root),
+                    "-B", str(build_dir),
+                    f'''-DCMAKE_C_FLAGS="-ffile-prefix-map={self.root}=/src/{self.project}"''',
+                    f'''-DCMAKE_CXX_FLAGS="-ffile-prefix-map={self.root}=/src/{self.project}"''',
+                    f"-DCMAKE_TOOLCHAIN_FILE={cmake_toolchain_file}",
+                    f"-DCMAKE_PREFIX_PATH={str(android_deps_path)}",
+                    f"-DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=BOTH",
+                    f"-DANDROID_HOME={android_home}",
+                    f"-DANDROID_PLATFORM={android_api}",
+                    f"-DANDROID_ABI={android_abi}",
+                    "-DCMAKE_POSITION_INDEPENDENT_CODE=ON",
+                    f"-DCMAKE_INSTALL_PREFIX={install_dir}",
+                    "-DCMAKE_INSTALL_INCLUDEDIR=include ",
+                    "-DCMAKE_INSTALL_LIBDIR=lib",
+                    "-DCMAKE_INSTALL_DATAROOTDIR=share",
+                    f"-DCMAKE_BUILD_TYPE={build_type}",
+                    f"-G{self.cmake_generator}",
+                ] + self.release_info["android"]["cmake"]["args"] + ([] if self.fast else ["--fresh"])
+                build_args = [
+                    "cmake",
+                    "--build", str(build_dir),
+                    "--verbose",
+                    "--config", build_type,
+                ]
+                install_args = [
+                    "cmake",
+                    "--install", str(build_dir),
+                    "--config", build_type,
+                ]
+                self.executer.run(cmake_args)
+                self.executer.run(build_args)
+                self.executer.run(install_args)
+
+                for module_name, module_info in self.release_info["android"]["modules"].items():
+                    arcdir_prefab_module = f"prefab/modules/{module_name}"
+                    if module_info["type"] == "library":
+                        library = install_dir / module_info["library"]
+                        assert library.suffix in (".so", ".a")
+                        assert library.is_file(), f"CMake should have built library '{library}' for module {module_name}"
+                        arcdir_prefab_libs = f"{arcdir_prefab_module}/libs/android.{android_abi}"
+                        archive_file_tree.add_file(NodeInArchive.from_fs(arcpath=f"{arcdir_prefab_libs}/{library.name}", path=library, time=self.arc_time))
+                        archive_file_tree.add_file(NodeInArchive.from_text(arcpath=f"{arcdir_prefab_libs}/abi.json", text=self._get_prefab_abi_json_text(abi=android_abi, cpp=False, shared=library.suffix == ".so"), time=self.arc_time))
+
+                    if not module_data_added:
+                        library_name = None
+                        if module_info["type"] == "library":
+                            library_name = Path(module_info["library"]).stem.removeprefix("lib")
+                        export_libraries = module_info.get("export-libraries", [])
+                        archive_file_tree.add_file(NodeInArchive.from_text(arcpath=arc_join(arcdir_prefab_module, "module.json"), text=self._get_prefab_module_json_text(library_name=library_name, export_libraries=export_libraries), time=self.arc_time))
+                        arcdir_prefab_include = f"prefab/modules/{module_name}/include"
+                        if "includes" in module_info:
+                            archive_file_tree.add_file_mapping(arc_dir=arcdir_prefab_include, file_mapping=module_info["includes"], file_mapping_root=install_dir, context=self.get_context(), time=self.arc_time)
+                        else:
+                            archive_file_tree.add_file(NodeInArchive.from_text(arcpath=arc_join(arcdir_prefab_include, ".keep"), text="\n", time=self.arc_time))
+                module_data_added = True
+
+                if not java_jars_added:
+                    java_jars_added = True
+                    if "jars" in self.release_info["android"]:
+                        classes_jar_path = install_dir / configure_text(text=self.release_info["android"]["jars"]["classes"], context=self.get_context())
+                        sources_jar_path = install_dir / configure_text(text=self.release_info["android"]["jars"]["sources"], context=self.get_context())
+                        doc_jar_path = install_dir / configure_text(text=self.release_info["android"]["jars"]["doc"], context=self.get_context())
+                        assert classes_jar_path.is_file(), f"CMake should have compiled the java sources and archived them into a JAR ({classes_jar_path})"
+                        assert sources_jar_path.is_file(), f"CMake should have archived the java sources into a JAR ({sources_jar_path})"
+                        assert doc_jar_path.is_file(), f"CMake should have archived javadoc into a JAR ({doc_jar_path})"
+
+                        archive_file_tree.add_file(NodeInArchive.from_fs(arcpath="classes.jar", path=classes_jar_path, time=self.arc_time))
+                        archive_file_tree.add_file(NodeInArchive.from_fs(arcpath="classes-sources.jar", path=sources_jar_path, time=self.arc_time))
+                        archive_file_tree.add_file(NodeInArchive.from_fs(arcpath="classes-doc.jar", path=doc_jar_path, time=self.arc_time))
+
+        assert ("jars" in self.release_info["android"] and java_jars_added) or "jars" not in self.release_info["android"], "Must have archived java JAR archives"
+
+        archive_file_tree.add_file_mapping(arc_dir="", file_mapping=self.release_info["android"].get("files", {}), file_mapping_root=self.root, context=self.get_context(), time=self.arc_time)
+
+        archive_file_tree.add_file(NodeInArchive.from_text(arcpath="prefab/prefab.json", text=self._get_prefab_json_text(), time=self.arc_time))
+        archive_file_tree.add_file(NodeInArchive.from_text(arcpath="AndroidManifest.xml", text=self._get_android_manifest_text(), time=self.arc_time))
+
+        with Archiver(zip_path=aar_path) as archiver:
+            archive_file_tree.add_to_archiver(archive_base="", archiver=archiver)
+            archiver.add_git_hash(arcdir="", commit=self.commit, time=self.arc_time)
         self.artifacts[f"android-aar"] = aar_path
 
+    def download_dependencies(self):
+        shutil.rmtree(self.deps_path, ignore_errors=True)
+        self.deps_path.mkdir(parents=True)
+
+        if self.github:
+            with open(os.environ["GITHUB_OUTPUT"], "a") as f:
+                f.write(f"dep-path={self.deps_path.absolute()}\n")
+
+        for dep, depinfo in self.release_info.get("dependencies", {}).items():
+            startswith = depinfo["startswith"]
+            dep_repo = depinfo["repo"]
+            # FIXME: dropped "--exclude-pre-releases"
+            dep_string_data = self.executer.check_output(["gh", "-R", dep_repo, "release", "list", "--exclude-drafts", "--json", "name,createdAt,tagName", "--jq", f'[.[]|select(.name|startswith("{startswith}"))]|max_by(.createdAt)']).strip()
+            dep_data = json.loads(dep_string_data)
+            dep_tag = dep_data["tagName"]
+            dep_version = dep_data["name"]
+            logger.info("Download dependency %s version %s (tag=%s) ", dep, dep_version, dep_tag)
+            self.executer.run(["gh", "-R", dep_repo, "release", "download", dep_tag], cwd=self.deps_path)
+            if self.github:
+                with open(os.environ["GITHUB_OUTPUT"], "a") as f:
+                    f.write(f"dep-{dep.lower()}-version={dep_version}\n")
+
+    def verify_dependencies(self):
+        for dep, depinfo in self.release_info.get("dependencies", {}).items():
+            if "mingw" in self.release_info:
+                mingw_matches = glob.glob(self.release_info["mingw"]["dependencies"][dep]["artifact"], root_dir=self.deps_path)
+                assert len(mingw_matches) == 1, f"Exactly one archive matches mingw {dep} dependency: {mingw_matches}"
+            if "dmg" in self.release_info:
+                dmg_matches = glob.glob(self.release_info["dmg"]["dependencies"][dep]["artifact"], root_dir=self.deps_path)
+                assert len(dmg_matches) == 1, f"Exactly one archive matches dmg {dep} dependency: {dmg_matches}"
+            if "msvc" in self.release_info:
+                msvc_matches = glob.glob(self.release_info["msvc"]["dependencies"][dep]["artifact"], root_dir=self.deps_path)
+                assert len(msvc_matches) == 1, f"Exactly one archive matches msvc {dep} dependency: {msvc_matches}"
+            if "android" in self.release_info:
+                android_matches = glob.glob(self.release_info["android"]["dependencies"][dep]["artifact"], root_dir=self.deps_path)
+                assert len(android_matches) == 1, f"Exactly one archive matches msvc {dep} dependency: {msvc_matches}"
+
+    @staticmethod
+    def _arch_to_vs_platform(arch: str, configuration: str="Release") -> VsArchPlatformConfig:
+        ARCH_TO_VS_PLATFORM = {
+            "x86": VsArchPlatformConfig(arch="x86", platform="Win32", configuration=configuration),
+            "x64": VsArchPlatformConfig(arch="x64", platform="x64", configuration=configuration),
+            "arm64": VsArchPlatformConfig(arch="arm64", platform="ARM64", configuration=configuration),
+        }
+        return ARCH_TO_VS_PLATFORM[arch]
+
+    def build_msvc(self):
+        with self.section_printer.group("Find Visual Studio"):
+            vs = VisualStudio(executer=self.executer)
+        for arch in self.release_info["msvc"].get("msbuild", {}).get("archs", []):
+            self._build_msvc_msbuild(arch_platform=self._arch_to_vs_platform(arch=arch), vs=vs)
+        if "cmake" in self.release_info["msvc"]:
+            deps_path = self.root / "msvc-deps"
+            shutil.rmtree(deps_path, ignore_errors=True)
+            dep_roots = []
+            for dep, depinfo in self.release_info["msvc"].get("dependencies", {}).items():
+                dep_extract_path = deps_path / f"extract-{dep}"
+                msvc_zip = self.deps_path / glob.glob(depinfo["artifact"], root_dir=self.deps_path)[0]
+                with zipfile.ZipFile(msvc_zip, "r") as zf:
+                    zf.extractall(dep_extract_path)
+                contents_msvc_zip = glob.glob(str(dep_extract_path / "*"))
+                assert len(contents_msvc_zip) == 1, f"There must be exactly one root item in the root directory of {dep}"
+                dep_roots.append(contents_msvc_zip[0])
+
+            for arch in self.release_info["msvc"].get("cmake", {}).get("archs", []):
+                self._build_msvc_cmake(arch_platform=self._arch_to_vs_platform(arch=arch), dep_roots=dep_roots)
+        with self.section_printer.group("Create SDL VC development zip"):
+            self._build_msvc_devel()
+
+    def _build_msvc_msbuild(self, arch_platform: VsArchPlatformConfig, vs: VisualStudio):
+        platform_context = self.get_context(arch_platform.extra_context())
+        for dep, depinfo in self.release_info["msvc"].get("dependencies", {}).items():
+            msvc_zip = self.deps_path / glob.glob(depinfo["artifact"], root_dir=self.deps_path)[0]
+
+            src_globs = [configure_text(instr["src"], context=platform_context) for instr in depinfo["copy"]]
+            with zipfile.ZipFile(msvc_zip, "r") as zf:
+                for member in zf.namelist():
+                    member_path = "/".join(Path(member).parts[1:])
+                    for src_i, src_glob in enumerate(src_globs):
+                        if fnmatch.fnmatch(member_path, src_glob):
+                            dst = (self.root / configure_text(depinfo["copy"][src_i]["dst"], context=platform_context)).resolve() / Path(member_path).name
+                            zip_data = zf.read(member)
+                            if dst.exists():
+                                identical = False
+                                if dst.is_file():
+                                    orig_bytes = dst.read_bytes()
+                                    if orig_bytes == zip_data:
+                                        identical = True
+                                if not identical:
+                                    logger.warning("Extracting dependency %s, will cause %s to be overwritten", dep, dst)
+                                    if not self.overwrite:
+                                        raise RuntimeError("Run with --overwrite to allow overwriting")
+                            logger.debug("Extracting %s -> %s", member, dst)
+
+                            dst.parent.mkdir(exist_ok=True, parents=True)
+                            dst.write_bytes(zip_data)
+
+        prebuilt_paths = set(self.root / full_prebuilt_path for prebuilt_path in self.release_info["msvc"]["msbuild"].get("prebuilt", []) for full_prebuilt_path in glob.glob(configure_text(prebuilt_path, context=platform_context), root_dir=self.root))
+        msbuild_paths = set(self.root / configure_text(f, context=platform_context) for file_mapping in (self.release_info["msvc"]["msbuild"]["files-lib"], self.release_info["msvc"]["msbuild"]["files-devel"]) for files_list in file_mapping.values() for f in files_list)
+        assert prebuilt_paths.issubset(msbuild_paths), f"msvc.msbuild.prebuilt must be a subset of (msvc.msbuild.files-lib, msvc.msbuild.files-devel)"
+        built_paths = msbuild_paths.difference(prebuilt_paths)
+        logger.info("MSbuild builds these files, to be included in the package: %s", built_paths)
+        if not self.fast:
+            for b in built_paths:
+                b.unlink(missing_ok=True)
+
+        rel_projects: list[str] = self.release_info["msvc"]["msbuild"]["projects"]
+        projects = list(self.root / p for p in rel_projects)
+
+        directory_build_props_src_relpath = self.release_info["msvc"]["msbuild"].get("directory-build-props")
+        for project in projects:
+            dir_b_props = project.parent / "Directory.Build.props"
+            dir_b_props.unlink(missing_ok = True)
+            if directory_build_props_src_relpath:
+                src = self.root / directory_build_props_src_relpath
+                logger.debug("Copying %s -> %s", src, dir_b_props)
+                shutil.copy(src=src, dst=dir_b_props)
+
+        with self.section_printer.group(f"Build {arch_platform.arch} VS binary"):
+            vs.build(arch_platform=arch_platform, projects=projects)
+
+        if self.dry:
+            for b in built_paths:
+                b.parent.mkdir(parents=True, exist_ok=True)
+                b.touch()
+
+        for b in built_paths:
+            assert b.is_file(), f"{b} has not been created"
+            b.parent.mkdir(parents=True, exist_ok=True)
+            b.touch()
+
+        zip_path = self.dist_path / f"{self.project}-{self.version}-win32-{arch_platform.arch}.zip"
+        zip_path.unlink(missing_ok=True)
+
+        logger.info("Collecting files...")
+        archive_file_tree = ArchiveFileTree()
+        archive_file_tree.add_file_mapping(arc_dir="", file_mapping=self.release_info["msvc"]["msbuild"]["files-lib"], file_mapping_root=self.root, context=platform_context, time=self.arc_time)
+        archive_file_tree.add_file_mapping(arc_dir="", file_mapping=self.release_info["msvc"]["files-lib"], file_mapping_root=self.root, context=platform_context, time=self.arc_time)
+
+        logger.info("Writing to %s", zip_path)
+        with Archiver(zip_path=zip_path) as archiver:
+            arc_root = f""
+            archive_file_tree.add_to_archiver(archive_base=arc_root, archiver=archiver)
+            archiver.add_git_hash(arcdir=arc_root, commit=self.commit, time=self.arc_time)
+        self.artifacts[f"VC-{arch_platform.arch}"] = zip_path
+
+        for p in built_paths:
+            assert p.is_file(), f"{p} should exist"
+
+    def _arch_platform_to_build_path(self, arch_platform: VsArchPlatformConfig) -> Path:
+        return self.root / f"build-vs-{arch_platform.arch}"
+
+    def _arch_platform_to_install_path(self, arch_platform: VsArchPlatformConfig) -> Path:
+        return self._arch_platform_to_build_path(arch_platform) / "prefix"
+
+    def _build_msvc_cmake(self, arch_platform: VsArchPlatformConfig, dep_roots: list[Path]):
+        build_path = self._arch_platform_to_build_path(arch_platform)
+        install_path = self._arch_platform_to_install_path(arch_platform)
+        platform_context = self.get_context(extra_context=arch_platform.extra_context())
+
+        build_type = "Release"
+
+        built_paths = set(install_path / configure_text(f, context=platform_context) for file_mapping in (self.release_info["msvc"]["cmake"]["files-lib"], self.release_info["msvc"]["cmake"]["files-devel"]) for files_list in file_mapping.values() for f in files_list)
+        logger.info("CMake builds these files, to be included in the package: %s", built_paths)
+        if not self.fast:
+            for b in built_paths:
+                b.unlink(missing_ok=True)
+
+        shutil.rmtree(install_path, ignore_errors=True)
+        build_path.mkdir(parents=True, exist_ok=True)
+        with self.section_printer.group(f"Configure VC CMake project for {arch_platform.arch}"):
+            self.executer.run([
+                "cmake", "-S", str(self.root), "-B", str(build_path),
+                "-A", arch_platform.platform,
+                "-DCMAKE_INSTALL_BINDIR=bin",
+                "-DCMAKE_INSTALL_DATAROOTDIR=share",
+                "-DCMAKE_INSTALL_INCLUDEDIR=include",
+                "-DCMAKE_INSTALL_LIBDIR=lib",
+                f"-DCMAKE_BUILD_TYPE={build_type}",
+                f"-DCMAKE_INSTALL_PREFIX={install_path}",
+                # MSVC debug information format flags are selected by an abstraction
+                "-DCMAKE_POLICY_DEFAULT_CMP0141=NEW",
+                # MSVC debug information format
+                "-DCMAKE_MSVC_DEBUG_INFORMATION_FORMAT=ProgramDatabase",
+                # Linker flags for executables
+                "-DCMAKE_EXE_LINKER_FLAGS=-INCREMENTAL:NO -DEBUG -OPT:REF -OPT:ICF",
+                # Linker flag for shared libraries
+                "-DCMAKE_SHARED_LINKER_FLAGS=-INCREMENTAL:NO -DEBUG -OPT:REF -OPT:ICF",
+                # MSVC runtime library flags are selected by an abstraction
+                "-DCMAKE_POLICY_DEFAULT_CMP0091=NEW",
+                # Use statically linked runtime (-MT) (ideally, should be "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+                "-DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded",
+                f"-DCMAKE_PREFIX_PATH={';'.join(str(s) for s in dep_roots)}",
+            ] + self.release_info["msvc"]["cmake"]["args"] + ([] if self.fast else ["--fresh"]))
+
+        with self.section_printer.group(f"Build VC CMake project for {arch_platform.arch}"):
+            self.executer.run(["cmake", "--build", str(build_path), "--verbose", "--config", build_type])
+        with self.section_printer.group(f"Install VC CMake project for {arch_platform.arch}"):
+            self.executer.run(["cmake", "--install", str(build_path), "--config", build_type])
+
+        if self.dry:
+            for b in built_paths:
+                b.parent.mkdir(parents=True, exist_ok=True)
+                b.touch()
+
+        zip_path = self.dist_path / f"{self.project}-{self.version}-win32-{arch_platform.arch}.zip"
+        zip_path.unlink(missing_ok=True)
+
+        logger.info("Collecting files...")
+        archive_file_tree = ArchiveFileTree()
+        archive_file_tree.add_file_mapping(arc_dir="", file_mapping=self.release_info["msvc"]["cmake"]["files-lib"], file_mapping_root=install_path, context=platform_context, time=self.arc_time)
+        archive_file_tree.add_file_mapping(arc_dir="", file_mapping=self.release_info["msvc"]["files-lib"], file_mapping_root=self.root, context=self.get_context(), time=self.arc_time)
+
+        logger.info("Creating %s", zip_path)
+        with Archiver(zip_path=zip_path) as archiver:
+            arc_root = f""
+            archive_file_tree.add_to_archiver(archive_base=arc_root, archiver=archiver)
+            archiver.add_git_hash(arcdir=arc_root, commit=self.commit, time=self.arc_time)
+
+        for p in built_paths:
+            assert p.is_file(), f"{p} should exist"
+
+    def _build_msvc_devel(self) -> None:
+        zip_path = self.dist_path / f"{self.project}-devel-{self.version}-VC.zip"
+        arc_root = f"{self.project}-{self.version}"
+
+        logger.info("Collecting files...")
+        archive_file_tree = ArchiveFileTree()
+        if "msbuild" in self.release_info["msvc"]:
+            for arch in self.release_info["msvc"]["msbuild"]["archs"]:
+                arch_platform = self._arch_to_vs_platform(arch=arch)
+                platform_context = self.get_context(arch_platform.extra_context())
+                archive_file_tree.add_file_mapping(arc_dir=arc_root, file_mapping=self.release_info["msvc"]["msbuild"]["files-devel"], file_mapping_root=self.root, context=platform_context, time=self.arc_time)
+        if "cmake" in self.release_info["msvc"]:
+            for arch in self.release_info["msvc"]["cmake"]["archs"]:
+                arch_platform = self._arch_to_vs_platform(arch=arch)
+                platform_context = self.get_context(arch_platform.extra_context())
+                archive_file_tree.add_file_mapping(arc_dir=arc_root, file_mapping=self.release_info["msvc"]["cmake"]["files-devel"], file_mapping_root=self._arch_platform_to_install_path(arch_platform), context=platform_context, time=self.arc_time)
+        archive_file_tree.add_file_mapping(arc_dir=arc_root, file_mapping=self.release_info["msvc"]["files-devel"], file_mapping_root=self.root, context=self.get_context(), time=self.arc_time)
+
+        with Archiver(zip_path=zip_path) as archiver:
+            archive_file_tree.add_to_archiver(archive_base="", archiver=archiver)
+            archiver.add_git_hash(arcdir=arc_root, commit=self.commit, time=self.arc_time)
+        self.artifacts["VC-devel"] = zip_path
+
     @classmethod
-    def extract_sdl_version(cls, root: Path, project: str) -> str:
-        with open(root / f"include/{project}/SDL_version.h", "r") as f:
+    def extract_sdl_version(cls, root: Path, release_info: dict) -> str:
+        with open(root / release_info["version"]["file"], "r") as f:
             text = f.read()
-        major = next(re.finditer(r"^#define SDL_MAJOR_VERSION\s+([0-9]+)$", text, flags=re.M)).group(1)
-        minor = next(re.finditer(r"^#define SDL_MINOR_VERSION\s+([0-9]+)$", text, flags=re.M)).group(1)
-        micro = next(re.finditer(r"^#define SDL_MICRO_VERSION\s+([0-9]+)$", text, flags=re.M)).group(1)
+        major = next(re.finditer(release_info["version"]["re_major"], text, flags=re.M)).group(1)
+        minor = next(re.finditer(release_info["version"]["re_minor"], text, flags=re.M)).group(1)
+        micro = next(re.finditer(release_info["version"]["re_micro"], text, flags=re.M)).group(1)
         return f"{major}.{minor}.{micro}"
 
 
 def main(argv=None) -> int:
+    if sys.version_info < (3, 11):
+        logger.error("This script needs at least python 3.11")
+        return 1
+
     parser = argparse.ArgumentParser(allow_abbrev=False, description="Create SDL release artifacts")
-    parser.add_argument("--root", metavar="DIR", type=Path, default=Path(__file__).absolute().parents[1], help="Root of SDL")
+    parser.add_argument("--root", metavar="DIR", type=Path, default=Path(__file__).absolute().parents[1], help="Root of project")
+    parser.add_argument("--release-info", metavar="JSON", dest="path_release_info", type=Path, default=Path(__file__).absolute().parent / "release-info.json", help="Path of release-info.json")
+    parser.add_argument("--dependency-folder", metavar="FOLDER", dest="deps_path", type=Path, default="deps", help="Directory containing pre-built archives of dependencies (will be removed when downloading archives)")
     parser.add_argument("--out", "-o", metavar="DIR", dest="dist_path", type=Path, default="dist", help="Output directory")
     parser.add_argument("--github", action="store_true", help="Script is running on a GitHub runner")
     parser.add_argument("--commit", default="HEAD", help="Git commit/tag of which a release should be created")
-    parser.add_argument("--project", required=True, help="Name of the project (e.g. SDL3")
-    parser.add_argument("--create", choices=["source", "mingw", "win32", "xcframework", "android"], required=True, action="append", dest="actions", help="What to do")
+    parser.add_argument("--actions", choices=["download", "source", "android", "mingw", "msvc", "dmg"], required=True, nargs="+", dest="actions", help="What to do?")
     parser.set_defaults(loglevel=logging.INFO)
     parser.add_argument('--vs-year', dest="vs_year", help="Visual Studio year")
     parser.add_argument('--android-api', type=int, dest="android_api", help="Android API version")
     parser.add_argument('--android-home', dest="android_home", default=os.environ.get("ANDROID_HOME"), help="Android Home folder")
     parser.add_argument('--android-ndk-home', dest="android_ndk_home", default=os.environ.get("ANDROID_NDK_HOME"), help="Android NDK Home folder")
-    parser.add_argument('--android-abis', dest="android_abis", nargs="*", choices=ANDROID_AVAILABLE_ABIS, default=list(ANDROID_AVAILABLE_ABIS), help="Android NDK Home folder")
     parser.add_argument('--cmake-generator', dest="cmake_generator", default="Ninja", help="CMake Generator")
     parser.add_argument('--debug', action='store_const', const=logging.DEBUG, dest="loglevel", help="Print script debug information")
     parser.add_argument('--dry-run', action='store_true', dest="dry", help="Don't execute anything")
     parser.add_argument('--force', action='store_true', dest="force", help="Ignore a non-clean git tree")
+    parser.add_argument('--overwrite', action='store_true', dest="overwrite", help="Allow potentially overwriting other projects")
+    parser.add_argument('--fast', action='store_true', dest="fast", help="Don't do a rebuild")
 
     args = parser.parse_args(argv)
     logging.basicConfig(level=args.loglevel, format='[%(levelname)s] %(message)s')
-    args.actions = set(args.actions)
+    args.deps_path = args.deps_path.absolute()
     args.dist_path = args.dist_path.absolute()
     args.root = args.root.absolute()
     args.dist_path = args.dist_path.absolute()
@@ -773,6 +1299,9 @@ def main(argv=None) -> int:
     else:
         section_printer = SectionPrinter()
 
+    if args.github and "GITHUB_OUTPUT" not in os.environ:
+        os.environ["GITHUB_OUTPUT"] = "/tmp/github_output.txt"
+
     executer = Executer(root=args.root, dry=args.dry)
 
     root_git_hash_path = args.root / GIT_HASH_FILENAME
@@ -783,69 +1312,84 @@ def main(argv=None) -> int:
         if args.commit != archive_commit:
             logger.warning("Commit argument is %s, but archive commit is %s. Using %s.", args.commit, archive_commit, archive_commit)
         args.commit = archive_commit
+        revision = (args.root / REVISION_TXT).read_text().strip()
     else:
-        args.commit = executer.run(["git", "rev-parse", args.commit], stdout=True, dry_out="e5812a9fd2cda317b503325a702ba3c1c37861d9").stdout.strip()
+        args.commit = executer.check_output(["git", "rev-parse", args.commit], dry_out="e5812a9fd2cda317b503325a702ba3c1c37861d9").strip()
+        revision = executer.check_output(["git", "describe", "--always", "--tags", "--long", args.commit], dry_out="preview-3.1.3-96-g9512f2144").strip()
         logger.info("Using commit %s", args.commit)
 
+    try:
+        with args.path_release_info.open() as f:
+            release_info = json.load(f)
+    except FileNotFoundError:
+        logger.error(f"Could not find {args.path_release_info}")
+
     releaser = Releaser(
-        project=args.project,
+        release_info=release_info,
         commit=args.commit,
+        revision=revision,
         root=args.root,
         dist_path=args.dist_path,
         executer=executer,
         section_printer=section_printer,
         cmake_generator=args.cmake_generator,
+        deps_path=args.deps_path,
+        overwrite=args.overwrite,
+        github=args.github,
+        fast=args.fast,
     )
 
     if root_is_maybe_archive:
         logger.warning("Building from archive. Skipping clean git tree check.")
     else:
-        porcelain_status = executer.run(["git", "status", "--ignored", "--porcelain"], stdout=True, dry_out="\n").stdout.strip()
+        porcelain_status = executer.check_output(["git", "status", "--ignored", "--porcelain"], dry_out="\n").strip()
         if porcelain_status:
             print(porcelain_status)
             logger.warning("The tree is dirty! Do not publish any generated artifacts!")
             if not args.force:
                 raise Exception("The git repo contains modified and/or non-committed files. Run with --force to ignore.")
 
+    if args.fast:
+        logger.warning("Doing fast build! Do not publish generated artifacts!")
+
     with section_printer.group("Arguments"):
-        print(f"project          = {args.project}")
+        print(f"project          = {releaser.project}")
         print(f"version          = {releaser.version}")
+        print(f"revision         = {revision}")
         print(f"commit           = {args.commit}")
         print(f"out              = {args.dist_path}")
         print(f"actions          = {args.actions}")
         print(f"dry              = {args.dry}")
         print(f"force            = {args.force}")
+        print(f"overwrite        = {args.overwrite}")
         print(f"cmake_generator  = {args.cmake_generator}")
 
     releaser.prepare()
 
+    if "download" in args.actions:
+        releaser.download_dependencies()
+
+    if set(args.actions).intersection({"msvc", "mingw", "android"}):
+        print("Verifying presence of dependencies (run 'download' action to download) ...")
+        releaser.verify_dependencies()
+        print("... done")
+
     if "source" in args.actions:
         if root_is_maybe_archive:
             raise Exception("Cannot build source archive from source archive")
         with section_printer.group("Create source archives"):
             releaser.create_source_archives()
 
-    if "xcframework" in args.actions:
+    if "dmg" in args.actions:
         if platform.system() != "Darwin" and not args.dry:
-            parser.error("xcframework artifact(s) can only be built on Darwin")
+            parser.error("framework artifact(s) can only be built on Darwin")
 
-        releaser.create_xcframework()
+        releaser.create_dmg()
 
-    if "win32" in args.actions:
+    if "msvc" in args.actions:
         if platform.system() != "Windows" and not args.dry:
-            parser.error("win32 artifact(s) can only be built on Windows")
-        with section_printer.group("Find Visual Studio"):
-            vs = VisualStudio(executer=executer)
-        arm64 = releaser.build_vs_cmake(arch="arm64", arch_cmake="ARM64")
-        x86 = releaser.build_vs(arch="x86", platform="Win32", vs=vs)
-        x64 = releaser.build_vs(arch="x64", platform="x64", vs=vs)
-        with section_printer.group("Create SDL VC development zip"):
-            arch_vc = {
-                "x86": x86,
-                "x64": x64,
-                "arm64": arm64,
-            }
-            releaser.build_vs_devel(arch_vc)
+            parser.error("msvc artifact(s) can only be built on Windows")
+        releaser.build_msvc()
 
     if "mingw" in args.actions:
         releaser.create_mingw_archives()
@@ -857,30 +1401,22 @@ def main(argv=None) -> int:
             parser.error("Invalid $ANDROID_NDK_HOME or --android_ndk_home: must be a directory containing the Android NDK")
         if args.android_api is None:
             with section_printer.group("Detect Android APIS"):
-                args.android_api = releaser.detect_android_api(android_home=args.android_home)
+                args.android_api = releaser._detect_android_api(android_home=args.android_home)
         if args.android_api is None or not (Path(args.android_home) / f"platforms/android-{args.android_api}").is_dir():
             parser.error("Invalid --android-api, and/or could not be detected")
-        if not args.android_abis:
-            parser.error("Need at least one Android ABI")
         with section_printer.group("Android arguments"):
             print(f"android_home     = {args.android_home}")
             print(f"android_ndk_home = {args.android_ndk_home}")
             print(f"android_api      = {args.android_api}")
-            print(f"android_abis     = {args.android_abis}")
         releaser.create_android_archives(
             android_api=args.android_api,
             android_home=args.android_home,
             android_ndk_home=args.android_ndk_home,
-            android_abis=args.android_abis,
         )
-
-
     with section_printer.group("Summary"):
         print(f"artifacts = {releaser.artifacts}")
 
     if args.github:
-        if args.dry:
-            os.environ["GITHUB_OUTPUT"] = "/tmp/github_output.txt"
         with open(os.environ["GITHUB_OUTPUT"], "a") as f:
             f.write(f"project={releaser.project}\n")
             f.write(f"version={releaser.version}\n")
diff --git a/libs/SDL3/build-scripts/create-android-project.py b/libs/SDL3/build-scripts/create-android-project.py
index 76ad853d2..0b8994f52 100644
--- a/libs/SDL3/build-scripts/create-android-project.py
+++ b/libs/SDL3/build-scripts/create-android-project.py
@@ -45,6 +45,9 @@ def android_mk_use_prefab(path: Path) -> None:
 
     data, _ = re.subn("[\n]{3,}", "\n\n", data)
 
+    data, count = re.subn(r"(LOCAL_SHARED_LIBRARIES\s*:=\s*SDL3)", "LOCAL_SHARED_LIBRARIES := SDL3 SDL3-Headers", data)
+    assert count == 1, f"Must have injected SDL3-Headers in {path} exactly once"
+
     newdata = data + textwrap.dedent("""
         # https://google.github.io/prefab/build-systems.html
 
@@ -116,7 +119,7 @@ def main() -> int:
     description = "Create a simple Android gradle project from input sources."
     epilog = textwrap.dedent("""\
         You need to manually copy a prebuilt SDL3 Android archive into the project tree when using the aar variant.
-        
+
         Any changes you have done to the sources in the Android project will be lost
     """)
     parser = ArgumentParser(description=description, epilog=epilog, allow_abbrev=False)
diff --git a/libs/SDL3/build-scripts/create-release.py b/libs/SDL3/build-scripts/create-release.py
new file mode 100644
index 000000000..8ab367ac5
--- /dev/null
+++ b/libs/SDL3/build-scripts/create-release.py
@@ -0,0 +1,43 @@
+#!/usr/bin/env python
+
+import argparse
+from pathlib import Path
+import json
+import logging
+import re
+import subprocess
+
+ROOT = Path(__file__).resolve().parents[1]
+
+
+def determine_remote() -> str:
+    text = (ROOT / "build-scripts/release-info.json").read_text()
+    release_info = json.loads(text)
+    if "remote" in release_info:
+        return release_info["remote"]
+    project_with_version = release_info["name"]
+    project, _ = re.subn("([^a-zA-Z_])", "", project_with_version)
+    return f"libsdl-org/{project}"
+
+
+def main():
+    default_remote = determine_remote()
+
+    current_commit = subprocess.check_output(["git", "rev-parse", "HEAD"], cwd=ROOT, text=True).strip()
+
+    parser = argparse.ArgumentParser(allow_abbrev=False)
+    parser.add_argument("--ref", required=True, help=f"Name of branch or tag containing release.yml")
+    parser.add_argument("--remote", "-R", default=default_remote, help=f"Remote repo (default={default_remote})")
+    parser.add_argument("--commit", default=current_commit, help=f"Commit (default={current_commit})")
+    args = parser.parse_args()
+
+
+    print(f"Running release.yml workflow:")
+    print(f"  commit = {args.commit}")
+    print(f"  remote = {args.remote}")
+
+    subprocess.check_call(["gh", "-R", args.remote, "workflow", "run", "release.yml", "--ref", args.ref, "-f", f"commit={args.commit}"], cwd=ROOT)
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/libs/SDL3/build-scripts/create-release.sh b/libs/SDL3/build-scripts/create-release.sh
deleted file mode 100644
index 927cadcf3..000000000
--- a/libs/SDL3/build-scripts/create-release.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-commit=$(git rev-parse HEAD)
-echo "Creating release workflow for commit $commit"
-gh workflow run release.yml --ref main -f commit=$commit
-
diff --git a/libs/SDL3/build-scripts/fnsince.pl b/libs/SDL3/build-scripts/fnsince.pl
index 684f4cc80..1c86f4b06 100644
--- a/libs/SDL3/build-scripts/fnsince.pl
+++ b/libs/SDL3/build-scripts/fnsince.pl
@@ -13,23 +13,28 @@
 chdir(dirname(__FILE__));
 chdir('..');
 
+my %fulltags = ();
 my @unsorted_releases = ();
 open(PIPEFH, '-|', 'git tag -l') or die "Failed to read git release tags: $!\n";
 
 while (<PIPEFH>) {
     chomp;
-    if (/\Arelease\-(.*?)\Z/) {
+    my $fulltag = $_;
+    if ($fulltag =~ /\A(prerelease|preview|release)\-(\d+)\.(\d+)\.(\d+)\Z/) {
         # Ignore anything that isn't a x.y.0 release.
-        # Make sure new APIs are assigned to the next minor version and ignore the patch versions.
-        my $ver = $1;
-        my @versplit = split /\./, $ver;
-        next if (scalar(@versplit) < 1) || ($versplit[0] != 3);  # Ignore anything that isn't an SDL3 release.
-        next if (scalar(@versplit) < 3) || ($versplit[2] != 0);
+        # Make sure new APIs are assigned to the next minor version and ignore the patch versions, but we'll make an except for the prereleases.
+        my $release_type = $1;
+        my $major = int($2);
+        my $minor = int($3);
+        my $patch = int($4);
+        next if ($major != 3);  # Ignore anything that isn't an SDL3 release.
+        next if ($patch != 0) && ($minor >= 2);  # Ignore anything that is a patch release (unless it was between the preview release and the official release).
 
         # Consider this release version.
+        my $ver = "${major}.${minor}.${patch}";
         push @unsorted_releases, $ver;
+        $fulltags{$ver} = $fulltag;
     }
-
 }
 close(PIPEFH);
 
@@ -52,14 +57,21 @@
     return 0;  # still here? They matched completely?!
 } @unsorted_releases;
 
-my $current_release = 'in-development';
-my $next_release = '3.0.0';  # valid until we actually ship something.  :)
+my $current_release = $releases[-1];
+my $next_release;
+
 if (scalar(@releases) > 0) {
     # this happens to work for how SDL versions things at the moment.
     $current_release = $releases[-1];
 
     my @current_release_segments = split /\./, $current_release;
-    @current_release_segments[1] = '' . ($current_release_segments[1] + 2);
+
+    # if we're still in the 3.1.x prereleases, bump x by 1, otherwise, bump minor version by 2.
+    if (($current_release_segments[0] == '3') && ($current_release_segments[1] == '1')) {
+        @current_release_segments[2] = '' . (int($current_release_segments[2]) + 1);
+    } else {
+        @current_release_segments[1] = '' . (int($current_release_segments[1]) + 2);
+    }
     $next_release = join('.', @current_release_segments);
 }
 
@@ -71,12 +83,16 @@
 #print("NEXT RELEASE: $next_release\n\n");
 
 push @releases, 'HEAD';
+$fulltags{'HEAD'} = 'HEAD';
 
 my %funcs = ();
 foreach my $release (@releases) {
     #print("Checking $release...\n");
-    my $tag = ($release eq 'HEAD') ? $release : "release-$release";
+    my $tag = $fulltags{$release};
     my $blobname = "$tag:src/dynapi/SDL_dynapi_overrides.h";
+
+    $release = '3.0.0' if $release =~ /\A3\.1\.[0123]/;  # hack to make everything up to ABI-lock look like 3.0.0.
+
     open(PIPEFH, '-|', "git show '$blobname'") or die "Failed to read git blob '$blobname': $!\n";
     while (<PIPEFH>) {
         chomp;
@@ -98,6 +114,7 @@
     if (defined $wikipath) {
         chdir($wikipath);
         foreach my $fn (keys %funcs) {
+            next if $fn eq 'SDL_ThreadID';  # this was a function early on (it's now called SDL_GetThreadID), but now it's a datatype (which originally had a different capitalization).
             my $revision = $funcs{$fn};
             $revision = $next_release if $revision eq 'HEAD';
             my $fname = "$fn.md";
diff --git a/libs/SDL3/build-scripts/pkg-support/android/INSTALL.md.in b/libs/SDL3/build-scripts/pkg-support/android/INSTALL.md.in
index 7c06ddb1e..6780fe9ae 100644
--- a/libs/SDL3/build-scripts/pkg-support/android/INSTALL.md.in
+++ b/libs/SDL3/build-scripts/pkg-support/android/INSTALL.md.in
@@ -1,8 +1,7 @@
-
-This Android archive allows use of @PROJECT_NAME@ in your Android project, without needing to copy any SDL source.
+This Android archive allows use of @<@PROJECT_NAME@>@ in your Android project, without needing to copy any SDL source.
 For integration with CMake/ndk-build, it uses [prefab](https://google.github.io/prefab/).
 
-Copy this archive (@PROJECT_NAME@-@PROJECT_VERSION@.aar) to a `app/libs` directory of your project.
+Copy this archive (@<@PROJECT_NAME@>@-@<@PROJECT_VERSION@>@.aar) to a `app/libs` directory of your project.
 
 In `app/build.gradle` of your Android project, add:
 ```
@@ -13,26 +12,30 @@ android {
     }
 }
 dependencies {
-    implementation files('libs/@PROJECT_NAME@-@PROJECT_VERSION@.aar')
+    implementation files('libs/@<@PROJECT_NAME@>@-@<@PROJECT_VERSION@>@.aar')
     /* ... */
 }
 ```
 
 If you're using CMake, add the following to your CMakeLists.txt:
 ```
-find_package(@PROJECT_NAME@ REQUIRED CONFIG)
-target_link_libraries(yourgame PRIVATE @PROJECT_NAME@::@PROJECT_NAME@)
+find_package(@<@PROJECT_NAME@>@ REQUIRED CONFIG)
+target_link_libraries(yourgame PRIVATE @<@PROJECT_NAME@>@::@<@PROJECT_NAME@>@)
 ```
 
-If you're using ndk-build, add the following somewhere after `LOCAL_MODULE := yourgame` to your `Android.mk` or `Application.mk`:
+If you use ndk-build, add the following before `include $(BUILD_SHARED_LIBRARY)` to your `Android.mk`:
+```
+LOCAL_SHARED_LIBARARIES := SDL3 SDL3-Headers
+```
+And add the following at the bottom:
 ```
 # https://google.github.io/prefab/build-systems.html
 
 # Add the prefab modules to the import path.
 $(call import-add-path,/out)
 
-# Import @PROJECT_NAME@ so we can depend on it.
-$(call import-module,prefab/@PROJECT_NAME@)
+# Import @<@PROJECT_NAME@>@ so we can depend on it.
+$(call import-module,prefab/@<@PROJECT_NAME@>@)
 ```
 
 ---
@@ -42,7 +45,7 @@ For advanced users:
 If you want to build a 3rd party library outside Gradle,
 running the following command will extract the Android archive into a more common directory structure.
 ```
-python @PROJECT_NAME@-@PROJECT_VERSION@.aar -o android_prefix
+python @<@PROJECT_NAME@>@-@<@PROJECT_VERSION@>@.aar -o android_prefix
 ```
 Add `--help` for a list of all available options.
 
diff --git a/libs/SDL3/build-scripts/pkg-support/android/__main__.py.in b/libs/SDL3/build-scripts/pkg-support/android/__main__.py.in
index c40ac0112..344cf7193 100644
--- a/libs/SDL3/build-scripts/pkg-support/android/__main__.py.in
+++ b/libs/SDL3/build-scripts/pkg-support/android/__main__.py.in
@@ -1,12 +1,12 @@
 #!/usr/bin/env python
 
 """
-Create a @PROJECT_NAME@ SDK prefix from an Android archive
+Create a @<@PROJECT_NAME@>@ SDK prefix from an Android archive
 This file is meant to be placed in a the root of an android .aar archive
 
 Example usage:
 ```sh
-python @PROJECT_NAME@-@PROJECT_VERSION@.aar -o /usr/opt/android-sdks
+python @<@PROJECT_NAME@>@-@<@PROJECT_VERSION@>@.aar -o /usr/opt/android-sdks
 cmake -S my-project \
     -DCMAKE_PREFIX_PATH=/usr/opt/android-sdks \
     -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_HOME/build/cmake/android.toolchain.cmake \
@@ -31,13 +31,14 @@ ANDROID_ARCHS = { "armeabi-v7a", "arm64-v8a", "x86", "x86_64" }
 
 def main():
     parser = argparse.ArgumentParser(
-        description="Convert a @PROJECT_NAME@ Android .aar archive into a SDK",
+        description="Convert a @<@PROJECT_NAME@>@ Android .aar archive into a SDK",
         allow_abbrev=False,
     )
+    parser.add_argument("--version", action="version", version="@<@PROJECT_NAME@>@ @<@PROJECT_VERSION@>@")
     parser.add_argument("-o", dest="output", type=pathlib.Path, required=True, help="Folder where to store the SDK")
     args = parser.parse_args()
 
-    print(f"Creating a @PROJECT_NAME@ SDK at {args.output}...")
+    print(f"Creating a @<@PROJECT_NAME@>@ SDK at {args.output}...")
 
     prefix = args.output
     incdir = prefix / "include"
@@ -92,9 +93,8 @@ def main():
                 jarpath = javadir / f"{project_name}-{project_version}-sources.jar"
                 read_zipfile_and_write(jarpath, zippath)
             elif zippath == "classes-doc.jar":
-                data = zf.read(zippath)
-                with zipfile.ZipFile(io.BytesIO(data)) as doc_zf:
-                    doc_zf.extractall(javadocdir)
+                jarpath = javadocdir / f"{project_name}-{project_version}-javadoc.jar"
+                read_zipfile_and_write(jarpath, zippath)
 
     print("... done")
     return 0
diff --git a/libs/SDL3/build-scripts/pkg-support/android/cmake/SDL3ConfigVersion.cmake.in b/libs/SDL3/build-scripts/pkg-support/android/cmake/SDL3ConfigVersion.cmake.in
new file mode 100644
index 000000000..3268da7f4
--- /dev/null
+++ b/libs/SDL3/build-scripts/pkg-support/android/cmake/SDL3ConfigVersion.cmake.in
@@ -0,0 +1,38 @@
+# @<@PROJECT_NAME@>@ CMake version configuration file:
+# This file is meant to be placed in a lib/cmake/@<@PROJECT_NAME@>@ subfolder of a reconstructed Android SDL3 SDK
+
+set(PACKAGE_VERSION "@<@PROJECT_VERSION@>@")
+
+if(PACKAGE_FIND_VERSION_RANGE)
+    # Package version must be in the requested version range
+    if ((PACKAGE_FIND_VERSION_RANGE_MIN STREQUAL "INCLUDE" AND PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION_MIN)
+            OR ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND PACKAGE_VERSION VERSION_GREATER PACKAGE_FIND_VERSION_MAX)
+            OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND PACKAGE_VERSION VERSION_GREATER_EQUAL PACKAGE_FIND_VERSION_MAX)))
+        set(PACKAGE_VERSION_COMPATIBLE FALSE)
+    else()
+        set(PACKAGE_VERSION_COMPATIBLE TRUE)
+    endif()
+else()
+    if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
+        set(PACKAGE_VERSION_COMPATIBLE FALSE)
+    else()
+        set(PACKAGE_VERSION_COMPATIBLE TRUE)
+        if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
+            set(PACKAGE_VERSION_EXACT TRUE)
+        endif()
+    endif()
+endif()
+
+# if the using project doesn't have CMAKE_SIZEOF_VOID_P set, fail.
+if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "")
+    set(PACKAGE_VERSION_UNSUITABLE TRUE)
+endif()
+
+include("${CMAKE_CURRENT_LIST_DIR}/sdlcpu.cmake")
+SDL_DetectTargetCPUArchitectures(_detected_archs)
+
+# check that the installed version has a compatible architecture as the one which is currently searching:
+if(NOT(SDL_CPU_X86 OR SDL_CPU_X64 OR SDL_CPU_ARM32 OR SDL_CPU_ARM64))
+    set(PACKAGE_VERSION "${PACKAGE_VERSION} (X86,X64,ARM32,ARM64)")
+    set(PACKAGE_VERSION_UNSUITABLE TRUE)
+endif()
diff --git a/libs/SDL3/build-scripts/pkg-support/android/description.json.in b/libs/SDL3/build-scripts/pkg-support/android/description.json.in
new file mode 100644
index 000000000..e75ef382a
--- /dev/null
+++ b/libs/SDL3/build-scripts/pkg-support/android/description.json.in
@@ -0,0 +1,5 @@
+{
+    "name": "@<@PROJECT_NAME@>@",
+    "version": "@<@PROJECT_VERSION@>@",
+    "git-hash": "@<@PROJECT_COMMIT@>@"
+}
diff --git a/libs/SDL3/build-scripts/pkg-support/mingw/Makefile b/libs/SDL3/build-scripts/pkg-support/mingw/Makefile
index ff8d01f81..9b6cd5587 100644
--- a/libs/SDL3/build-scripts/pkg-support/mingw/Makefile
+++ b/libs/SDL3/build-scripts/pkg-support/mingw/Makefile
@@ -26,6 +26,8 @@ install-x86_64:
 
 install-all:
 	@if test -d $(DESTDIR); then \
+		mkdir -p $(DESTDIR)/cmake; \
+		cp -rv cmake/* $(DESTDIR)/cmake; \
 		for arch in $(ARCHITECTURES); do \
 			$(MAKE) install ARCH=$$arch DESTDIR=$(DESTDIR)/$$arch; \
 		done \
diff --git a/libs/SDL3/VisualC/pkg-support/cmake/sdl3-config.cmake b/libs/SDL3/build-scripts/pkg-support/msvc/cmake/SDL3Config.cmake.in
similarity index 95%
rename from libs/SDL3/VisualC/pkg-support/cmake/sdl3-config.cmake
rename to libs/SDL3/build-scripts/pkg-support/msvc/cmake/SDL3Config.cmake.in
index 9995847cd..5463b498f 100644
--- a/libs/SDL3/VisualC/pkg-support/cmake/sdl3-config.cmake
+++ b/libs/SDL3/build-scripts/pkg-support/msvc/cmake/SDL3Config.cmake.in
@@ -1,5 +1,5 @@
-# SDL CMake configuration file:
-# This file is meant to be placed in a cmake subfolder of SDL3-devel-3.x.y-VC
+# @<@PROJECT_NAME@>@ CMake configuration file:
+# This file is meant to be placed in a cmake subfolder of @<@PROJECT_NAME@>@-devel-@<@PROJECT_VERSION@>@-VC.zip
 
 cmake_minimum_required(VERSION 3.0...3.5)
 
@@ -105,7 +105,7 @@ else()
 endif()
 unset(_sdl3test_lib)
 
-if(SDL3_SDL3-shared_FOUND)
+if(SDL3_SDL3-shared_FOUND OR SDL3_SDL3-static_FOUND)
     set(SDL3_SDL3_FOUND TRUE)
 endif()
 
diff --git a/libs/SDL3/VisualC/pkg-support/cmake/sdl3-config-version.cmake b/libs/SDL3/build-scripts/pkg-support/msvc/cmake/SDL3ConfigVersion.cmake.in
similarity index 55%
rename from libs/SDL3/VisualC/pkg-support/cmake/sdl3-config-version.cmake
rename to libs/SDL3/build-scripts/pkg-support/msvc/cmake/SDL3ConfigVersion.cmake.in
index e766f1d4a..82b6af0a7 100644
--- a/libs/SDL3/VisualC/pkg-support/cmake/sdl3-config-version.cmake
+++ b/libs/SDL3/build-scripts/pkg-support/msvc/cmake/SDL3ConfigVersion.cmake.in
@@ -1,26 +1,7 @@
-# based on the files generated by CMake's write_basic_package_version_file
+# @<@PROJECT_NAME@>@ CMake version configuration file:
+# This file is meant to be placed in a cmake subfolder of @<@PROJECT_NAME@>@-devel-@<@PROJECT_VERSION@>@-VC.zip
 
-# SDL CMake version configuration file:
-# This file is meant to be placed in a cmake subfolder of SDL3-devel-3.x.y-VC
-
-if(NOT EXISTS "${CMAKE_CURRENT_LIST_DIR}/../include/SDL3/SDL_version.h")
-    message(AUTHOR_WARNING "Could not find SDL3/SDL_version.h. This script is meant to be placed in the root of SDL3-devel-3.x.y-VC")
-    return()
-endif()
-
-file(READ "${CMAKE_CURRENT_LIST_DIR}/../include/SDL3/SDL_version.h" _sdl_version_h)
-string(REGEX MATCH "#define[ \t]+SDL_MAJOR_VERSION[ \t]+([0-9]+)" _sdl_major_re "${_sdl_version_h}")
-set(_sdl_major "${CMAKE_MATCH_1}")
-string(REGEX MATCH "#define[ \t]+SDL_MINOR_VERSION[ \t]+([0-9]+)" _sdl_minor_re "${_sdl_version_h}")
-set(_sdl_minor "${CMAKE_MATCH_1}")
-string(REGEX MATCH "#define[ \t]+SDL_MICRO_VERSION[ \t]+([0-9]+)" _sdl_micro_re "${_sdl_version_h}")
-set(_sdl_micro "${CMAKE_MATCH_1}")
-if(_sdl_major_re AND _sdl_minor_re AND _sdl_micro_re)
-    set(PACKAGE_VERSION "${_sdl_major}.${_sdl_minor}.${_sdl_micro}")
-else()
-    message(AUTHOR_WARNING "Could not extract version from SDL3/SDL_version.h.")
-    return()
-endif()
+set(PACKAGE_VERSION "@<@PROJECT_VERSION@>@")
 
 if(PACKAGE_FIND_VERSION_RANGE)
     # Package version must be in the requested version range
diff --git a/libs/SDL3/build-scripts/pkg-support/source/SDL_revision.h.cmake.in b/libs/SDL3/build-scripts/pkg-support/source/SDL_revision.h.cmake.in
new file mode 100644
index 000000000..1689aeb84
--- /dev/null
+++ b/libs/SDL3/build-scripts/pkg-support/source/SDL_revision.h.cmake.in
@@ -0,0 +1,41 @@
+/*
+ Simple DirectMedia Layer
+ Copyright (C) 1997-2024 Sam Lantinga <slouken@libsdl.org>
+
+ This software is provided 'as-is', without any express or implied
+ warranty.  In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+    claim that you wrote the original software. If you use this software
+    in a product, an acknowledgment in the product documentation would be
+    appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+    misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+/* WIKI CATEGORY: Version */
+
+/*
+ * SDL_revision.h contains the SDL revision, which might be defined on the
+ * compiler command line, or generated right into the header itself by the
+ * build system.
+ */
+
+#ifndef SDL_revision_h_
+#define SDL_revision_h_
+
+#cmakedefine SDL_VENDOR_INFO "@SDL_VENDOR_INFO@"
+
+#if defined(SDL_VENDOR_INFO)
+#define SDL_REVISION "@<@PROJECT_REVISION@>@ (" SDL_VENDOR_INFO ")"
+#else
+#define SDL_REVISION "@<@PROJECT_REVISION@>@"
+#endif
+
+#endif /* SDL_revision_h_ */
diff --git a/libs/SDL3/build-scripts/pkg-support/source/SDL_revision.h.in b/libs/SDL3/build-scripts/pkg-support/source/SDL_revision.h.in
new file mode 100644
index 000000000..93073f583
--- /dev/null
+++ b/libs/SDL3/build-scripts/pkg-support/source/SDL_revision.h.in
@@ -0,0 +1,56 @@
+/*
+ Simple DirectMedia Layer
+ Copyright (C) 1997-2024 Sam Lantinga <slouken@libsdl.org>
+
+ This software is provided 'as-is', without any express or implied
+ warranty.  In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+    claim that you wrote the original software. If you use this software
+    in a product, an acknowledgment in the product documentation would be
+    appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+    misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+/* WIKI CATEGORY: Version */
+
+/*
+ * SDL_revision.h contains the SDL revision, which might be defined on the
+ * compiler command line, or generated right into the header itself by the
+ * build system.
+ */
+
+#ifndef SDL_revision_h_
+#define SDL_revision_h_
+
+#ifdef SDL_WIKI_DOCUMENTATION_SECTION
+
+/**
+ * This macro is a string describing the source at a particular point in
+ * development.
+ *
+ * This string is often generated from revision control's state at build time.
+ *
+ * This string can be quite complex and does not follow any standard. For
+ * example, it might be something like "SDL-prerelease-3.1.1-47-gf687e0732".
+ * It might also be user-defined at build time, so it's best to treat it as a
+ * clue in debugging forensics and not something the app will parse in any
+ * way.
+ *
+ * \since This macro is available since SDL 3.0.0.
+ */
+#define SDL_REVISION "Some arbitrary string decided at SDL build time"
+#elif defined(SDL_VENDOR_INFO)
+#define SDL_REVISION "@<@PROJECT_REVISION@>@ (" SDL_VENDOR_INFO ")"
+#else
+#define SDL_REVISION "@<@PROJECT_REVISION@>@"
+#endif
+
+#endif /* SDL_revision_h_ */
diff --git a/libs/SDL3/build-scripts/release-info.json b/libs/SDL3/build-scripts/release-info.json
new file mode 100644
index 000000000..b47c3d2ba
--- /dev/null
+++ b/libs/SDL3/build-scripts/release-info.json
@@ -0,0 +1,215 @@
+{
+  "name": "SDL3",
+  "remote": "libsdl-org/SDL",
+  "version": {
+    "file": "include/SDL3/SDL_version.h",
+    "re_major": "^#define SDL_MAJOR_VERSION\\s+([0-9]+)$",
+    "re_minor": "^#define SDL_MINOR_VERSION\\s+([0-9]+)$",
+    "re_micro": "^#define SDL_MICRO_VERSION\\s+([0-9]+)$"
+  },
+  "source": {
+    "checks": [
+      "src/SDL.c",
+      "include/SDL3/SDL.h",
+      "test/testsprite.c",
+      "android-project/app/src/main/java/org/libsdl/app/SDLActivity.java"
+    ],
+    "files": {
+      "include/SDL3": [
+        "build-scripts/pkg-support/source/SDL_revision.h.in:SDL_revision.h"
+      ],
+      "include/build_config": [
+        "build-scripts/pkg-support/source/SDL_revision.h.cmake.in:SDL_revision.h.cmake"
+      ]
+    }
+  },
+  "dmg": {
+    "project": "Xcode/SDL/SDL.xcodeproj",
+    "path": "Xcode/SDL/build/SDL3.dmg",
+    "target": "SDL3.dmg",
+    "build-xcconfig": "Xcode/SDL/pkg-support/build.xcconfig"
+  },
+  "mingw": {
+    "cmake": {
+      "archs": ["x86", "x64"],
+      "args": [
+        "-DSDL_SHARED=ON",
+        "-DSDL_STATIC=OFF",
+        "-DSDL_DISABLE_INSTALL_DOCS=ON",
+        "-DSDL_TEST_LIBRARY=ON",
+        "-DSDL_VENDOR_INFO=libsdl.org",
+        "-DSDL_TESTS=OFF"
+      ],
+      "shared-static": "args"
+    },
+    "files": {
+      "": [
+        "build-scripts/pkg-support/mingw/INSTALL.txt",
+        "build-scripts/pkg-support/mingw/Makefile",
+        "BUGS.txt",
+        "CREDITS.md",
+        "README-SDL.txt",
+        "WhatsNew.txt",
+        "LICENSE.txt",
+        "README.md"
+      ],
+      "cmake": [
+        "build-scripts/pkg-support/mingw/cmake/SDL3Config.cmake",
+        "build-scripts/pkg-support/mingw/cmake/SDL3ConfigVersion.cmake"
+      ],
+      "docs": [
+        "docs/*"
+      ],
+      "test": [
+        "test/*"
+      ]
+    }
+  },
+  "msvc": {
+    "msbuild": {
+      "archs": [
+        "x86",
+        "x64"
+      ],
+      "directory-build-props": "build-scripts/pkg-support/msvc/Directory.Build.props",
+      "projects": [
+        "VisualC/SDL/SDL.vcxproj",
+        "VisualC/SDL_test/SDL_test.vcxproj"
+      ],
+      "files-lib": {
+        "": [
+          "VisualC/SDL/@<@PLATFORM@>@/@<@CONFIGURATION@>@/SDL3.dll"
+        ]
+      },
+      "files-devel": {
+        "lib/@<@ARCH@>@": [
+          "VisualC/SDL/@<@PLATFORM@>@/@<@CONFIGURATION@>@/SDL3.dll",
+          "VisualC/SDL/@<@PLATFORM@>@/@<@CONFIGURATION@>@/SDL3.lib",
+          "VisualC/SDL/@<@PLATFORM@>@/@<@CONFIGURATION@>@/SDL3.pdb",
+          "VisualC/SDL_test/@<@PLATFORM@>@/@<@CONFIGURATION@>@/SDL3_test.lib"
+        ]
+      }
+    },
+    "cmake": {
+      "archs": [
+        "arm64"
+      ],
+      "args": [
+        "-DSDL_SHARED=ON",
+        "-DSDL_STATIC=OFF",
+        "-DSDL_TEST_LIBRARY=ON",
+        "-DSDL_TESTS=OFF",
+        "-DSDL_DISABLE_INSTALL_DOCS=ON",
+        "-DSDL_VENDOR_INFO=libsdl.org"
+      ],
+      "files-lib": {
+        "": [
+          "bin/SDL3.dll"
+        ]
+      },
+      "files-devel": {
+        "lib/@<@ARCH@>@": [
+          "bin/SDL3.dll",
+          "bin/SDL3.pdb",
+          "lib/SDL3.lib",
+          "lib/SDL3_test.lib"
+        ]
+      }
+    },
+    "files-lib": {
+      "": [
+        "README-SDL.txt"
+      ]
+    },
+    "files-devel": {
+      "": [
+        "README-SDL.txt",
+        "BUGS.txt",
+        "LICENSE.txt",
+        "README.md",
+        "WhatsNew.txt"
+      ],
+      "cmake": [
+        "build-scripts/pkg-support/msvc/cmake/SDL3Config.cmake.in:SDL3Config.cmake",
+        "build-scripts/pkg-support/msvc/cmake/SDL3ConfigVersion.cmake.in:SDL3ConfigVersion.cmake",
+        "cmake/sdlcpu.cmake"
+      ],
+      "docs": [
+        "docs/*"
+      ],
+      "include/SDL3": [
+        "include/SDL3/*.h"
+      ]
+    }
+  },
+  "android": {
+    "cmake": {
+      "args": [
+        "-DSDL_SHARED=ON",
+        "-DSDL_STATIC=OFF",
+        "-DSDL_TEST_LIBRARY=ON",
+        "-DSDL_TESTS=OFF",
+        "-DSDL_DISABLE_ANDROID_JAR=OFF",
+        "-DSDL_DISABLE_INSTALL=OFF",
+        "-DSDL_DISABLE_INSTALL_DOCS=OFF",
+        "-DSDL_VENDOR_INFO=libsdl.org"
+      ]
+    },
+    "modules": {
+      "SDL3-Headers": {
+        "type": "interface",
+        "includes": {
+          "SDL3": ["include/SDL3/*.h"]
+        }
+      },
+      "Headers": {
+        "type": "interface",
+        "export-libraries": [":SDL3-Headers"]
+      },
+      "SDL3_test": {
+        "type": "library",
+        "library": "lib/libSDL3_test.a",
+        "export-libraries": [":Headers"]
+      },
+      "SDL3-shared": {
+        "type": "library",
+        "library": "lib/libSDL3.so",
+        "export-libraries": [":Headers"]
+      },
+      "SDL3": {
+        "type": "interface",
+        "export-libraries": [":SDL3-shared"]
+      }
+    },
+    "jars": {
+      "classes": "share/java/@<@PROJECT_NAME@>@/@<@PROJECT_NAME@>@-@<@PROJECT_VERSION@>@.jar",
+      "sources": "share/java/@<@PROJECT_NAME@>@/@<@PROJECT_NAME@>@-@<@PROJECT_VERSION@>@-sources.jar",
+      "doc": "share/javadoc/@<@PROJECT_NAME@>@/@<@PROJECT_NAME@>@-@<@PROJECT_VERSION@>@-javadoc.jar"
+    },
+    "abis": [
+      "armeabi-v7a",
+      "arm64-v8a",
+      "x86",
+      "x86_64"
+    ],
+    "api-minimum": 19,
+    "api-target": 29,
+    "ndk-minimum": 21,
+    "files": {
+      "": [
+        "android-project/app/proguard-rules.pro:proguard.txt",
+        "build-scripts/pkg-support/android/INSTALL.md.in:INSTALL.md",
+        "build-scripts/pkg-support/android/__main__.py.in:__main__.py",
+        "build-scripts/pkg-support/android/description.json.in:description.json"
+      ],
+      "META-INF": [
+        "LICENSE.txt"
+      ],
+      "cmake": [
+        "cmake/sdlcpu.cmake",
+        "build-scripts/pkg-support/android/cmake/SDL3Config.cmake",
+        "build-scripts/pkg-support/android/cmake/SDL3ConfigVersion.cmake.in:SDL3ConfigVersion.cmake"
+      ]
+    }
+  }
+}
diff --git a/libs/SDL3/build-scripts/updaterev.sh b/libs/SDL3/build-scripts/updaterev.sh
index b2ba5d65b..508c6dd19 100644
--- a/libs/SDL3/build-scripts/updaterev.sh
+++ b/libs/SDL3/build-scripts/updaterev.sh
@@ -40,7 +40,6 @@ if [ "$rev" != "" ]; then
     echo "#else" >>"$header.new"
     echo "#define SDL_REVISION \"SDL-$rev\"" >>"$header.new"
     echo "#endif" >>"$header.new"
-    echo "#define SDL_REVISION_NUMBER 0" >>"$header.new"
     if diff $header $header.new >/dev/null 2>&1; then
         rm "$header.new"
     else
diff --git a/libs/SDL3/cmake/android/FindSdlAndroidPlatform.cmake b/libs/SDL3/cmake/android/FindSdlAndroidPlatform.cmake
index 0f9584906..7b569e3e1 100644
--- a/libs/SDL3/cmake/android/FindSdlAndroidPlatform.cmake
+++ b/libs/SDL3/cmake/android/FindSdlAndroidPlatform.cmake
@@ -104,8 +104,9 @@ endfunction()
 set(SDL_ANDROID_PLATFORM_ANDROID_JAR "SDL_ANDROID_PLATFORM_ANDROID_JAR-NOTFOUND")
 
 if(NOT DEFINED SDL_ANDROID_PLATFORM_ROOT)
-  _sdl_find_android_platform_root(SDL_ANDROID_PLATFORM_ROOT)
-  set(SDL_ANDROID_PLATFORM_ROOT "${SDL_ANDROID_PLATFORM_ROOT}" CACHE PATH "Path of Android platform")
+  _sdl_find_android_platform_root(_new_sdl_android_platform_root)
+  set(SDL_ANDROID_PLATFORM_ROOT "${_new_sdl_android_platform_root}" CACHE PATH "Path of Android platform")
+  unset(_new_sdl_android_platform_root)
 endif()
 if(SDL_ANDROID_PLATFORM_ROOT)
   _sdl_is_valid_android_platform_root(_valid SDL_ANDROID_PLATFORM_VERSION "${SDL_ANDROID_PLATFORM_ROOT}")
diff --git a/libs/SDL3/cmake/sdlchecks.cmake b/libs/SDL3/cmake/sdlchecks.cmake
index aecb98fe5..48e2ad8e7 100644
--- a/libs/SDL3/cmake/sdlchecks.cmake
+++ b/libs/SDL3/cmake/sdlchecks.cmake
@@ -135,7 +135,10 @@ endmacro()
 macro(CheckPipewire)
   if(SDL_PIPEWIRE)
     set(PipeWire_PKG_CONFIG_SPEC libpipewire-0.3>=0.3.44)
-    pkg_check_modules(PC_PIPEWIRE IMPORTED_TARGET ${PipeWire_PKG_CONFIG_SPEC})
+    set(PC_PIPEWIRE_FOUND FALSE)
+    if(PKG_CONFIG_FOUND)
+      pkg_check_modules(PC_PIPEWIRE IMPORTED_TARGET ${PipeWire_PKG_CONFIG_SPEC})
+    endif()
     if(PC_PIPEWIRE_FOUND)
       set(HAVE_PIPEWIRE TRUE)
       sdl_glob_sources("${SDL3_SOURCE_DIR}/src/audio/pipewire/*.c")
@@ -167,7 +170,10 @@ endmacro()
 macro(CheckPulseAudio)
   if(SDL_PULSEAUDIO)
     set(PulseAudio_PKG_CONFIG_SPEC "libpulse>=0.9.15")
-    pkg_check_modules(PC_PULSEAUDIO IMPORTED_TARGET ${PulseAudio_PKG_CONFIG_SPEC})
+    set(PC_PULSEAUDIO_FOUND FALSE)
+    if(PKG_CONFIG_FOUND)
+      pkg_check_modules(PC_PULSEAUDIO IMPORTED_TARGET ${PulseAudio_PKG_CONFIG_SPEC})
+    endif()
     if(PC_PULSEAUDIO_FOUND)
       set(HAVE_PULSEAUDIO TRUE)
       sdl_glob_sources("${SDL3_SOURCE_DIR}/src/audio/pulseaudio/*.c")
@@ -196,7 +202,10 @@ endmacro()
 macro(CheckJACK)
   if(SDL_JACK)
     set(Jack_PKG_CONFIG_SPEC jack)
-    pkg_check_modules(PC_JACK IMPORTED_TARGET ${Jack_PKG_CONFIG_SPEC})
+    set(PC_JACK_FOUND FALSE)
+    if(PKG_CONFIG_FOUND)
+      pkg_check_modules(PC_JACK IMPORTED_TARGET ${Jack_PKG_CONFIG_SPEC})
+    endif()
     if(PC_JACK_FOUND)
       set(HAVE_JACK TRUE)
       sdl_glob_sources("${SDL3_SOURCE_DIR}/src/audio/jack/*.c")
@@ -225,7 +234,10 @@ endmacro()
 macro(CheckSNDIO)
   if(SDL_SNDIO)
     set(SndIO_PKG_CONFIG_SPEC sndio)
-    pkg_check_modules(PC_SNDIO IMPORTED_TARGET ${SndIO_PKG_CONFIG_SPEC})
+    set(PC_SNDIO_FOUND FALSE)
+    if(PKG_CONFIG_FOUND)
+      pkg_check_modules(PC_SNDIO IMPORTED_TARGET ${SndIO_PKG_CONFIG_SPEC})
+    endif()
     if(PC_SNDIO_FOUND)
       set(HAVE_SNDIO TRUE)
       sdl_glob_sources("${SDL3_SOURCE_DIR}/src/audio/sndio/*.c")
@@ -496,7 +508,10 @@ endmacro()
 macro(CheckWayland)
   if(SDL_WAYLAND)
     set(WAYLAND_PKG_CONFIG_SPEC "wayland-client>=1.18" wayland-egl wayland-cursor egl "xkbcommon>=0.5.0")
-    pkg_check_modules(PC_WAYLAND IMPORTED_TARGET ${WAYLAND_PKG_CONFIG_SPEC})
+    set(PC_WAYLAND_FOUND FALSE)
+    if(PKG_CONFIG_FOUND)
+      pkg_check_modules(PC_WAYLAND IMPORTED_TARGET ${WAYLAND_PKG_CONFIG_SPEC})
+    endif()
     find_program(WAYLAND_SCANNER NAMES wayland-scanner)
 
     set(WAYLAND_FOUND FALSE)
@@ -1104,8 +1119,12 @@ macro(CheckRPI)
 
     set(original_PKG_CONFIG_PATH $ENV{PKG_CONFIG_PATH})
     set(ENV{PKG_CONFIG_PATH} "${original_PKG_CONFIG_PATH}:/opt/vc/lib/pkgconfig")
-    pkg_check_modules(PC_BCM_HOST IMPORTED_TARGET QUIET ${BCM_HOST_PKG_CONFIG_SPEC})
-    pkg_check_modules(PC_BRCMEGL IMPORTED_TARGET QUIET ${BRCMEGL_PKG_CONFIG_SPEC})
+    set(PC_BCM_HOST_FOUND FALSE)
+    set(PC_BRCMEGL_FOUND FALSE)
+    if(PKG_CONFIG_FOUND)
+      pkg_check_modules(PC_BCM_HOST IMPORTED_TARGET QUIET ${BCM_HOST_PKG_CONFIG_SPEC})
+      pkg_check_modules(PC_BRCMEGL IMPORTED_TARGET QUIET ${BRCMEGL_PKG_CONFIG_SPEC})
+    endif()
     set(ENV{PKG_CONFIG_PATH} "${original_PKG_CONFIG_PATH}")
 
     if(TARGET PkgConfig::PC_BCM_HOST AND TARGET PkgConfig::PC_BRCMEGL)
@@ -1125,7 +1144,10 @@ endmacro()
 macro(CheckROCKCHIP)
   if(SDL_ROCKCHIP)
     set(MALI_PKG_CONFIG_SPEC mali)
-    pkg_check_modules(PC_MALI QUIET ${MALI_PKG_CONFIG_SPEC})
+    set(PC_MALI_FOUND FALSE)
+    if(PKG_CONFIG_FOUND)
+      pkg_check_modules(PC_MALI QUIET ${MALI_PKG_CONFIG_SPEC})
+    endif()
     if(PC_MALI_FOUND)
       set(HAVE_ROCKCHIP TRUE)
     endif()
@@ -1146,8 +1168,12 @@ macro(CheckKMSDRM)
   if(SDL_KMSDRM)
     set(PKG_CONFIG_LIBDRM_SPEC libdrm)
     set(PKG_CONFIG_GBM_SPEC gbm)
-    pkg_check_modules(PC_LIBDRM IMPORTED_TARGET ${PKG_CONFIG_LIBDRM_SPEC})
-    pkg_check_modules(PC_GBM IMPORTED_TARGET ${PKG_CONFIG_GBM_SPEC})
+    set(PC_LIBDRM_FOUND FALSE)
+    set(PC_GBM_FOUND FALSE)
+    if(PKG_CONFIG_FOUND)
+      pkg_check_modules(PC_LIBDRM IMPORTED_TARGET ${PKG_CONFIG_LIBDRM_SPEC})
+      pkg_check_modules(PC_GBM IMPORTED_TARGET ${PKG_CONFIG_GBM_SPEC})
+    endif()
     if(PC_LIBDRM_FOUND AND PC_GBM_FOUND AND HAVE_OPENGL_EGL)
       set(HAVE_KMSDRM TRUE)
       set(HAVE_SDL_VIDEO TRUE)
@@ -1221,7 +1247,10 @@ macro(CheckLibUnwind)
 
     if(NOT found_libunwind)
       set(LibUnwind_PKG_CONFIG_SPEC libunwind libunwind-generic)
-      pkg_check_modules(PC_LIBUNWIND IMPORTED_TARGET ${LibUnwind_PKG_CONFIG_SPEC})
+      set(PC_LIBUNWIND_FOUND FALSE)
+      if(PKG_CONFIG_FOUND)
+        pkg_check_modules(PC_LIBUNWIND IMPORTED_TARGET ${LibUnwind_PKG_CONFIG_SPEC})
+      endif()
       if(PC_LIBUNWIND_FOUND)
         cmake_push_check_state()
         list(APPEND CMAKE_REQUIRED_LIBRARIES ${PC_LIBUNWIND_LIBRARIES})
diff --git a/libs/SDL3/cmake/sdlcompilers.cmake b/libs/SDL3/cmake/sdlcompilers.cmake
index fc352e19c..ec3b6124c 100644
--- a/libs/SDL3/cmake/sdlcompilers.cmake
+++ b/libs/SDL3/cmake/sdlcompilers.cmake
@@ -46,7 +46,7 @@ function(SDL_AddCommonCompilerFlags TARGET)
       cmake_push_check_state()
       check_c_compiler_flag("-gdwarf-4" HAVE_GDWARF_4)
       if(HAVE_GDWARF_4)
-        target_compile_options(${TARGET} PRIVATE "-gdwarf-4")
+        target_compile_options(${TARGET} PRIVATE "$<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:-gdwarf-4>")
       endif()
       cmake_pop_check_state()
     endif()
diff --git a/libs/SDL3/cmake/sdlcpu.cmake b/libs/SDL3/cmake/sdlcpu.cmake
index 0df1bb104..d63a57f9f 100644
--- a/libs/SDL3/cmake/sdlcpu.cmake
+++ b/libs/SDL3/cmake/sdlcpu.cmake
@@ -67,7 +67,15 @@ ${src_main}
   return result;
 }")
 
-  set(path_src_arch_detect "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/CMakeTmp/SDL_detect_arch.c")
+  if(CMAKE_C_COMPILER)
+    set(ext ".c")
+  elseif(CMAKE_CXX_COMPILER)
+    set(ext ".cpp")
+  else()
+    enable_language(C)
+    set(ext ".c")
+  endif()
+  set(path_src_arch_detect "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/CMakeTmp/SDL_detect_arch${ext}")
   file(WRITE "${path_src_arch_detect}" "${src_arch_detect}")
   set(path_dir_arch_detect "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/CMakeTmp/SDL_detect_arch")
   set(path_bin_arch_detect "${path_dir_arch_detect}/bin")
diff --git a/libs/SDL3/docs/README-android.md b/libs/SDL3/docs/README-android.md
index e6065715b..4077813df 100644
--- a/libs/SDL3/docs/README-android.md
+++ b/libs/SDL3/docs/README-android.md
@@ -126,13 +126,10 @@ Here's an explanation of the files in the Android project, so you can customize
 Using the SDL3 Android Archive (.aar)
 ================================================================================
 
-The `create-android-project.py` script can
-./create-android-project.py com.yourcompany.yourapp < sources.list
-
-The Android archive allows use of SDL3 in your Android project, without needing to copy any SDL c or java source.
+The Android archive allows use of SDL3 in your Android project, without needing to copy any SDL C or JAVA source into your project.
 For integration with CMake/ndk-build, it uses [prefab](https://google.github.io/prefab/).
 
-Copy the archive to a `app/libs` directory of your project and add the following to `app/gradle.build`:
+Copy the archive to a `app/libs` directory in your project and add the following to `app/gradle.build`:
 ```
 android {
     /* ... */
@@ -141,29 +138,34 @@ android {
     }
 }
 dependencies {
-    implementation files('libs/@PROJECT_NAME@-@PROJECT_VERSION@.aar')
+    implementation files('libs/SDL3-X.Y.Z.aar') /* Replace with the filename of the actual SDL3-x.y.z.aar file you downloaded */
     /* ... */
 }
 ```
 
-If you're using CMake, add the following to your CMakeLists.txt:
+If you use CMake, add the following to your CMakeLists.txt:
 ```
-find_package(@PROJECT_NAME@ REQUIRED CONFIG)
-target_link_libraries(yourgame PRIVATE @PROJECT_NAME@::@PROJECT_NAME@)
+find_package(SDL3 REQUIRED CONFIG)
+target_link_libraries(yourgame PRIVATE SDL3::SDL3)
 ```
 
-If you're using ndk-build, add the following somewhere after `LOCAL_MODULE := yourgame` to your `Android.mk` or `Application.mk`:
+If you use ndk-build, add the following before `include $(BUILD_SHARED_LIBRARY)` to your `Android.mk`:
+```
+LOCAL_SHARED_LIBARARIES := SDL3 SDL3-Headers
+```
+And add the following at the bottom:
 ```
 # https://google.github.io/prefab/build-systems.html
-
 # Add the prefab modules to the import path.
 $(call import-add-path,/out)
-
 # Import @PROJECT_NAME@ so we can depend on it.
 $(call import-module,prefab/@PROJECT_NAME@)
 ```
 
-If you want to avoid adding the complete SDL source base as a subproject, or adding the Java sources of the bindings to your Android project
+The `build-scripts/create-android-project.py` script can create a project using Android aar-chives from scratch:
+```
+build-scripts/create-android-project.py --variant aar com.yourcompany.yourapp < sources.list
+```
 
 Customizing your application name
 ================================================================================
diff --git a/libs/SDL3/docs/README-highdpi.md b/libs/SDL3/docs/README-highdpi.md
index fd28575dd..bec0125f4 100644
--- a/libs/SDL3/docs/README-highdpi.md
+++ b/libs/SDL3/docs/README-highdpi.md
@@ -1,5 +1,33 @@
 
-SDL 3.0 has new support for high DPI displays
+SDL 3.0 has new support for high DPI displays. Interfaces provided by SDL uses the platform's native coordinates unless otherwise specified.
+
+To reconcile platform differences in their approach to high-density scaling, SDL provides the following interfaces:
+- `SDL_GetWindowSize()`          retrieves the window dimensions in native coordinates.
+- `SDL_GetWindowSizeInPixels()`  retrieves the window dimensions in pixels-addressable.
+- `SDL_GetDisplayContentScale()` retrieves the suggested amplification factor when drawing in native coordinates.
+- `SDL_GetWindowDisplayScale()`  retrieves the suggested amplification factor when drawing in pixels-addressable.
+- `SDL_GetWindowPixelDensity()`  retrieves how many addressable pixels correspond to one unit of native coordinates.
+- `SDL_EVENT_WINDOW_PIXEL_SIZE_CHANGED`    is emitted when the value retrievable from `SDL_GetWindowSizeInPixels()` changes.
+- `SDL_EVENT_WINDOW_DISPLAY_SCALE_CHANGED` is emitted when the value retrievable from `SDL_GetWindowDisplayScale()` changes.
+- Windows created with `SDL_WINDOW_HIGH_PIXEL_DENSITY` will ask the platform to display addressable pixels at their natural scale.
+
+## Numeric example
+
+Given a fullscreen window spanning a 3840x2160 monitor set to 2x display or 200% scaling, the following tabulates the effect of creating a window with or without `SDL_WINDOW_HIGH_PIXEL_DENSITY` on MacOS and Win32:
+
+| Value                          | MacOS (Default) | MacOS (HD) | Win32 (Default & HD) |
+|--------------------------------|-----------------|------------|----------------------|
+| `SDL_GetWindowSize()`          | 1920x1080       | 1920x1080  | 3840x2160            |
+| `SDL_GetWindowSizeInPixels()`  | 1920x1080       | 3840x2160  | 3840x2160            |
+| `SDL_GetDisplayContentScale()` | 1.0             | 1.0        | 2.0                  |
+| `SDL_GetWindowDisplayScale()`  | 1.0             | 2.0        | 2.0                  |
+| `SDL_GetWindowPixelDensity()`  | 1.0             | 2.0        | 1.0                  |
+
+Observe the philosophical difference between the approaches taken by MacOS and Win32:
+- Win32 coordinate system always deals in physical device pixels, high DPI support is achieved by providing an advisory hint for the developer to enlarge drawn objects. Ignoring the advisory scale factor results in graphics appearing tiny.
+- MacOS coordinate system always deals in physical content sizes, high DPI support is achieved by providing an optional flag for the developer to request finer granularity. Omitting the granularity request results in graphics appearing coarse.
+
+## Explanation
 
 Displays now have a content display scale, which is the expected scale for content based on the DPI settings of the display. For example, a 4K display might have a 2.0 (200%) display scale, which means that the user expects UI elements to be twice as big on this display, to aid in readability. You can query the display content scale using `SDL_GetDisplayContentScale()`, and when this changes you get an `SDL_EVENT_WINDOW_DISPLAY_SCALE_CHANGED` event.
 
diff --git a/libs/SDL3/docs/README-migration.md b/libs/SDL3/docs/README-migration.md
index 887b1bb59..0d4514532 100644
--- a/libs/SDL3/docs/README-migration.md
+++ b/libs/SDL3/docs/README-migration.md
@@ -798,7 +798,7 @@ The following functions have been removed:
 
 Calling SDL_GetHint() with the name of the hint being changed from within a hint callback will now return the new value rather than the old value. The old value is still passed as a parameter to the hint callback.
 
-The environment variables SDL_VIDEODRIVER and SDL_AUDIODRIVER have been renamed to SDL_VIDEO_DRIVER and SDL_AUDIO_DRIVER.
+The environment variables SDL_VIDEODRIVER and SDL_AUDIODRIVER have been renamed to SDL_VIDEO_DRIVER and SDL_AUDIO_DRIVER, but the old names are still supported as a fallback.
 
 The environment variables SDL_VIDEO_X11_WMCLASS and SDL_VIDEO_WAYLAND_WMCLASS have been removed and replaced by either using the appindentifier param to SDL_SetAppMetadata() or setting SDL_PROP_APP_METADATA_IDENTIFIER_STRING with SDL_SetAppMetadataProperty()
 
diff --git a/libs/SDL3/docs/README-wayland.md b/libs/SDL3/docs/README-wayland.md
index 7b4330a58..93f830422 100644
--- a/libs/SDL3/docs/README-wayland.md
+++ b/libs/SDL3/docs/README-wayland.md
@@ -28,6 +28,12 @@ encounter limitations or behavior that is different from other windowing systems
   applications _must_ have an event loop and processes messages on a regular basis, or the application can appear
   unresponsive to both the user and desktop compositor.
 
+### The display reported as the primary by ```SDL_GetPrimaryDisplay()``` is incorrect
+
+- Wayland doesn't natively have the concept of a primary display, so SDL attempts to determine it by querying various
+  system settings, and falling back to a selection algorithm if this fails. If it is incorrect, it can be manually
+  overridden by setting the ```SDL_VIDEO_DISPLAY_PRIORITY``` hint.
+
 ### ```SDL_SetWindowPosition()``` doesn't work on non-popup windows
 
 - Wayland does not allow toplevel windows to position themselves programmatically.
diff --git a/libs/SDL3/docs/release_checklist.md b/libs/SDL3/docs/release_checklist.md
index b1d66f49e..7f7629447 100644
--- a/libs/SDL3/docs/release_checklist.md
+++ b/libs/SDL3/docs/release_checklist.md
@@ -1,9 +1,15 @@
 # Release checklist
 
-When changing the version, run `build-scripts/update-version.sh X Y Z`,
-where `X Y Z` are the major version, minor version, and patch level. So
-`3 8 1` means "change the version to 3.8.1". This script does much of the
-mechanical work.
+* Run `build-scripts/create-release.py -R libsdl-org/SDL --ref <git-ref>` to command
+  GitHub Actions to start creating release assets.
+  It's advisable to run this script regularly, and also prior to any release step.
+  When creating the release assets, `<git-ref>` must be the release tag
+  This makes sure the revision string baked into the archives is correct.
+
+* When changing the version, run `build-scripts/update-version.sh X Y Z`,
+  where `X Y Z` are the major version, minor version, and patch level. So
+  `3 8 1` means "change the version to 3.8.1". This script does much of the
+  mechanical work.
 
 
 ## New feature release
diff --git a/libs/SDL3/examples/CMakeLists.txt b/libs/SDL3/examples/CMakeLists.txt
index 72f5e0e1b..8ea6574dc 100644
--- a/libs/SDL3/examples/CMakeLists.txt
+++ b/libs/SDL3/examples/CMakeLists.txt
@@ -134,6 +134,7 @@ add_sdl_example_executable(renderer-color-mods SOURCES renderer/11-color-mods/co
 add_sdl_example_executable(renderer-viewport SOURCES renderer/14-viewport/viewport.c DATAFILES ${CMAKE_CURRENT_SOURCE_DIR}/../test/sample.bmp)
 add_sdl_example_executable(renderer-cliprect SOURCES renderer/15-cliprect/cliprect.c DATAFILES ${CMAKE_CURRENT_SOURCE_DIR}/../test/sample.bmp)
 add_sdl_example_executable(renderer-read-pixels SOURCES renderer/17-read-pixels/read-pixels.c DATAFILES ${CMAKE_CURRENT_SOURCE_DIR}/../test/sample.bmp)
+add_sdl_example_executable(renderer-debug-text SOURCES renderer/18-debug-text/debug-text.c)
 add_sdl_example_executable(audio-simple-playback SOURCES audio/01-simple-playback/simple-playback.c)
 add_sdl_example_executable(audio-simple-playback-callback SOURCES audio/02-simple-playback-callback/simple-playback-callback.c)
 add_sdl_example_executable(audio-load-wav SOURCES audio/03-load-wav/load-wav.c DATAFILES ${CMAKE_CURRENT_SOURCE_DIR}/../test/sample.wav)
diff --git a/libs/SDL3/examples/audio/01-simple-playback/simple-playback.c b/libs/SDL3/examples/audio/01-simple-playback/simple-playback.c
index 813e8317b..ae6eabd04 100644
--- a/libs/SDL3/examples/audio/01-simple-playback/simple-playback.c
+++ b/libs/SDL3/examples/audio/01-simple-playback/simple-playback.c
@@ -21,14 +21,16 @@ SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[])
 {
     SDL_AudioSpec spec;
 
+    SDL_SetAppMetadata("Example Audio Simple Playback", "1.0", "com.example.audio-simple-playback");
+
     if (!SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO)) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't initialize SDL!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't initialize SDL: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
     /* we don't _need_ a window for audio-only things but it's good policy to have one. */
     if (!SDL_CreateWindowAndRenderer("examples/audio/simple-playback", 640, 480, 0, &window, &renderer)) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't create window/renderer!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't create window/renderer: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
@@ -40,7 +42,7 @@ SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[])
     spec.freq = 8000;
     stream = SDL_OpenAudioDeviceStream(SDL_AUDIO_DEVICE_DEFAULT_PLAYBACK, &spec, NULL, NULL);
     if (!stream) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't create audio stream!", SDL_GetError(), window);
+        SDL_Log("Couldn't create audio stream: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
diff --git a/libs/SDL3/examples/audio/02-simple-playback-callback/simple-playback-callback.c b/libs/SDL3/examples/audio/02-simple-playback-callback/simple-playback-callback.c
index 221e92a66..47d5098d4 100644
--- a/libs/SDL3/examples/audio/02-simple-playback-callback/simple-playback-callback.c
+++ b/libs/SDL3/examples/audio/02-simple-playback-callback/simple-playback-callback.c
@@ -53,14 +53,16 @@ SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[])
 {
     SDL_AudioSpec spec;
 
+    SDL_SetAppMetadata("Example Simple Audio Playback Callback", "1.0", "com.example.audio-simple-playback-callback");
+
     if (!SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO)) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't initialize SDL!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't initialize SDL: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
     /* we don't _need_ a window for audio-only things but it's good policy to have one. */
     if (!SDL_CreateWindowAndRenderer("examples/audio/simple-playback-callback", 640, 480, 0, &window, &renderer)) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't create window/renderer!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't create window/renderer: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
@@ -72,7 +74,7 @@ SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[])
     spec.freq = 8000;
     stream = SDL_OpenAudioDeviceStream(SDL_AUDIO_DEVICE_DEFAULT_PLAYBACK, &spec, FeedTheAudioStreamMore, NULL);
     if (!stream) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't create audio stream!", SDL_GetError(), window);
+        SDL_Log("Couldn't create audio stream: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
diff --git a/libs/SDL3/examples/audio/03-load-wav/load-wav.c b/libs/SDL3/examples/audio/03-load-wav/load-wav.c
index 79236525c..7a4adf0cb 100644
--- a/libs/SDL3/examples/audio/03-load-wav/load-wav.c
+++ b/libs/SDL3/examples/audio/03-load-wav/load-wav.c
@@ -31,21 +31,23 @@ SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[])
     SDL_AudioSpec spec;
     char *wav_path = NULL;
 
+    SDL_SetAppMetadata("Example Audio Load Wave", "1.0", "com.example.audio-load-wav");
+
     if (!SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO)) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't initialize SDL!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't initialize SDL: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
     /* we don't _need_ a window for audio-only things but it's good policy to have one. */
     if (!SDL_CreateWindowAndRenderer("examples/audio/load-wav", 640, 480, 0, &window, &renderer)) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't create window/renderer!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't create window/renderer: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
     /* Load the .wav file from wherever the app is being run from. */
     SDL_asprintf(&wav_path, "%ssample.wav", SDL_GetBasePath());  /* allocate a string of the full file path */
     if (!SDL_LoadWAV(wav_path, &spec, &wav_data, &wav_data_len)) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't load .wav file!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't load .wav file: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
@@ -54,7 +56,7 @@ SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[])
     /* Create our audio stream in the same format as the .wav file. It'll convert to what the audio hardware wants. */
     stream = SDL_OpenAudioDeviceStream(SDL_AUDIO_DEVICE_DEFAULT_PLAYBACK, &spec, NULL, NULL);
     if (!stream) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't create audio stream!", SDL_GetError(), window);
+        SDL_Log("Couldn't create audio stream: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
diff --git a/libs/SDL3/examples/camera/01-read-and-draw/read-and-draw.c b/libs/SDL3/examples/camera/01-read-and-draw/read-and-draw.c
index 9fbe616ce..3f834d372 100644
--- a/libs/SDL3/examples/camera/01-read-and-draw/read-and-draw.c
+++ b/libs/SDL3/examples/camera/01-read-and-draw/read-and-draw.c
@@ -26,29 +26,31 @@ SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[])
     SDL_CameraID *devices = NULL;
     int devcount = 0;
 
+    SDL_SetAppMetadata("Example Camera Read and Draw", "1.0", "com.example.camera-read-and-draw");
+
     if (!SDL_Init(SDL_INIT_VIDEO | SDL_INIT_CAMERA)) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't initialize SDL!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't initialize SDL: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
     if (!SDL_CreateWindowAndRenderer("examples/camera/read-and-draw", 640, 480, 0, &window, &renderer)) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't create window/renderer!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't create window/renderer: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
     devices = SDL_GetCameras(&devcount);
     if (devices == NULL) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't enumerate camera devices!", SDL_GetError(), window);
+        SDL_Log("Couldn't enumerate camera devices: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     } else if (devcount == 0) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't find any camera devices!", "Please connect a camera and try again.", window);
+        SDL_Log("Couldn't find any camera devices! Please connect a camera and try again.");
         return SDL_APP_FAILURE;
     }
 
     camera = SDL_OpenCamera(devices[0], NULL);  // just take the first thing we see in any format it wants.
     SDL_free(devices);
     if (camera == NULL) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't open camera!", SDL_GetError(), window);
+        SDL_Log("Couldn't open camera: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
@@ -64,7 +66,6 @@ SDL_AppResult SDL_AppEvent(void *appstate, SDL_Event *event)
         SDL_Log("Camera use approved by user!");
     } else if (event->type == SDL_EVENT_CAMERA_DEVICE_DENIED) {
         SDL_Log("Camera use denied by user!");
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Camera permission denied!", "User denied access to the camera!", window);
         return SDL_APP_FAILURE;
     }
     return SDL_APP_CONTINUE;  /* carry on with the program! */
diff --git a/libs/SDL3/examples/game/01-snake/snake.c b/libs/SDL3/examples/game/01-snake/snake.c
index 7a9e87cf4..f1be83c4a 100644
--- a/libs/SDL3/examples/game/01-snake/snake.c
+++ b/libs/SDL3/examples/game/01-snake/snake.c
@@ -57,8 +57,8 @@ typedef struct
 {
     SDL_Window *window;
     SDL_Renderer *renderer;
-    SDL_TimerID step_timer;
     SnakeContext snake_ctx;
+    Uint64 last_step;
 } AppState;
 
 SnakeCell snake_cell_at(const SnakeContext *ctx, char x, char y)
@@ -208,16 +208,6 @@ void snake_step(SnakeContext *ctx)
     }
 }
 
-static Uint32 sdl_timer_callback_(void *payload, SDL_TimerID timer_id, Uint32 interval)
-{
-    /* NOTE: snake_step is not called here directly for multithreaded concerns. */
-    SDL_Event event;
-    SDL_zero(event);
-    event.type = SDL_EVENT_USER;
-    SDL_PushEvent(&event);
-    return interval;
-}
-
 static int handle_key_event_(SnakeContext *ctx, SDL_Scancode key_code)
 {
     switch (key_code) {
@@ -250,14 +240,22 @@ static int handle_key_event_(SnakeContext *ctx, SDL_Scancode key_code)
 
 SDL_AppResult SDL_AppIterate(void *appstate)
 {
-    AppState *as;
-    SnakeContext *ctx;
+    AppState *as = (AppState *)appstate;
+    SnakeContext *ctx = &as->snake_ctx;
+    const Uint64 now = SDL_GetTicks();
     SDL_FRect r;
     unsigned i;
     unsigned j;
     int ct;
-    as = (AppState *)appstate;
-    ctx = &as->snake_ctx;
+
+    // run game logic if we're at or past the time to run it.
+    // if we're _really_ behind the time to run it, run it
+    // several times.
+    while ((now - as->last_step) >= STEP_RATE_IN_MILLISECONDS) {
+        snake_step(ctx);
+        as->last_step += STEP_RATE_IN_MILLISECONDS;
+    }
+
     r.w = r.h = SNAKE_BLOCK_SIZE_IN_PIXELS;
     SDL_SetRenderDrawColor(as->renderer, 0, 0, 0, 255);
     SDL_RenderClear(as->renderer);
@@ -281,8 +279,32 @@ SDL_AppResult SDL_AppIterate(void *appstate)
     return SDL_APP_CONTINUE;
 }
 
+static const struct
+{
+    const char *key;
+    const char *value;
+} extended_metadata[] =
+{
+    { SDL_PROP_APP_METADATA_URL_STRING, "https://examples.libsdl.org/SDL3/game/01-snake/" },
+    { SDL_PROP_APP_METADATA_CREATOR_STRING, "SDL team" },
+    { SDL_PROP_APP_METADATA_COPYRIGHT_STRING, "Placed in the public domain" },
+    { SDL_PROP_APP_METADATA_TYPE_STRING, "game" }
+};
+
 SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[])
 {
+    size_t i;
+
+    if (!SDL_SetAppMetadata("Example Snake game", "1.0", "com.example.Snake")) {
+        return SDL_APP_FAILURE;
+    }
+
+    for (i = 0; i < SDL_arraysize(extended_metadata); i++) {
+        if (!SDL_SetAppMetadataProperty(extended_metadata[i].key, extended_metadata[i].value)) {
+            return SDL_APP_FAILURE;
+        }
+    }
+
     if (!SDL_Init(SDL_INIT_VIDEO)) {
         return SDL_APP_FAILURE;
     }
@@ -297,10 +319,7 @@ SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[])
 
     snake_initialize(&as->snake_ctx);
 
-    as->step_timer = SDL_AddTimer(STEP_RATE_IN_MILLISECONDS, sdl_timer_callback_, NULL);
-    if (as->step_timer == 0) {
-        return SDL_APP_FAILURE;
-    }
+    as->last_step = SDL_GetTicks();
 
     return SDL_APP_CONTINUE;
 }
@@ -311,9 +330,6 @@ SDL_AppResult SDL_AppEvent(void *appstate, SDL_Event *event)
     switch (event->type) {
     case SDL_EVENT_QUIT:
         return SDL_APP_SUCCESS;
-    case SDL_EVENT_USER:
-        snake_step(ctx);
-        break;
     case SDL_EVENT_KEY_DOWN:
         return handle_key_event_(ctx, event->key.scancode);
     }
@@ -324,7 +340,6 @@ void SDL_AppQuit(void *appstate, SDL_AppResult result)
 {
     if (appstate != NULL) {
         AppState *as = (AppState *)appstate;
-        SDL_RemoveTimer(as->step_timer);
         SDL_DestroyRenderer(as->renderer);
         SDL_DestroyWindow(as->window);
         SDL_free(as);
diff --git a/libs/SDL3/examples/pen/01-drawing-lines/drawing-lines.c b/libs/SDL3/examples/pen/01-drawing-lines/drawing-lines.c
index 29bc2c43b..a6fab870f 100644
--- a/libs/SDL3/examples/pen/01-drawing-lines/drawing-lines.c
+++ b/libs/SDL3/examples/pen/01-drawing-lines/drawing-lines.c
@@ -23,13 +23,15 @@ static float previous_touch_y = -1.0f;
 /* This function runs once at startup. */
 SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[])
 {
+    SDL_SetAppMetadata("Example Pen Drawing Lines", "1.0", "com.example.pen-drawing-lines");
+
     if (!SDL_Init(SDL_INIT_VIDEO)) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't initialize SDL!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't initialize SDL: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
     if (!SDL_CreateWindowAndRenderer("examples/pen/drawing-lines", 640, 480, 0, &window, &renderer)) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't create window/renderer!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't create window/renderer: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
@@ -37,7 +39,7 @@ SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[])
        Instead rendering a frame for us is a single texture draw. */
     render_target = SDL_CreateTexture(renderer, SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_TARGET, 640, 480);
     if (!render_target) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't create render target!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't create render target: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
diff --git a/libs/SDL3/examples/renderer/01-clear/clear.c b/libs/SDL3/examples/renderer/01-clear/clear.c
index 6de14bae3..6c0a35ebb 100644
--- a/libs/SDL3/examples/renderer/01-clear/clear.c
+++ b/libs/SDL3/examples/renderer/01-clear/clear.c
@@ -17,13 +17,15 @@ static SDL_Renderer *renderer = NULL;
 /* This function runs once at startup. */
 SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[])
 {
+    SDL_SetAppMetadata("Example Renderer Clear", "1.0", "com.example.renderer-clear");
+
     if (!SDL_Init(SDL_INIT_VIDEO)) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't initialize SDL!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't initialize SDL: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
     if (!SDL_CreateWindowAndRenderer("examples/renderer/clear", 640, 480, 0, &window, &renderer)) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't create window/renderer!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't create window/renderer: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
diff --git a/libs/SDL3/examples/renderer/02-primitives/primitives.c b/libs/SDL3/examples/renderer/02-primitives/primitives.c
index 89bc7f57c..5e748c57d 100644
--- a/libs/SDL3/examples/renderer/02-primitives/primitives.c
+++ b/libs/SDL3/examples/renderer/02-primitives/primitives.c
@@ -19,13 +19,15 @@ SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[])
 {
     int i;
 
+    SDL_SetAppMetadata("Example Renderer Primitives", "1.0", "com.example.renderer-primitives");
+
     if (!SDL_Init(SDL_INIT_VIDEO)) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't initialize SDL!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't initialize SDL: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
     if (!SDL_CreateWindowAndRenderer("examples/renderer/primitives", 640, 480, 0, &window, &renderer)) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't create window/renderer!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't create window/renderer: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
diff --git a/libs/SDL3/examples/renderer/03-lines/lines.c b/libs/SDL3/examples/renderer/03-lines/lines.c
index ed121f504..76d584b54 100644
--- a/libs/SDL3/examples/renderer/03-lines/lines.c
+++ b/libs/SDL3/examples/renderer/03-lines/lines.c
@@ -16,13 +16,15 @@ static SDL_Renderer *renderer = NULL;
 /* This function runs once at startup. */
 SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[])
 {
+    SDL_SetAppMetadata("Example Renderer Lines", "1.0", "com.example.renderer-lines");
+
     if (!SDL_Init(SDL_INIT_VIDEO)) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't initialize SDL!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't initialize SDL: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
     if (!SDL_CreateWindowAndRenderer("examples/renderer/lines", 640, 480, 0, &window, &renderer)) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't create window/renderer!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't create window/renderer: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
diff --git a/libs/SDL3/examples/renderer/04-points/points.c b/libs/SDL3/examples/renderer/04-points/points.c
index d34a96655..bff4cf0f5 100644
--- a/libs/SDL3/examples/renderer/04-points/points.c
+++ b/libs/SDL3/examples/renderer/04-points/points.c
@@ -36,13 +36,15 @@ SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[])
 {
     int i;
 
+    SDL_SetAppMetadata("Example Renderer Points", "1.0", "com.example.renderer-points");
+
     if (!SDL_Init(SDL_INIT_VIDEO)) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't initialize SDL!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't initialize SDL: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
     if (!SDL_CreateWindowAndRenderer("examples/renderer/points", WINDOW_WIDTH, WINDOW_HEIGHT, 0, &window, &renderer)) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't create window/renderer!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't create window/renderer: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
diff --git a/libs/SDL3/examples/renderer/05-rectangles/rectangles.c b/libs/SDL3/examples/renderer/05-rectangles/rectangles.c
index 95f4864a6..6c31e6f35 100644
--- a/libs/SDL3/examples/renderer/05-rectangles/rectangles.c
+++ b/libs/SDL3/examples/renderer/05-rectangles/rectangles.c
@@ -19,13 +19,15 @@ static SDL_Renderer *renderer = NULL;
 /* This function runs once at startup. */
 SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[])
 {
+    SDL_SetAppMetadata("Example Renderer Rectangles", "1.0", "com.example.renderer-rectangles");
+
     if (!SDL_Init(SDL_INIT_VIDEO)) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't initialize SDL!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't initialize SDL: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
     if (!SDL_CreateWindowAndRenderer("examples/renderer/rectangles", WINDOW_WIDTH, WINDOW_HEIGHT, 0, &window, &renderer)) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't create window/renderer!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't create window/renderer: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
diff --git a/libs/SDL3/examples/renderer/06-textures/textures.c b/libs/SDL3/examples/renderer/06-textures/textures.c
index 12fe70bcb..f47e611fe 100644
--- a/libs/SDL3/examples/renderer/06-textures/textures.c
+++ b/libs/SDL3/examples/renderer/06-textures/textures.c
@@ -25,13 +25,15 @@ SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[])
     SDL_Surface *surface = NULL;
     char *bmp_path = NULL;
 
+    SDL_SetAppMetadata("Example Renderer Textures", "1.0", "com.example.renderer-textures");
+
     if (!SDL_Init(SDL_INIT_VIDEO)) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't initialize SDL!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't initialize SDL: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
     if (!SDL_CreateWindowAndRenderer("examples/renderer/textures", WINDOW_WIDTH, WINDOW_HEIGHT, 0, &window, &renderer)) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't create window/renderer!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't create window/renderer: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
@@ -44,7 +46,7 @@ SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[])
     SDL_asprintf(&bmp_path, "%ssample.bmp", SDL_GetBasePath());  /* allocate a string of the full file path */
     surface = SDL_LoadBMP(bmp_path);
     if (!surface) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't load bitmap!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't load bitmap: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
@@ -55,7 +57,7 @@ SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[])
 
     texture = SDL_CreateTextureFromSurface(renderer, surface);
     if (!texture) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't create static texture!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't create static texture: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
diff --git a/libs/SDL3/examples/renderer/07-streaming-textures/streaming-textures.c b/libs/SDL3/examples/renderer/07-streaming-textures/streaming-textures.c
index 3bbae3557..6c86c637b 100644
--- a/libs/SDL3/examples/renderer/07-streaming-textures/streaming-textures.c
+++ b/libs/SDL3/examples/renderer/07-streaming-textures/streaming-textures.c
@@ -22,19 +22,21 @@ static SDL_Texture *texture = NULL;
 /* This function runs once at startup. */
 SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[])
 {
+    SDL_SetAppMetadata("Example Renderer Streaming Textures", "1.0", "com.example.renderer-streaming-textures");
+
     if (!SDL_Init(SDL_INIT_VIDEO)) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't initialize SDL!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't initialize SDL: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
     if (!SDL_CreateWindowAndRenderer("examples/renderer/streaming-textures", WINDOW_WIDTH, WINDOW_HEIGHT, 0, &window, &renderer)) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't create window/renderer!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't create window/renderer: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
     texture = SDL_CreateTexture(renderer, SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_STREAMING, TEXTURE_SIZE, TEXTURE_SIZE);
     if (!texture) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't create streaming texture!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't create streaming texture: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
diff --git a/libs/SDL3/examples/renderer/08-rotating-textures/rotating-textures.c b/libs/SDL3/examples/renderer/08-rotating-textures/rotating-textures.c
index 850d0e505..b273d6757 100644
--- a/libs/SDL3/examples/renderer/08-rotating-textures/rotating-textures.c
+++ b/libs/SDL3/examples/renderer/08-rotating-textures/rotating-textures.c
@@ -25,13 +25,15 @@ SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[])
     SDL_Surface *surface = NULL;
     char *bmp_path = NULL;
 
+    SDL_SetAppMetadata("Example Renderer Rotating Textures", "1.0", "com.example.renderer-rotating-textures");
+
     if (!SDL_Init(SDL_INIT_VIDEO)) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't initialize SDL!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't initialize SDL: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
     if (!SDL_CreateWindowAndRenderer("examples/renderer/rotating-textures", WINDOW_WIDTH, WINDOW_HEIGHT, 0, &window, &renderer)) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't create window/renderer!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't create window/renderer: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
@@ -44,7 +46,7 @@ SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[])
     SDL_asprintf(&bmp_path, "%ssample.bmp", SDL_GetBasePath());  /* allocate a string of the full file path */
     surface = SDL_LoadBMP(bmp_path);
     if (!surface) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't load bitmap!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't load bitmap: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
@@ -55,7 +57,7 @@ SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[])
 
     texture = SDL_CreateTextureFromSurface(renderer, surface);
     if (!texture) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't create static texture!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't create static texture: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
diff --git a/libs/SDL3/examples/renderer/09-scaling-textures/scaling-textures.c b/libs/SDL3/examples/renderer/09-scaling-textures/scaling-textures.c
index dc1cb3595..57a718021 100644
--- a/libs/SDL3/examples/renderer/09-scaling-textures/scaling-textures.c
+++ b/libs/SDL3/examples/renderer/09-scaling-textures/scaling-textures.c
@@ -25,13 +25,15 @@ SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[])
     SDL_Surface *surface = NULL;
     char *bmp_path = NULL;
 
+    SDL_SetAppMetadata("Example Renderer Scaling Textures", "1.0", "com.example.renderer-scaling-textures");
+
     if (!SDL_Init(SDL_INIT_VIDEO)) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't initialize SDL!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't initialize SDL: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
     if (!SDL_CreateWindowAndRenderer("examples/renderer/scaling-textures", WINDOW_WIDTH, WINDOW_HEIGHT, 0, &window, &renderer)) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't create window/renderer!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't create window/renderer: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
@@ -44,7 +46,7 @@ SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[])
     SDL_asprintf(&bmp_path, "%ssample.bmp", SDL_GetBasePath());  /* allocate a string of the full file path */
     surface = SDL_LoadBMP(bmp_path);
     if (!surface) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't load bitmap!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't load bitmap: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
@@ -55,7 +57,7 @@ SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[])
 
     texture = SDL_CreateTextureFromSurface(renderer, surface);
     if (!texture) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't create static texture!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't create static texture: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
diff --git a/libs/SDL3/examples/renderer/10-geometry/geometry.c b/libs/SDL3/examples/renderer/10-geometry/geometry.c
index 2d85812af..f846509de 100644
--- a/libs/SDL3/examples/renderer/10-geometry/geometry.c
+++ b/libs/SDL3/examples/renderer/10-geometry/geometry.c
@@ -25,13 +25,15 @@ SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[])
     SDL_Surface *surface = NULL;
     char *bmp_path = NULL;
 
+    SDL_SetAppMetadata("Example Renderer Geometry", "1.0", "com.example.renderer-geometry");
+
     if (!SDL_Init(SDL_INIT_VIDEO)) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't initialize SDL!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't initialize SDL: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
     if (!SDL_CreateWindowAndRenderer("examples/renderer/geometry", WINDOW_WIDTH, WINDOW_HEIGHT, 0, &window, &renderer)) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't create window/renderer!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't create window/renderer: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
@@ -44,7 +46,7 @@ SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[])
     SDL_asprintf(&bmp_path, "%ssample.bmp", SDL_GetBasePath());  /* allocate a string of the full file path */
     surface = SDL_LoadBMP(bmp_path);
     if (!surface) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't load bitmap!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't load bitmap: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
@@ -55,7 +57,7 @@ SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[])
 
     texture = SDL_CreateTextureFromSurface(renderer, surface);
     if (!texture) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't create static texture!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't create static texture: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
diff --git a/libs/SDL3/examples/renderer/11-color-mods/color-mods.c b/libs/SDL3/examples/renderer/11-color-mods/color-mods.c
index f6b9c2cbd..449a95100 100644
--- a/libs/SDL3/examples/renderer/11-color-mods/color-mods.c
+++ b/libs/SDL3/examples/renderer/11-color-mods/color-mods.c
@@ -25,13 +25,15 @@ SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[])
     SDL_Surface *surface = NULL;
     char *bmp_path = NULL;
 
+    SDL_SetAppMetadata("Example Renderer Color Mods", "1.0", "com.example.renderer-color-mods");
+
     if (!SDL_Init(SDL_INIT_VIDEO)) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't initialize SDL!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't initialize SDL: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
     if (!SDL_CreateWindowAndRenderer("examples/renderer/color-mods", WINDOW_WIDTH, WINDOW_HEIGHT, 0, &window, &renderer)) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't create window/renderer!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't create window/renderer: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
@@ -44,7 +46,7 @@ SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[])
     SDL_asprintf(&bmp_path, "%ssample.bmp", SDL_GetBasePath());  /* allocate a string of the full file path */
     surface = SDL_LoadBMP(bmp_path);
     if (!surface) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't load bitmap!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't load bitmap: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
@@ -55,7 +57,7 @@ SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[])
 
     texture = SDL_CreateTextureFromSurface(renderer, surface);
     if (!texture) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't create static texture!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't create static texture: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
diff --git a/libs/SDL3/examples/renderer/14-viewport/viewport.c b/libs/SDL3/examples/renderer/14-viewport/viewport.c
index 096b799cd..efef94a57 100644
--- a/libs/SDL3/examples/renderer/14-viewport/viewport.c
+++ b/libs/SDL3/examples/renderer/14-viewport/viewport.c
@@ -25,13 +25,15 @@ SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[])
     SDL_Surface *surface = NULL;
     char *bmp_path = NULL;
 
+    SDL_SetAppMetadata("Example Renderer Viewport", "1.0", "com.example.renderer-viewport");
+
     if (!SDL_Init(SDL_INIT_VIDEO)) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't initialize SDL!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't initialize SDL: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
     if (!SDL_CreateWindowAndRenderer("examples/renderer/viewport", WINDOW_WIDTH, WINDOW_HEIGHT, 0, &window, &renderer)) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't create window/renderer!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't create window/renderer: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
@@ -44,7 +46,7 @@ SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[])
     SDL_asprintf(&bmp_path, "%ssample.bmp", SDL_GetBasePath());  /* allocate a string of the full file path */
     surface = SDL_LoadBMP(bmp_path);
     if (!surface) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't load bitmap!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't load bitmap: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
@@ -55,7 +57,7 @@ SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[])
 
     texture = SDL_CreateTextureFromSurface(renderer, surface);
     if (!texture) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't create static texture!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't create static texture: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
diff --git a/libs/SDL3/examples/renderer/15-cliprect/cliprect.c b/libs/SDL3/examples/renderer/15-cliprect/cliprect.c
index 4c69f47ec..7717da65e 100644
--- a/libs/SDL3/examples/renderer/15-cliprect/cliprect.c
+++ b/libs/SDL3/examples/renderer/15-cliprect/cliprect.c
@@ -32,13 +32,15 @@ SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[])
     SDL_Surface *surface = NULL;
     char *bmp_path = NULL;
 
+    SDL_SetAppMetadata("Example Renderer Clipping Rectangle", "1.0", "com.example.renderer-cliprect");
+
     if (!SDL_Init(SDL_INIT_VIDEO)) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't initialize SDL!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't initialize SDL: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
     if (!SDL_CreateWindowAndRenderer("examples/renderer/cliprect", WINDOW_WIDTH, WINDOW_HEIGHT, 0, &window, &renderer)) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't create window/renderer!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't create window/renderer: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
@@ -55,7 +57,7 @@ SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[])
     SDL_asprintf(&bmp_path, "%ssample.bmp", SDL_GetBasePath());  /* allocate a string of the full file path */
     surface = SDL_LoadBMP(bmp_path);
     if (!surface) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't load bitmap!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't load bitmap: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
@@ -63,7 +65,7 @@ SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[])
 
     texture = SDL_CreateTextureFromSurface(renderer, surface);
     if (!texture) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't create static texture!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't create static texture: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
diff --git a/libs/SDL3/examples/renderer/17-read-pixels/read-pixels.c b/libs/SDL3/examples/renderer/17-read-pixels/read-pixels.c
index b2cb52308..65e60b6a0 100644
--- a/libs/SDL3/examples/renderer/17-read-pixels/read-pixels.c
+++ b/libs/SDL3/examples/renderer/17-read-pixels/read-pixels.c
@@ -34,13 +34,15 @@ SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[])
     SDL_Surface *surface = NULL;
     char *bmp_path = NULL;
 
+    SDL_SetAppMetadata("Example Renderer Read Pixels", "1.0", "com.example.renderer-read-pixels");
+
     if (!SDL_Init(SDL_INIT_VIDEO)) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't initialize SDL!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't initialize SDL: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
     if (!SDL_CreateWindowAndRenderer("examples/renderer/read-pixels", WINDOW_WIDTH, WINDOW_HEIGHT, 0, &window, &renderer)) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't create window/renderer!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't create window/renderer: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
@@ -53,7 +55,7 @@ SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[])
     SDL_asprintf(&bmp_path, "%ssample.bmp", SDL_GetBasePath());  /* allocate a string of the full file path */
     surface = SDL_LoadBMP(bmp_path);
     if (!surface) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't load bitmap!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't load bitmap: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
@@ -64,7 +66,7 @@ SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[])
 
     texture = SDL_CreateTextureFromSurface(renderer, surface);
     if (!texture) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't create static texture!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't create static texture: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
@@ -126,7 +128,7 @@ SDL_AppResult SDL_AppIterate(void *appstate)
             SDL_DestroyTexture(converted_texture);
             converted_texture = SDL_CreateTexture(renderer, SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_STREAMING, surface->w, surface->h);
             if (!converted_texture) {
-                SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't (re)create conversion texture!", SDL_GetError(), NULL);
+                SDL_Log("Couldn't (re)create conversion texture: %s", SDL_GetError());
                 return SDL_APP_FAILURE;
             }
             converted_texture_width = surface->w;
diff --git a/libs/SDL3/examples/renderer/18-debug-text/README.txt b/libs/SDL3/examples/renderer/18-debug-text/README.txt
new file mode 100644
index 000000000..0f0c868df
--- /dev/null
+++ b/libs/SDL3/examples/renderer/18-debug-text/README.txt
@@ -0,0 +1,4 @@
+This example creates an SDL window and renderer, and draws some text
+using SDL_RenderDebugText(). This is not quality text rendering, but it can
+be helpful for simple apps, debugging, or showing something in a pinch.
+
diff --git a/libs/SDL3/examples/renderer/18-debug-text/debug-text.c b/libs/SDL3/examples/renderer/18-debug-text/debug-text.c
new file mode 100644
index 000000000..280c0b345
--- /dev/null
+++ b/libs/SDL3/examples/renderer/18-debug-text/debug-text.c
@@ -0,0 +1,75 @@
+/*
+ * This example creates an SDL window and renderer, and then draws some text
+ * using SDL_RenderDebugText() every frame.
+ *
+ * This code is public domain. Feel free to use it for any purpose!
+ */
+
+#define SDL_MAIN_USE_CALLBACKS 1  /* use the callbacks instead of main() */
+#include <SDL3/SDL.h>
+#include <SDL3/SDL_main.h>
+
+/* We will use this renderer to draw into this window every frame. */
+static SDL_Window *window = NULL;
+static SDL_Renderer *renderer = NULL;
+
+#define WINDOW_WIDTH 640
+#define WINDOW_HEIGHT 480
+
+/* This function runs once at startup. */
+SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[])
+{
+    SDL_SetAppMetadata("Example Renderer Debug Texture", "1.0", "com.example.renderer-debug-text");
+
+    if (!SDL_Init(SDL_INIT_VIDEO)) {
+        SDL_Log("Couldn't initialize SDL: %s", SDL_GetError());
+        return SDL_APP_FAILURE;
+    }
+
+    if (!SDL_CreateWindowAndRenderer("examples/renderer/debug-text", WINDOW_WIDTH, WINDOW_HEIGHT, 0, &window, &renderer)) {
+        SDL_Log("Couldn't create window/renderer: %s", SDL_GetError());
+        return SDL_APP_FAILURE;
+    }
+
+    return SDL_APP_CONTINUE;  /* carry on with the program! */
+}
+
+/* This function runs when a new event (mouse input, keypresses, etc) occurs. */
+SDL_AppResult SDL_AppEvent(void *appstate, SDL_Event *event)
+{
+    if (event->type == SDL_EVENT_QUIT) {
+        return SDL_APP_SUCCESS;  /* end the program, reporting success to the OS. */
+    }
+    return SDL_APP_CONTINUE;  /* carry on with the program! */
+}
+
+/* This function runs once per frame, and is the heart of the program. */
+SDL_AppResult SDL_AppIterate(void *appstate)
+{
+    /* as you can see from this, rendering draws over whatever was drawn before it. */
+    SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255);  /* black, full alpha */
+    SDL_RenderClear(renderer);  /* start with a blank canvas. */
+
+    SDL_SetRenderDrawColor(renderer, 255, 255, 255, 255);  /* white, full alpha */
+    SDL_RenderDebugText(renderer, 272, 100, "Hello world!");
+    SDL_RenderDebugText(renderer, 224, 150, "This is some debug text.");
+
+    SDL_SetRenderDrawColor(renderer, 51, 102, 255, 255);  /* light blue, full alpha */
+    SDL_RenderDebugText(renderer, 184, 200, "You can do it in different colors.");
+    SDL_SetRenderDrawColor(renderer, 255, 255, 255, 255);  /* white, full alpha */
+
+    SDL_SetRenderScale(renderer, 4.0f, 4.0f);
+    SDL_RenderDebugText(renderer, 14, 65, "It can be scaled.");
+    SDL_SetRenderScale(renderer, 1.0f, 1.0f);
+    SDL_RenderDebugText(renderer, 64, 350, "This only does ASCII chars. So this laughing emoji won't draw: 🤣");
+    SDL_RenderPresent(renderer);  /* put it all on the screen! */
+
+    return SDL_APP_CONTINUE;  /* carry on with the program! */
+}
+
+/* This function runs once at shutdown. */
+void SDL_AppQuit(void *appstate, SDL_AppResult result)
+{
+    /* SDL will clean up the window/renderer for us. */
+}
+
diff --git a/libs/SDL3/examples/template.c b/libs/SDL3/examples/template.c
index 331db683e..6719cc9ec 100644
--- a/libs/SDL3/examples/template.c
+++ b/libs/SDL3/examples/template.c
@@ -16,13 +16,15 @@ static SDL_Renderer *renderer = NULL;
 /* This function runs once at startup. */
 SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[])
 {
+    SDL_SetAppMetadata("Example HUMAN READABLE NAME", "1.0", "com.example.CATEGORY-NAME");
+
     if (!SDL_Init(SDL_INIT_VIDEO)) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't initialize SDL!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't initialize SDL: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
     if (!SDL_CreateWindowAndRenderer("examples/CATEGORY/NAME", 640, 480, 0, &window, &renderer)) {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Couldn't create window/renderer!", SDL_GetError(), NULL);
+        SDL_Log("Couldn't create window/renderer: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
     return SDL_APP_CONTINUE;  /* carry on with the program! */
diff --git a/libs/SDL3/include/SDL3/SDL.h b/libs/SDL3/include/SDL3/SDL.h
index e9f1d6bee..b7a1a5b6a 100644
--- a/libs/SDL3/include/SDL3/SDL.h
+++ b/libs/SDL3/include/SDL3/SDL.h
@@ -22,7 +22,7 @@
 /**
  *  \file SDL.h
  *
- *  Main include header for the SDL library, version 3.1.3
+ *  Main include header for the SDL library, version 3.1.5
  */
 
 #ifndef SDL_h_
diff --git a/libs/SDL3/include/SDL3/SDL_bits.h b/libs/SDL3/include/SDL3/SDL_bits.h
index 15548bc66..fe2dd81db 100644
--- a/libs/SDL3/include/SDL3/SDL_bits.h
+++ b/libs/SDL3/include/SDL3/SDL_bits.h
@@ -85,7 +85,7 @@ SDL_FORCE_INLINE int SDL_MostSignificantBitIndex32(Uint32 x)
 #elif defined(_MSC_VER)
     unsigned long index;
     if (_BitScanReverse(&index, x)) {
-        return index;
+        return (int)index;
     }
     return -1;
 #else
diff --git a/libs/SDL3/include/SDL3/SDL_camera.h b/libs/SDL3/include/SDL3/SDL_camera.h
index db2eb6940..ec2c36ad4 100644
--- a/libs/SDL3/include/SDL3/SDL_camera.h
+++ b/libs/SDL3/include/SDL3/SDL_camera.h
@@ -268,7 +268,7 @@ extern SDL_DECLSPEC SDL_CameraPosition SDLCALL SDL_GetCameraPosition(SDL_CameraI
  *
  * You can call SDL_GetCameraFormat() to get the actual data format if passing
  * a NULL spec here. You can see the exact specs a device can support without
- * conversion with SDL_GetCameraSupportedSpecs().
+ * conversion with SDL_GetCameraSupportedFormats().
  *
  * SDL will not attempt to emulate framerate; it will try to set the hardware
  * to the rate closest to the requested speed, but it won't attempt to limit
@@ -281,10 +281,11 @@ extern SDL_DECLSPEC SDL_CameraPosition SDLCALL SDL_GetCameraPosition(SDL_CameraI
  * the camera, and they can choose Yes or No at that point. Until they do, the
  * camera will not be usable. The app should either wait for an
  * SDL_EVENT_CAMERA_DEVICE_APPROVED (or SDL_EVENT_CAMERA_DEVICE_DENIED) event,
- * or poll SDL_IsCameraApproved() occasionally until it returns non-zero. On
- * platforms that don't require explicit user approval (and perhaps in places
- * where the user previously permitted access), the approval event might come
- * immediately, but it might come seconds, minutes, or hours later!
+ * or poll SDL_GetCameraPermissionState() occasionally until it returns
+ * non-zero. On platforms that don't require explicit user approval (and
+ * perhaps in places where the user previously permitted access), the approval
+ * event might come immediately, but it might come seconds, minutes, or hours
+ * later!
  *
  * \param instance_id the camera device instance ID.
  * \param spec the desired format for data the device will provide. Can be
@@ -372,7 +373,8 @@ extern SDL_DECLSPEC SDL_PropertiesID SDLCALL SDL_GetCameraProperties(SDL_Camera
  * some platforms require, this will return false, but this isn't necessarily
  * a fatal error; you should either wait for an
  * SDL_EVENT_CAMERA_DEVICE_APPROVED (or SDL_EVENT_CAMERA_DEVICE_DENIED) event,
- * or poll SDL_IsCameraApproved() occasionally until it returns non-zero.
+ * or poll SDL_GetCameraPermissionState() occasionally until it returns
+ * non-zero.
  *
  * \param camera opened camera device.
  * \param spec the SDL_CameraSpec to be initialized by this function.
@@ -413,8 +415,8 @@ extern SDL_DECLSPEC bool SDLCALL SDL_GetCameraFormat(SDL_Camera *camera, SDL_Cam
  * If the system is waiting for the user to approve access to the camera, as
  * some platforms require, this will return NULL (no frames available); you
  * should either wait for an SDL_EVENT_CAMERA_DEVICE_APPROVED (or
- * SDL_EVENT_CAMERA_DEVICE_DENIED) event, or poll SDL_IsCameraApproved()
- * occasionally until it returns non-zero.
+ * SDL_EVENT_CAMERA_DEVICE_DENIED) event, or poll
+ * SDL_GetCameraPermissionState() occasionally until it returns non-zero.
  *
  * \param camera opened camera device.
  * \param timestampNS a pointer filled in with the frame's timestamp, or 0 on
diff --git a/libs/SDL3/include/SDL3/SDL_error.h b/libs/SDL3/include/SDL3/SDL_error.h
index 9256ff297..9f166292b 100644
--- a/libs/SDL3/include/SDL3/SDL_error.h
+++ b/libs/SDL3/include/SDL3/SDL_error.h
@@ -82,9 +82,27 @@ extern "C" {
  *
  * \sa SDL_ClearError
  * \sa SDL_GetError
+ * \sa SDL_SetErrorV
  */
 extern SDL_DECLSPEC bool SDLCALL SDL_SetError(SDL_PRINTF_FORMAT_STRING const char *fmt, ...) SDL_PRINTF_VARARG_FUNC(1);
 
+/**
+ * Set the SDL error message for the current thread.
+ *
+ * Calling this function will replace any previous error message that was set.
+ *
+ * \param fmt a printf()-style message format string.
+ * \param ap a variable argument list.
+ * \returns false.
+ *
+ * \since This function is available since SDL 3.1.4.
+ *
+ * \sa SDL_ClearError
+ * \sa SDL_GetError
+ * \sa SDL_SetError
+ */
+extern SDL_DECLSPEC bool SDLCALL SDL_SetErrorV(SDL_PRINTF_FORMAT_STRING const char *fmt, va_list ap) SDL_PRINTF_VARARG_FUNCV(1);
+
 /**
  * Set an error indicating that memory allocation failed.
  *
diff --git a/libs/SDL3/include/SDL3/SDL_events.h b/libs/SDL3/include/SDL3/SDL_events.h
index 9befaf21c..bc5becb5f 100644
--- a/libs/SDL3/include/SDL3/SDL_events.h
+++ b/libs/SDL3/include/SDL3/SDL_events.h
@@ -133,7 +133,7 @@ typedef enum SDL_EventType
     SDL_EVENT_WINDOW_ENTER_FULLSCREEN,  /**< The window has entered fullscreen mode */
     SDL_EVENT_WINDOW_LEAVE_FULLSCREEN,  /**< The window has left fullscreen mode */
     SDL_EVENT_WINDOW_DESTROYED,         /**< The window with the associated ID is being or has been destroyed. If this message is being handled
-                                             in an event watcher, the window handle is still valid and can still be used to retrieve any userdata
+                                             in an event watcher, the window handle is still valid and can still be used to retrieve any properties
                                              associated with the window. Otherwise, the handle has already been destroyed and all resources
                                              associated with it are invalid */
     SDL_EVENT_WINDOW_HDR_STATE_CHANGED, /**< Window HDR properties have changed */
@@ -229,6 +229,12 @@ typedef enum SDL_EventType
     SDL_EVENT_RENDER_TARGETS_RESET = 0x2000, /**< The render targets have been reset and their contents need to be updated */
     SDL_EVENT_RENDER_DEVICE_RESET, /**< The device has been reset and all textures need to be recreated */
 
+    /* Reserved events for private platforms */
+    SDL_EVENT_PRIVATE0 = 0x4000,
+    SDL_EVENT_PRIVATE1,
+    SDL_EVENT_PRIVATE2,
+    SDL_EVENT_PRIVATE3,
+
     /* Internal events */
     SDL_EVENT_POLL_SENTINEL = 0x7F00, /**< Signals the end of an event poll cycle */
 
@@ -554,7 +560,7 @@ typedef struct SDL_JoyDeviceEvent
 } SDL_JoyDeviceEvent;
 
 /**
- * Joysick battery level change event structure (event.jbattery.*)
+ * Joystick battery level change event structure (event.jbattery.*)
  *
  * \since This struct is available since SDL 3.0.0.
  */
diff --git a/libs/SDL3/include/SDL3/SDL_gamepad.h b/libs/SDL3/include/SDL3/SDL_gamepad.h
index a919097a9..93d18bb14 100644
--- a/libs/SDL3/include/SDL3/SDL_gamepad.h
+++ b/libs/SDL3/include/SDL3/SDL_gamepad.h
@@ -129,10 +129,10 @@ typedef enum SDL_GamepadType
 typedef enum SDL_GamepadButton
 {
     SDL_GAMEPAD_BUTTON_INVALID = -1,
-    SDL_GAMEPAD_BUTTON_SOUTH,           /* Bottom face button (e.g. Xbox A button) */
-    SDL_GAMEPAD_BUTTON_EAST,            /* Right face button (e.g. Xbox B button) */
-    SDL_GAMEPAD_BUTTON_WEST,            /* Left face button (e.g. Xbox X button) */
-    SDL_GAMEPAD_BUTTON_NORTH,           /* Top face button (e.g. Xbox Y button) */
+    SDL_GAMEPAD_BUTTON_SOUTH,           /**< Bottom face button (e.g. Xbox A button) */
+    SDL_GAMEPAD_BUTTON_EAST,            /**< Right face button (e.g. Xbox B button) */
+    SDL_GAMEPAD_BUTTON_WEST,            /**< Left face button (e.g. Xbox X button) */
+    SDL_GAMEPAD_BUTTON_NORTH,           /**< Top face button (e.g. Xbox Y button) */
     SDL_GAMEPAD_BUTTON_BACK,
     SDL_GAMEPAD_BUTTON_GUIDE,
     SDL_GAMEPAD_BUTTON_START,
@@ -144,17 +144,17 @@ typedef enum SDL_GamepadButton
     SDL_GAMEPAD_BUTTON_DPAD_DOWN,
     SDL_GAMEPAD_BUTTON_DPAD_LEFT,
     SDL_GAMEPAD_BUTTON_DPAD_RIGHT,
-    SDL_GAMEPAD_BUTTON_MISC1,           /* Additional button (e.g. Xbox Series X share button, PS5 microphone button, Nintendo Switch Pro capture button, Amazon Luna microphone button, Google Stadia capture button) */
-    SDL_GAMEPAD_BUTTON_RIGHT_PADDLE1,   /* Upper or primary paddle, under your right hand (e.g. Xbox Elite paddle P1) */
-    SDL_GAMEPAD_BUTTON_LEFT_PADDLE1,    /* Upper or primary paddle, under your left hand (e.g. Xbox Elite paddle P3) */
-    SDL_GAMEPAD_BUTTON_RIGHT_PADDLE2,   /* Lower or secondary paddle, under your right hand (e.g. Xbox Elite paddle P2) */
-    SDL_GAMEPAD_BUTTON_LEFT_PADDLE2,    /* Lower or secondary paddle, under your left hand (e.g. Xbox Elite paddle P4) */
-    SDL_GAMEPAD_BUTTON_TOUCHPAD,        /* PS4/PS5 touchpad button */
-    SDL_GAMEPAD_BUTTON_MISC2,           /* Additional button */
-    SDL_GAMEPAD_BUTTON_MISC3,           /* Additional button */
-    SDL_GAMEPAD_BUTTON_MISC4,           /* Additional button */
-    SDL_GAMEPAD_BUTTON_MISC5,           /* Additional button */
-    SDL_GAMEPAD_BUTTON_MISC6,           /* Additional button */
+    SDL_GAMEPAD_BUTTON_MISC1,           /**< Additional button (e.g. Xbox Series X share button, PS5 microphone button, Nintendo Switch Pro capture button, Amazon Luna microphone button, Google Stadia capture button) */
+    SDL_GAMEPAD_BUTTON_RIGHT_PADDLE1,   /**< Upper or primary paddle, under your right hand (e.g. Xbox Elite paddle P1) */
+    SDL_GAMEPAD_BUTTON_LEFT_PADDLE1,    /**< Upper or primary paddle, under your left hand (e.g. Xbox Elite paddle P3) */
+    SDL_GAMEPAD_BUTTON_RIGHT_PADDLE2,   /**< Lower or secondary paddle, under your right hand (e.g. Xbox Elite paddle P2) */
+    SDL_GAMEPAD_BUTTON_LEFT_PADDLE2,    /**< Lower or secondary paddle, under your left hand (e.g. Xbox Elite paddle P4) */
+    SDL_GAMEPAD_BUTTON_TOUCHPAD,        /**< PS4/PS5 touchpad button */
+    SDL_GAMEPAD_BUTTON_MISC2,           /**< Additional button */
+    SDL_GAMEPAD_BUTTON_MISC3,           /**< Additional button */
+    SDL_GAMEPAD_BUTTON_MISC4,           /**< Additional button */
+    SDL_GAMEPAD_BUTTON_MISC5,           /**< Additional button */
+    SDL_GAMEPAD_BUTTON_MISC6,           /**< Additional button */
     SDL_GAMEPAD_BUTTON_COUNT
 } SDL_GamepadButton;
 
diff --git a/libs/SDL3/include/SDL3/SDL_gpu.h b/libs/SDL3/include/SDL3/SDL_gpu.h
index 6e13b4268..99a3c5ffd 100644
--- a/libs/SDL3/include/SDL3/SDL_gpu.h
+++ b/libs/SDL3/include/SDL3/SDL_gpu.h
@@ -128,10 +128,9 @@
  * explaining this situation.
  *
  * It is optimal for apps to pre-compile the shader formats they might use,
- * but for ease of use SDL provides a
- * [satellite single-header library](https://github.com/libsdl-org/SDL_gpu_shadercross
- * )
- * for performing runtime shader cross-compilation.
+ * but for ease of use SDL provides a separate project,
+ * [SDL_gpu_shadercross](https://github.com/libsdl-org/SDL_gpu_shadercross)
+ * , for performing runtime shader cross-compilation.
  *
  * This is an extremely quick overview that leaves out several important
  * details. Already, though, one can see that GPU programming can be quite
@@ -302,9 +301,8 @@ typedef struct SDL_GPUGraphicsPipeline SDL_GPUGraphicsPipeline;
  * buffer A and then command buffer B all commands in A will begin executing
  * before any command in B begins executing.
  *
- * In multi-threading scenarios, you should acquire and submit a command
- * buffer on the same thread. As long as you satisfy this requirement, all
- * functionality related to command buffers is thread-safe.
+ * In multi-threading scenarios, you should only access a command buffer on
+ * the thread you acquired it from.
  *
  * \since This struct is available since SDL 3.0.0
  *
@@ -588,7 +586,52 @@ typedef enum SDL_GPUTextureFormat
     SDL_GPU_TEXTUREFORMAT_D24_UNORM,
     SDL_GPU_TEXTUREFORMAT_D32_FLOAT,
     SDL_GPU_TEXTUREFORMAT_D24_UNORM_S8_UINT,
-    SDL_GPU_TEXTUREFORMAT_D32_FLOAT_S8_UINT
+    SDL_GPU_TEXTUREFORMAT_D32_FLOAT_S8_UINT,
+    /* Compressed ASTC Normalized Float Color Formats*/
+    SDL_GPU_TEXTUREFORMAT_ASTC_4x4_UNORM,
+    SDL_GPU_TEXTUREFORMAT_ASTC_5x4_UNORM,
+    SDL_GPU_TEXTUREFORMAT_ASTC_5x5_UNORM,
+    SDL_GPU_TEXTUREFORMAT_ASTC_6x5_UNORM,
+    SDL_GPU_TEXTUREFORMAT_ASTC_6x6_UNORM,
+    SDL_GPU_TEXTUREFORMAT_ASTC_8x5_UNORM,
+    SDL_GPU_TEXTUREFORMAT_ASTC_8x6_UNORM,
+    SDL_GPU_TEXTUREFORMAT_ASTC_8x8_UNORM,
+    SDL_GPU_TEXTUREFORMAT_ASTC_10x5_UNORM,
+    SDL_GPU_TEXTUREFORMAT_ASTC_10x6_UNORM,
+    SDL_GPU_TEXTUREFORMAT_ASTC_10x8_UNORM,
+    SDL_GPU_TEXTUREFORMAT_ASTC_10x10_UNORM,
+    SDL_GPU_TEXTUREFORMAT_ASTC_12x10_UNORM,
+    SDL_GPU_TEXTUREFORMAT_ASTC_12x12_UNORM,
+    /* Compressed SRGB ASTC Normalized Float Color Formats*/
+    SDL_GPU_TEXTUREFORMAT_ASTC_4x4_UNORM_SRGB,
+    SDL_GPU_TEXTUREFORMAT_ASTC_5x4_UNORM_SRGB,
+    SDL_GPU_TEXTUREFORMAT_ASTC_5x5_UNORM_SRGB,
+    SDL_GPU_TEXTUREFORMAT_ASTC_6x5_UNORM_SRGB,
+    SDL_GPU_TEXTUREFORMAT_ASTC_6x6_UNORM_SRGB,
+    SDL_GPU_TEXTUREFORMAT_ASTC_8x5_UNORM_SRGB,
+    SDL_GPU_TEXTUREFORMAT_ASTC_8x6_UNORM_SRGB,
+    SDL_GPU_TEXTUREFORMAT_ASTC_8x8_UNORM_SRGB,
+    SDL_GPU_TEXTUREFORMAT_ASTC_10x5_UNORM_SRGB,
+    SDL_GPU_TEXTUREFORMAT_ASTC_10x6_UNORM_SRGB,
+    SDL_GPU_TEXTUREFORMAT_ASTC_10x8_UNORM_SRGB,
+    SDL_GPU_TEXTUREFORMAT_ASTC_10x10_UNORM_SRGB,
+    SDL_GPU_TEXTUREFORMAT_ASTC_12x10_UNORM_SRGB,
+    SDL_GPU_TEXTUREFORMAT_ASTC_12x12_UNORM_SRGB,
+    /* Compressed ASTC Signed Float Color Formats*/
+    SDL_GPU_TEXTUREFORMAT_ASTC_4x4_FLOAT,
+    SDL_GPU_TEXTUREFORMAT_ASTC_5x4_FLOAT,
+    SDL_GPU_TEXTUREFORMAT_ASTC_5x5_FLOAT,
+    SDL_GPU_TEXTUREFORMAT_ASTC_6x5_FLOAT,
+    SDL_GPU_TEXTUREFORMAT_ASTC_6x6_FLOAT,
+    SDL_GPU_TEXTUREFORMAT_ASTC_8x5_FLOAT,
+    SDL_GPU_TEXTUREFORMAT_ASTC_8x6_FLOAT,
+    SDL_GPU_TEXTUREFORMAT_ASTC_8x8_FLOAT,
+    SDL_GPU_TEXTUREFORMAT_ASTC_10x5_FLOAT,
+    SDL_GPU_TEXTUREFORMAT_ASTC_10x6_FLOAT,
+    SDL_GPU_TEXTUREFORMAT_ASTC_10x8_FLOAT,
+    SDL_GPU_TEXTUREFORMAT_ASTC_10x10_FLOAT,
+    SDL_GPU_TEXTUREFORMAT_ASTC_12x10_FLOAT,
+    SDL_GPU_TEXTUREFORMAT_ASTC_12x12_FLOAT
 } SDL_GPUTextureFormat;
 
 /**
@@ -1904,26 +1947,26 @@ extern SDL_DECLSPEC SDL_GPUDevice *SDLCALL SDL_CreateGPUDevice(
  *
  * These are the supported properties:
  *
- * - `SDL_PROP_GPU_DEVICE_CREATE_DEBUGMODE_BOOL`: enable debug mode properties
- *   and validations, defaults to true.
- * - `SDL_PROP_GPU_DEVICE_CREATE_PREFERLOWPOWER_BOOL`: enable to prefer energy
- *   efficiency over maximum GPU performance, defaults to false.
+ * - `SDL_PROP_GPU_DEVICE_CREATE_DEBUGMODE_BOOLEAN`: enable debug mode
+ *   properties and validations, defaults to true.
+ * - `SDL_PROP_GPU_DEVICE_CREATE_PREFERLOWPOWER_BOOLEAN`: enable to prefer
+ *   energy efficiency over maximum GPU performance, defaults to false.
  * - `SDL_PROP_GPU_DEVICE_CREATE_NAME_STRING`: the name of the GPU driver to
  *   use, if a specific one is desired.
  *
  * These are the current shader format properties:
  *
- * - `SDL_PROP_GPU_DEVICE_CREATE_SHADERS_PRIVATE_BOOL`: The app is able to
+ * - `SDL_PROP_GPU_DEVICE_CREATE_SHADERS_PRIVATE_BOOLEAN`: The app is able to
  *   provide shaders for an NDA platform.
- * - `SDL_PROP_GPU_DEVICE_CREATE_SHADERS_SPIRV_BOOL`: The app is able to
+ * - `SDL_PROP_GPU_DEVICE_CREATE_SHADERS_SPIRV_BOOLEAN`: The app is able to
  *   provide SPIR-V shaders if applicable.
- * - `SDL_PROP_GPU_DEVICE_CREATE_SHADERS_DXBC_BOOL`: The app is able to
+ * - `SDL_PROP_GPU_DEVICE_CREATE_SHADERS_DXBC_BOOLEAN`: The app is able to
  *   provide DXBC shaders if applicable
- *   `SDL_PROP_GPU_DEVICE_CREATE_SHADERS_DXIL_BOOL`: The app is able to
+ *   `SDL_PROP_GPU_DEVICE_CREATE_SHADERS_DXIL_BOOLEAN`: The app is able to
  *   provide DXIL shaders if applicable.
- * - `SDL_PROP_GPU_DEVICE_CREATE_SHADERS_MSL_BOOL`: The app is able to provide
- *   MSL shaders if applicable.
- * - `SDL_PROP_GPU_DEVICE_CREATE_SHADERS_METALLIB_BOOL`: The app is able to
+ * - `SDL_PROP_GPU_DEVICE_CREATE_SHADERS_MSL_BOOLEAN`: The app is able to
+ *   provide MSL shaders if applicable.
+ * - `SDL_PROP_GPU_DEVICE_CREATE_SHADERS_METALLIB_BOOLEAN`: The app is able to
  *   provide Metal shader libraries if applicable.
  *
  * With the D3D12 renderer:
@@ -1945,15 +1988,15 @@ extern SDL_DECLSPEC SDL_GPUDevice *SDLCALL SDL_CreateGPUDevice(
 extern SDL_DECLSPEC SDL_GPUDevice *SDLCALL SDL_CreateGPUDeviceWithProperties(
     SDL_PropertiesID props);
 
-#define SDL_PROP_GPU_DEVICE_CREATE_DEBUGMODE_BOOL             "SDL.gpu.device.create.debugmode"
-#define SDL_PROP_GPU_DEVICE_CREATE_PREFERLOWPOWER_BOOL        "SDL.gpu.device.create.preferlowpower"
+#define SDL_PROP_GPU_DEVICE_CREATE_DEBUGMODE_BOOLEAN          "SDL.gpu.device.create.debugmode"
+#define SDL_PROP_GPU_DEVICE_CREATE_PREFERLOWPOWER_BOOLEAN     "SDL.gpu.device.create.preferlowpower"
 #define SDL_PROP_GPU_DEVICE_CREATE_NAME_STRING                "SDL.gpu.device.create.name"
-#define SDL_PROP_GPU_DEVICE_CREATE_SHADERS_PRIVATE_BOOL       "SDL.gpu.device.create.shaders.private"
-#define SDL_PROP_GPU_DEVICE_CREATE_SHADERS_SPIRV_BOOL         "SDL.gpu.device.create.shaders.spirv"
-#define SDL_PROP_GPU_DEVICE_CREATE_SHADERS_DXBC_BOOL          "SDL.gpu.device.create.shaders.dxbc"
-#define SDL_PROP_GPU_DEVICE_CREATE_SHADERS_DXIL_BOOL          "SDL.gpu.device.create.shaders.dxil"
-#define SDL_PROP_GPU_DEVICE_CREATE_SHADERS_MSL_BOOL           "SDL.gpu.device.create.shaders.msl"
-#define SDL_PROP_GPU_DEVICE_CREATE_SHADERS_METALLIB_BOOL      "SDL.gpu.device.create.shaders.metallib"
+#define SDL_PROP_GPU_DEVICE_CREATE_SHADERS_PRIVATE_BOOLEAN    "SDL.gpu.device.create.shaders.private"
+#define SDL_PROP_GPU_DEVICE_CREATE_SHADERS_SPIRV_BOOLEAN      "SDL.gpu.device.create.shaders.spirv"
+#define SDL_PROP_GPU_DEVICE_CREATE_SHADERS_DXBC_BOOLEAN       "SDL.gpu.device.create.shaders.dxbc"
+#define SDL_PROP_GPU_DEVICE_CREATE_SHADERS_DXIL_BOOLEAN       "SDL.gpu.device.create.shaders.dxil"
+#define SDL_PROP_GPU_DEVICE_CREATE_SHADERS_MSL_BOOLEAN        "SDL.gpu.device.create.shaders.msl"
+#define SDL_PROP_GPU_DEVICE_CREATE_SHADERS_METALLIB_BOOLEAN   "SDL.gpu.device.create.shaders.metallib"
 #define SDL_PROP_GPU_DEVICE_CREATE_D3D12_SEMANTIC_NAME_STRING "SDL.gpu.device.create.d3d12.semantic"
 
 /**
@@ -3670,6 +3713,23 @@ extern SDL_DECLSPEC bool SDLCALL SDL_GPUTextureSupportsSampleCount(
     SDL_GPUTextureFormat format,
     SDL_GPUSampleCount sample_count);
 
+/**
+ * Calculate the size in bytes of a texture format with dimensions.
+ *
+ * \param format a texture format.
+ * \param width width in pixels.
+ * \param height height in pixels.
+ * \param depth_or_layer_count depth for 3D textures or layer count otherwise.
+ * \returns the size of a texture with this format and dimensions.
+ *
+ * \since This function is available since SDL 3.1.4.
+ */
+extern SDL_DECLSPEC Uint32 SDLCALL SDL_CalculateGPUTextureFormatSize(
+    SDL_GPUTextureFormat format,
+    Uint32 width,
+    Uint32 height,
+    Uint32 depth_or_layer_count);
+
 #ifdef SDL_PLATFORM_GDK
 
 /**
diff --git a/libs/SDL3/include/SDL3/SDL_hints.h b/libs/SDL3/include/SDL3/SDL_hints.h
index 142130de5..0d585851c 100644
--- a/libs/SDL3/include/SDL3/SDL_hints.h
+++ b/libs/SDL3/include/SDL3/SDL_hints.h
@@ -1244,9 +1244,11 @@ extern "C" {
  *
  * The variable can be set to the following values:
  *
- * - "0": GameInput is not used. (default)
+ * - "0": GameInput is not used.
  * - "1": GameInput is used.
  *
+ * The default is "1" on GDK platforms, and "0" otherwise.
+ *
  * This hint should be set before SDL is initialized.
  *
  * \since This hint is available since SDL 3.0.0.
@@ -2299,9 +2301,9 @@ extern "C" {
  *
  * This hint needs to be set before SDL_Init().
  *
- * \since This hint is available since SDL 3.0.0.
+ * \since This hint is available since SDL 3.1.4.
  */
-#define SDL_HINT_MAC_SCROLL_MOMENTUM "SDL_HINT_MAC_SCROLL_MOMENTUM"
+#define SDL_HINT_MAC_SCROLL_MOMENTUM "SDL_MAC_SCROLL_MOMENTUM"
 
 /**
  * Request SDL_AppIterate() be called at a specific rate.
@@ -3129,6 +3131,29 @@ extern "C" {
  */
 #define SDL_HINT_VIDEO_ALLOW_SCREENSAVER "SDL_VIDEO_ALLOW_SCREENSAVER"
 
+/**
+ * A comma separated list containing the names of the displays that SDL should
+ * sort to the front of the display list.
+ *
+ * When this hint is set, displays with matching name strings will be
+ * prioritized in the list of displays, as exposed by calling
+ * SDL_GetDisplays(), with the first listed becoming the primary display. The
+ * naming convention can vary depending on the environment, but it is usually
+ * a connector name (e.g. 'DP-1', 'DP-2', 'HDMI-1', etc...).
+ *
+ * On X11 and Wayland desktops, the connector names associated with displays
+ * can typically be found by using the `xrandr` utility.
+ *
+ * This hint is currently supported on the following drivers:
+ *
+ * - Wayland (wayland)
+ *
+ * This hint should be set before SDL is initialized.
+ *
+ * \since This hint is available since SDL 3.1.5.
+ */
+#define SDL_HINT_VIDEO_DISPLAY_PRIORITY "SDL_VIDEO_DISPLAY_PRIORITY"
+
 /**
  * Tell the video driver that we only want a double buffer.
  *
diff --git a/libs/SDL3/include/SDL3/SDL_keyboard.h b/libs/SDL3/include/SDL3/SDL_keyboard.h
index f6ab13bb5..95a78cb5d 100644
--- a/libs/SDL3/include/SDL3/SDL_keyboard.h
+++ b/libs/SDL3/include/SDL3/SDL_keyboard.h
@@ -322,7 +322,9 @@ extern SDL_DECLSPEC SDL_Keycode SDLCALL SDL_GetKeyFromName(const char *name);
  *
  * Text input events are not received by default.
  *
- * On some platforms using this function shows the screen keyboard.
+ * On some platforms using this function shows the screen keyboard and/or
+ * activates an IME, which can prevent some key press events from being passed
+ * through.
  *
  * \param window the window to enable text input.
  * \returns true on success or false on failure; call SDL_GetError() for more
@@ -391,7 +393,9 @@ typedef enum SDL_Capitalization
  *
  * Text input events are not received by default.
  *
- * On some platforms using this function shows the screen keyboard.
+ * On some platforms using this function shows the screen keyboard and/or
+ * activates an IME, which can prevent some key press events from being passed
+ * through.
  *
  * These are the supported properties:
  *
diff --git a/libs/SDL3/include/SDL3/SDL_keycode.h b/libs/SDL3/include/SDL3/SDL_keycode.h
index 28e40a352..f4770279a 100644
--- a/libs/SDL3/include/SDL3/SDL_keycode.h
+++ b/libs/SDL3/include/SDL3/SDL_keycode.h
@@ -48,255 +48,255 @@ typedef Uint32 SDL_Keycode;
 
 #define SDLK_SCANCODE_MASK          (1u<<30)
 #define SDL_SCANCODE_TO_KEYCODE(X)  (X | SDLK_SCANCODE_MASK)
-#define SDLK_UNKNOWN                0x00000000u /* 0 */
-#define SDLK_RETURN                 0x0000000du /* '\r' */
-#define SDLK_ESCAPE                 0x0000001bu /* '\x1B' */
-#define SDLK_BACKSPACE              0x00000008u /* '\b' */
-#define SDLK_TAB                    0x00000009u /* '\t' */
-#define SDLK_SPACE                  0x00000020u /* ' ' */
-#define SDLK_EXCLAIM                0x00000021u /* '!' */
-#define SDLK_DBLAPOSTROPHE          0x00000022u /* '"' */
-#define SDLK_HASH                   0x00000023u /* '#' */
-#define SDLK_DOLLAR                 0x00000024u /* '$' */
-#define SDLK_PERCENT                0x00000025u /* '%' */
-#define SDLK_AMPERSAND              0x00000026u /* '&' */
-#define SDLK_APOSTROPHE             0x00000027u /* '\'' */
-#define SDLK_LEFTPAREN              0x00000028u /* '(' */
-#define SDLK_RIGHTPAREN             0x00000029u /* ')' */
-#define SDLK_ASTERISK               0x0000002au /* '*' */
-#define SDLK_PLUS                   0x0000002bu /* '+' */
-#define SDLK_COMMA                  0x0000002cu /* ',' */
-#define SDLK_MINUS                  0x0000002du /* '-' */
-#define SDLK_PERIOD                 0x0000002eu /* '.' */
-#define SDLK_SLASH                  0x0000002fu /* '/' */
-#define SDLK_0                      0x00000030u /* '0' */
-#define SDLK_1                      0x00000031u /* '1' */
-#define SDLK_2                      0x00000032u /* '2' */
-#define SDLK_3                      0x00000033u /* '3' */
-#define SDLK_4                      0x00000034u /* '4' */
-#define SDLK_5                      0x00000035u /* '5' */
-#define SDLK_6                      0x00000036u /* '6' */
-#define SDLK_7                      0x00000037u /* '7' */
-#define SDLK_8                      0x00000038u /* '8' */
-#define SDLK_9                      0x00000039u /* '9' */
-#define SDLK_COLON                  0x0000003au /* ':' */
-#define SDLK_SEMICOLON              0x0000003bu /* ';' */
-#define SDLK_LESS                   0x0000003cu /* '<' */
-#define SDLK_EQUALS                 0x0000003du /* '=' */
-#define SDLK_GREATER                0x0000003eu /* '>' */
-#define SDLK_QUESTION               0x0000003fu /* '?' */
-#define SDLK_AT                     0x00000040u /* '@' */
-#define SDLK_LEFTBRACKET            0x0000005bu /* '[' */
-#define SDLK_BACKSLASH              0x0000005cu /* '\\' */
-#define SDLK_RIGHTBRACKET           0x0000005du /* ']' */
-#define SDLK_CARET                  0x0000005eu /* '^' */
-#define SDLK_UNDERSCORE             0x0000005fu /* '_' */
-#define SDLK_GRAVE                  0x00000060u /* '`' */
-#define SDLK_A                      0x00000061u /* 'a' */
-#define SDLK_B                      0x00000062u /* 'b' */
-#define SDLK_C                      0x00000063u /* 'c' */
-#define SDLK_D                      0x00000064u /* 'd' */
-#define SDLK_E                      0x00000065u /* 'e' */
-#define SDLK_F                      0x00000066u /* 'f' */
-#define SDLK_G                      0x00000067u /* 'g' */
-#define SDLK_H                      0x00000068u /* 'h' */
-#define SDLK_I                      0x00000069u /* 'i' */
-#define SDLK_J                      0x0000006au /* 'j' */
-#define SDLK_K                      0x0000006bu /* 'k' */
-#define SDLK_L                      0x0000006cu /* 'l' */
-#define SDLK_M                      0x0000006du /* 'm' */
-#define SDLK_N                      0x0000006eu /* 'n' */
-#define SDLK_O                      0x0000006fu /* 'o' */
-#define SDLK_P                      0x00000070u /* 'p' */
-#define SDLK_Q                      0x00000071u /* 'q' */
-#define SDLK_R                      0x00000072u /* 'r' */
-#define SDLK_S                      0x00000073u /* 's' */
-#define SDLK_T                      0x00000074u /* 't' */
-#define SDLK_U                      0x00000075u /* 'u' */
-#define SDLK_V                      0x00000076u /* 'v' */
-#define SDLK_W                      0x00000077u /* 'w' */
-#define SDLK_X                      0x00000078u /* 'x' */
-#define SDLK_Y                      0x00000079u /* 'y' */
-#define SDLK_Z                      0x0000007au /* 'z' */
-#define SDLK_LEFTBRACE              0x0000007bu /* '{' */
-#define SDLK_PIPE                   0x0000007cu /* '|' */
-#define SDLK_RIGHTBRACE             0x0000007du /* '}' */
-#define SDLK_TILDE                  0x0000007eu /* '~' */
-#define SDLK_DELETE                 0x0000007fu /* '\x7F' */
-#define SDLK_PLUSMINUS              0x000000b1u /* '\xB1' */
-#define SDLK_CAPSLOCK               0x40000039u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CAPSLOCK) */
-#define SDLK_F1                     0x4000003au /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F1) */
-#define SDLK_F2                     0x4000003bu /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F2) */
-#define SDLK_F3                     0x4000003cu /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F3) */
-#define SDLK_F4                     0x4000003du /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F4) */
-#define SDLK_F5                     0x4000003eu /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F5) */
-#define SDLK_F6                     0x4000003fu /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F6) */
-#define SDLK_F7                     0x40000040u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F7) */
-#define SDLK_F8                     0x40000041u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F8) */
-#define SDLK_F9                     0x40000042u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F9) */
-#define SDLK_F10                    0x40000043u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F10) */
-#define SDLK_F11                    0x40000044u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F11) */
-#define SDLK_F12                    0x40000045u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F12) */
-#define SDLK_PRINTSCREEN            0x40000046u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PRINTSCREEN) */
-#define SDLK_SCROLLLOCK             0x40000047u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SCROLLLOCK) */
-#define SDLK_PAUSE                  0x40000048u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PAUSE) */
-#define SDLK_INSERT                 0x40000049u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_INSERT) */
-#define SDLK_HOME                   0x4000004au /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_HOME) */
-#define SDLK_PAGEUP                 0x4000004bu /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PAGEUP) */
-#define SDLK_END                    0x4000004du /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_END) */
-#define SDLK_PAGEDOWN               0x4000004eu /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PAGEDOWN) */
-#define SDLK_RIGHT                  0x4000004fu /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RIGHT) */
-#define SDLK_LEFT                   0x40000050u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LEFT) */
-#define SDLK_DOWN                   0x40000051u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_DOWN) */
-#define SDLK_UP                     0x40000052u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_UP) */
-#define SDLK_NUMLOCKCLEAR           0x40000053u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_NUMLOCKCLEAR) */
-#define SDLK_KP_DIVIDE              0x40000054u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_DIVIDE) */
-#define SDLK_KP_MULTIPLY            0x40000055u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MULTIPLY) */
-#define SDLK_KP_MINUS               0x40000056u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MINUS) */
-#define SDLK_KP_PLUS                0x40000057u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_PLUS) */
-#define SDLK_KP_ENTER               0x40000058u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_ENTER) */
-#define SDLK_KP_1                   0x40000059u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_1) */
-#define SDLK_KP_2                   0x4000005au /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_2) */
-#define SDLK_KP_3                   0x4000005bu /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_3) */
-#define SDLK_KP_4                   0x4000005cu /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_4) */
-#define SDLK_KP_5                   0x4000005du /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_5) */
-#define SDLK_KP_6                   0x4000005eu /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_6) */
-#define SDLK_KP_7                   0x4000005fu /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_7) */
-#define SDLK_KP_8                   0x40000060u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_8) */
-#define SDLK_KP_9                   0x40000061u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_9) */
-#define SDLK_KP_0                   0x40000062u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_0) */
-#define SDLK_KP_PERIOD              0x40000063u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_PERIOD) */
-#define SDLK_APPLICATION            0x40000065u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_APPLICATION) */
-#define SDLK_POWER                  0x40000066u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_POWER) */
-#define SDLK_KP_EQUALS              0x40000067u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_EQUALS) */
-#define SDLK_F13                    0x40000068u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F13) */
-#define SDLK_F14                    0x40000069u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F14) */
-#define SDLK_F15                    0x4000006au /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F15) */
-#define SDLK_F16                    0x4000006bu /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F16) */
-#define SDLK_F17                    0x4000006cu /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F17) */
-#define SDLK_F18                    0x4000006du /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F18) */
-#define SDLK_F19                    0x4000006eu /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F19) */
-#define SDLK_F20                    0x4000006fu /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F20) */
-#define SDLK_F21                    0x40000070u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F21) */
-#define SDLK_F22                    0x40000071u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F22) */
-#define SDLK_F23                    0x40000072u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F23) */
-#define SDLK_F24                    0x40000073u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F24) */
-#define SDLK_EXECUTE                0x40000074u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_EXECUTE) */
-#define SDLK_HELP                   0x40000075u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_HELP) */
-#define SDLK_MENU                   0x40000076u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MENU) */
-#define SDLK_SELECT                 0x40000077u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SELECT) */
-#define SDLK_STOP                   0x40000078u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_STOP) */
-#define SDLK_AGAIN                  0x40000079u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AGAIN) */
-#define SDLK_UNDO                   0x4000007au /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_UNDO) */
-#define SDLK_CUT                    0x4000007bu /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CUT) */
-#define SDLK_COPY                   0x4000007cu /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_COPY) */
-#define SDLK_PASTE                  0x4000007du /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PASTE) */
-#define SDLK_FIND                   0x4000007eu /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_FIND) */
-#define SDLK_MUTE                   0x4000007fu /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MUTE) */
-#define SDLK_VOLUMEUP               0x40000080u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_VOLUMEUP) */
-#define SDLK_VOLUMEDOWN             0x40000081u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_VOLUMEDOWN) */
-#define SDLK_KP_COMMA               0x40000085u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_COMMA) */
-#define SDLK_KP_EQUALSAS400         0x40000086u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_EQUALSAS400) */
-#define SDLK_ALTERASE               0x40000099u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_ALTERASE) */
-#define SDLK_SYSREQ                 0x4000009au /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SYSREQ) */
-#define SDLK_CANCEL                 0x4000009bu /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CANCEL) */
-#define SDLK_CLEAR                  0x4000009cu /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CLEAR) */
-#define SDLK_PRIOR                  0x4000009du /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PRIOR) */
-#define SDLK_RETURN2                0x4000009eu /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RETURN2) */
-#define SDLK_SEPARATOR              0x4000009fu /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SEPARATOR) */
-#define SDLK_OUT                    0x400000a0u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_OUT) */
-#define SDLK_OPER                   0x400000a1u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_OPER) */
-#define SDLK_CLEARAGAIN             0x400000a2u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CLEARAGAIN) */
-#define SDLK_CRSEL                  0x400000a3u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CRSEL) */
-#define SDLK_EXSEL                  0x400000a4u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_EXSEL) */
-#define SDLK_KP_00                  0x400000b0u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_00) */
-#define SDLK_KP_000                 0x400000b1u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_000) */
-#define SDLK_THOUSANDSSEPARATOR     0x400000b2u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_THOUSANDSSEPARATOR) */
-#define SDLK_DECIMALSEPARATOR       0x400000b3u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_DECIMALSEPARATOR) */
-#define SDLK_CURRENCYUNIT           0x400000b4u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CURRENCYUNIT) */
-#define SDLK_CURRENCYSUBUNIT        0x400000b5u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CURRENCYSUBUNIT) */
-#define SDLK_KP_LEFTPAREN           0x400000b6u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_LEFTPAREN) */
-#define SDLK_KP_RIGHTPAREN          0x400000b7u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_RIGHTPAREN) */
-#define SDLK_KP_LEFTBRACE           0x400000b8u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_LEFTBRACE) */
-#define SDLK_KP_RIGHTBRACE          0x400000b9u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_RIGHTBRACE) */
-#define SDLK_KP_TAB                 0x400000bau /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_TAB) */
-#define SDLK_KP_BACKSPACE           0x400000bbu /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_BACKSPACE) */
-#define SDLK_KP_A                   0x400000bcu /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_A) */
-#define SDLK_KP_B                   0x400000bdu /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_B) */
-#define SDLK_KP_C                   0x400000beu /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_C) */
-#define SDLK_KP_D                   0x400000bfu /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_D) */
-#define SDLK_KP_E                   0x400000c0u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_E) */
-#define SDLK_KP_F                   0x400000c1u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_F) */
-#define SDLK_KP_XOR                 0x400000c2u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_XOR) */
-#define SDLK_KP_POWER               0x400000c3u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_POWER) */
-#define SDLK_KP_PERCENT             0x400000c4u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_PERCENT) */
-#define SDLK_KP_LESS                0x400000c5u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_LESS) */
-#define SDLK_KP_GREATER             0x400000c6u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_GREATER) */
-#define SDLK_KP_AMPERSAND           0x400000c7u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_AMPERSAND) */
-#define SDLK_KP_DBLAMPERSAND        0x400000c8u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_DBLAMPERSAND) */
-#define SDLK_KP_VERTICALBAR         0x400000c9u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_VERTICALBAR) */
-#define SDLK_KP_DBLVERTICALBAR      0x400000cau /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_DBLVERTICALBAR) */
-#define SDLK_KP_COLON               0x400000cbu /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_COLON) */
-#define SDLK_KP_HASH                0x400000ccu /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_HASH) */
-#define SDLK_KP_SPACE               0x400000cdu /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_SPACE) */
-#define SDLK_KP_AT                  0x400000ceu /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_AT) */
-#define SDLK_KP_EXCLAM              0x400000cfu /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_EXCLAM) */
-#define SDLK_KP_MEMSTORE            0x400000d0u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMSTORE) */
-#define SDLK_KP_MEMRECALL           0x400000d1u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMRECALL) */
-#define SDLK_KP_MEMCLEAR            0x400000d2u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMCLEAR) */
-#define SDLK_KP_MEMADD              0x400000d3u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMADD) */
-#define SDLK_KP_MEMSUBTRACT         0x400000d4u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMSUBTRACT) */
-#define SDLK_KP_MEMMULTIPLY         0x400000d5u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMMULTIPLY) */
-#define SDLK_KP_MEMDIVIDE           0x400000d6u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMDIVIDE) */
-#define SDLK_KP_PLUSMINUS           0x400000d7u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_PLUSMINUS) */
-#define SDLK_KP_CLEAR               0x400000d8u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_CLEAR) */
-#define SDLK_KP_CLEARENTRY          0x400000d9u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_CLEARENTRY) */
-#define SDLK_KP_BINARY              0x400000dau /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_BINARY) */
-#define SDLK_KP_OCTAL               0x400000dbu /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_OCTAL) */
-#define SDLK_KP_DECIMAL             0x400000dcu /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_DECIMAL) */
-#define SDLK_KP_HEXADECIMAL         0x400000ddu /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_HEXADECIMAL) */
-#define SDLK_LCTRL                  0x400000e0u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LCTRL) */
-#define SDLK_LSHIFT                 0x400000e1u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LSHIFT) */
-#define SDLK_LALT                   0x400000e2u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LALT) */
-#define SDLK_LGUI                   0x400000e3u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LGUI) */
-#define SDLK_RCTRL                  0x400000e4u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RCTRL) */
-#define SDLK_RSHIFT                 0x400000e5u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RSHIFT) */
-#define SDLK_RALT                   0x400000e6u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RALT) */
-#define SDLK_RGUI                   0x400000e7u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RGUI) */
-#define SDLK_MODE                   0x40000101u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MODE) */
-#define SDLK_SLEEP                  0x40000102u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SLEEP) */
-#define SDLK_WAKE                   0x40000103u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_WAKE) */
-#define SDLK_CHANNEL_INCREMENT      0x40000104u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CHANNEL_INCREMENT) */
-#define SDLK_CHANNEL_DECREMENT      0x40000105u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CHANNEL_DECREMENT) */
-#define SDLK_MEDIA_PLAY             0x40000106u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MEDIA_PLAY) */
-#define SDLK_MEDIA_PAUSE            0x40000107u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MEDIA_PAUSE) */
-#define SDLK_MEDIA_RECORD           0x40000108u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MEDIA_RECORD) */
-#define SDLK_MEDIA_FAST_FORWARD     0x40000109u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MEDIA_FAST_FORWARD) */
-#define SDLK_MEDIA_REWIND           0x4000010au /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MEDIA_REWIND) */
-#define SDLK_MEDIA_NEXT_TRACK       0x4000010bu /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MEDIA_NEXT_TRACK) */
-#define SDLK_MEDIA_PREVIOUS_TRACK   0x4000010cu /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MEDIA_PREVIOUS_TRACK) */
-#define SDLK_MEDIA_STOP             0x4000010du /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MEDIA_STOP) */
-#define SDLK_MEDIA_EJECT            0x4000010eu /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MEDIA_EJECT) */
-#define SDLK_MEDIA_PLAY_PAUSE       0x4000010fu /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MEDIA_PLAY_PAUSE) */
-#define SDLK_MEDIA_SELECT           0x40000110u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MEDIA_SELECT) */
-#define SDLK_AC_NEW                 0x40000111u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_NEW) */
-#define SDLK_AC_OPEN                0x40000112u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_OPEN) */
-#define SDLK_AC_CLOSE               0x40000113u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_CLOSE) */
-#define SDLK_AC_EXIT                0x40000114u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_EXIT) */
-#define SDLK_AC_SAVE                0x40000115u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_SAVE) */
-#define SDLK_AC_PRINT               0x40000116u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_PRINT) */
-#define SDLK_AC_PROPERTIES          0x40000117u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_PROPERTIES) */
-#define SDLK_AC_SEARCH              0x40000118u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_SEARCH) */
-#define SDLK_AC_HOME                0x40000119u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_HOME) */
-#define SDLK_AC_BACK                0x4000011au /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_BACK) */
-#define SDLK_AC_FORWARD             0x4000011bu /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_FORWARD) */
-#define SDLK_AC_STOP                0x4000011cu /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_STOP) */
-#define SDLK_AC_REFRESH             0x4000011du /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_REFRESH) */
-#define SDLK_AC_BOOKMARKS           0x4000011eu /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_BOOKMARKS) */
-#define SDLK_SOFTLEFT               0x4000011fu /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SOFTLEFT) */
-#define SDLK_SOFTRIGHT              0x40000120u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SOFTRIGHT) */
-#define SDLK_CALL                   0x40000121u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CALL) */
-#define SDLK_ENDCALL                0x40000122u /* SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_ENDCALL) */
+#define SDLK_UNKNOWN                0x00000000u /**< 0 */
+#define SDLK_RETURN                 0x0000000du /**< '\r' */
+#define SDLK_ESCAPE                 0x0000001bu /**< '\x1B' */
+#define SDLK_BACKSPACE              0x00000008u /**< '\b' */
+#define SDLK_TAB                    0x00000009u /**< '\t' */
+#define SDLK_SPACE                  0x00000020u /**< ' ' */
+#define SDLK_EXCLAIM                0x00000021u /**< '!' */
+#define SDLK_DBLAPOSTROPHE          0x00000022u /**< '"' */
+#define SDLK_HASH                   0x00000023u /**< '#' */
+#define SDLK_DOLLAR                 0x00000024u /**< '$' */
+#define SDLK_PERCENT                0x00000025u /**< '%' */
+#define SDLK_AMPERSAND              0x00000026u /**< '&' */
+#define SDLK_APOSTROPHE             0x00000027u /**< '\'' */
+#define SDLK_LEFTPAREN              0x00000028u /**< '(' */
+#define SDLK_RIGHTPAREN             0x00000029u /**< ')' */
+#define SDLK_ASTERISK               0x0000002au /**< '*' */
+#define SDLK_PLUS                   0x0000002bu /**< '+' */
+#define SDLK_COMMA                  0x0000002cu /**< ',' */
+#define SDLK_MINUS                  0x0000002du /**< '-' */
+#define SDLK_PERIOD                 0x0000002eu /**< '.' */
+#define SDLK_SLASH                  0x0000002fu /**< '/' */
+#define SDLK_0                      0x00000030u /**< '0' */
+#define SDLK_1                      0x00000031u /**< '1' */
+#define SDLK_2                      0x00000032u /**< '2' */
+#define SDLK_3                      0x00000033u /**< '3' */
+#define SDLK_4                      0x00000034u /**< '4' */
+#define SDLK_5                      0x00000035u /**< '5' */
+#define SDLK_6                      0x00000036u /**< '6' */
+#define SDLK_7                      0x00000037u /**< '7' */
+#define SDLK_8                      0x00000038u /**< '8' */
+#define SDLK_9                      0x00000039u /**< '9' */
+#define SDLK_COLON                  0x0000003au /**< ':' */
+#define SDLK_SEMICOLON              0x0000003bu /**< ';' */
+#define SDLK_LESS                   0x0000003cu /**< '<' */
+#define SDLK_EQUALS                 0x0000003du /**< '=' */
+#define SDLK_GREATER                0x0000003eu /**< '>' */
+#define SDLK_QUESTION               0x0000003fu /**< '?' */
+#define SDLK_AT                     0x00000040u /**< '@' */
+#define SDLK_LEFTBRACKET            0x0000005bu /**< '[' */
+#define SDLK_BACKSLASH              0x0000005cu /**< '\\' */
+#define SDLK_RIGHTBRACKET           0x0000005du /**< ']' */
+#define SDLK_CARET                  0x0000005eu /**< '^' */
+#define SDLK_UNDERSCORE             0x0000005fu /**< '_' */
+#define SDLK_GRAVE                  0x00000060u /**< '`' */
+#define SDLK_A                      0x00000061u /**< 'a' */
+#define SDLK_B                      0x00000062u /**< 'b' */
+#define SDLK_C                      0x00000063u /**< 'c' */
+#define SDLK_D                      0x00000064u /**< 'd' */
+#define SDLK_E                      0x00000065u /**< 'e' */
+#define SDLK_F                      0x00000066u /**< 'f' */
+#define SDLK_G                      0x00000067u /**< 'g' */
+#define SDLK_H                      0x00000068u /**< 'h' */
+#define SDLK_I                      0x00000069u /**< 'i' */
+#define SDLK_J                      0x0000006au /**< 'j' */
+#define SDLK_K                      0x0000006bu /**< 'k' */
+#define SDLK_L                      0x0000006cu /**< 'l' */
+#define SDLK_M                      0x0000006du /**< 'm' */
+#define SDLK_N                      0x0000006eu /**< 'n' */
+#define SDLK_O                      0x0000006fu /**< 'o' */
+#define SDLK_P                      0x00000070u /**< 'p' */
+#define SDLK_Q                      0x00000071u /**< 'q' */
+#define SDLK_R                      0x00000072u /**< 'r' */
+#define SDLK_S                      0x00000073u /**< 's' */
+#define SDLK_T                      0x00000074u /**< 't' */
+#define SDLK_U                      0x00000075u /**< 'u' */
+#define SDLK_V                      0x00000076u /**< 'v' */
+#define SDLK_W                      0x00000077u /**< 'w' */
+#define SDLK_X                      0x00000078u /**< 'x' */
+#define SDLK_Y                      0x00000079u /**< 'y' */
+#define SDLK_Z                      0x0000007au /**< 'z' */
+#define SDLK_LEFTBRACE              0x0000007bu /**< '{' */
+#define SDLK_PIPE                   0x0000007cu /**< '|' */
+#define SDLK_RIGHTBRACE             0x0000007du /**< '}' */
+#define SDLK_TILDE                  0x0000007eu /**< '~' */
+#define SDLK_DELETE                 0x0000007fu /**< '\x7F' */
+#define SDLK_PLUSMINUS              0x000000b1u /**< '\xB1' */
+#define SDLK_CAPSLOCK               0x40000039u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CAPSLOCK) */
+#define SDLK_F1                     0x4000003au /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F1) */
+#define SDLK_F2                     0x4000003bu /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F2) */
+#define SDLK_F3                     0x4000003cu /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F3) */
+#define SDLK_F4                     0x4000003du /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F4) */
+#define SDLK_F5                     0x4000003eu /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F5) */
+#define SDLK_F6                     0x4000003fu /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F6) */
+#define SDLK_F7                     0x40000040u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F7) */
+#define SDLK_F8                     0x40000041u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F8) */
+#define SDLK_F9                     0x40000042u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F9) */
+#define SDLK_F10                    0x40000043u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F10) */
+#define SDLK_F11                    0x40000044u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F11) */
+#define SDLK_F12                    0x40000045u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F12) */
+#define SDLK_PRINTSCREEN            0x40000046u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PRINTSCREEN) */
+#define SDLK_SCROLLLOCK             0x40000047u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SCROLLLOCK) */
+#define SDLK_PAUSE                  0x40000048u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PAUSE) */
+#define SDLK_INSERT                 0x40000049u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_INSERT) */
+#define SDLK_HOME                   0x4000004au /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_HOME) */
+#define SDLK_PAGEUP                 0x4000004bu /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PAGEUP) */
+#define SDLK_END                    0x4000004du /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_END) */
+#define SDLK_PAGEDOWN               0x4000004eu /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PAGEDOWN) */
+#define SDLK_RIGHT                  0x4000004fu /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RIGHT) */
+#define SDLK_LEFT                   0x40000050u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LEFT) */
+#define SDLK_DOWN                   0x40000051u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_DOWN) */
+#define SDLK_UP                     0x40000052u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_UP) */
+#define SDLK_NUMLOCKCLEAR           0x40000053u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_NUMLOCKCLEAR) */
+#define SDLK_KP_DIVIDE              0x40000054u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_DIVIDE) */
+#define SDLK_KP_MULTIPLY            0x40000055u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MULTIPLY) */
+#define SDLK_KP_MINUS               0x40000056u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MINUS) */
+#define SDLK_KP_PLUS                0x40000057u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_PLUS) */
+#define SDLK_KP_ENTER               0x40000058u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_ENTER) */
+#define SDLK_KP_1                   0x40000059u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_1) */
+#define SDLK_KP_2                   0x4000005au /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_2) */
+#define SDLK_KP_3                   0x4000005bu /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_3) */
+#define SDLK_KP_4                   0x4000005cu /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_4) */
+#define SDLK_KP_5                   0x4000005du /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_5) */
+#define SDLK_KP_6                   0x4000005eu /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_6) */
+#define SDLK_KP_7                   0x4000005fu /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_7) */
+#define SDLK_KP_8                   0x40000060u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_8) */
+#define SDLK_KP_9                   0x40000061u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_9) */
+#define SDLK_KP_0                   0x40000062u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_0) */
+#define SDLK_KP_PERIOD              0x40000063u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_PERIOD) */
+#define SDLK_APPLICATION            0x40000065u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_APPLICATION) */
+#define SDLK_POWER                  0x40000066u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_POWER) */
+#define SDLK_KP_EQUALS              0x40000067u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_EQUALS) */
+#define SDLK_F13                    0x40000068u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F13) */
+#define SDLK_F14                    0x40000069u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F14) */
+#define SDLK_F15                    0x4000006au /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F15) */
+#define SDLK_F16                    0x4000006bu /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F16) */
+#define SDLK_F17                    0x4000006cu /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F17) */
+#define SDLK_F18                    0x4000006du /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F18) */
+#define SDLK_F19                    0x4000006eu /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F19) */
+#define SDLK_F20                    0x4000006fu /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F20) */
+#define SDLK_F21                    0x40000070u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F21) */
+#define SDLK_F22                    0x40000071u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F22) */
+#define SDLK_F23                    0x40000072u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F23) */
+#define SDLK_F24                    0x40000073u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F24) */
+#define SDLK_EXECUTE                0x40000074u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_EXECUTE) */
+#define SDLK_HELP                   0x40000075u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_HELP) */
+#define SDLK_MENU                   0x40000076u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MENU) */
+#define SDLK_SELECT                 0x40000077u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SELECT) */
+#define SDLK_STOP                   0x40000078u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_STOP) */
+#define SDLK_AGAIN                  0x40000079u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AGAIN) */
+#define SDLK_UNDO                   0x4000007au /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_UNDO) */
+#define SDLK_CUT                    0x4000007bu /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CUT) */
+#define SDLK_COPY                   0x4000007cu /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_COPY) */
+#define SDLK_PASTE                  0x4000007du /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PASTE) */
+#define SDLK_FIND                   0x4000007eu /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_FIND) */
+#define SDLK_MUTE                   0x4000007fu /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MUTE) */
+#define SDLK_VOLUMEUP               0x40000080u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_VOLUMEUP) */
+#define SDLK_VOLUMEDOWN             0x40000081u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_VOLUMEDOWN) */
+#define SDLK_KP_COMMA               0x40000085u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_COMMA) */
+#define SDLK_KP_EQUALSAS400         0x40000086u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_EQUALSAS400) */
+#define SDLK_ALTERASE               0x40000099u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_ALTERASE) */
+#define SDLK_SYSREQ                 0x4000009au /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SYSREQ) */
+#define SDLK_CANCEL                 0x4000009bu /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CANCEL) */
+#define SDLK_CLEAR                  0x4000009cu /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CLEAR) */
+#define SDLK_PRIOR                  0x4000009du /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PRIOR) */
+#define SDLK_RETURN2                0x4000009eu /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RETURN2) */
+#define SDLK_SEPARATOR              0x4000009fu /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SEPARATOR) */
+#define SDLK_OUT                    0x400000a0u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_OUT) */
+#define SDLK_OPER                   0x400000a1u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_OPER) */
+#define SDLK_CLEARAGAIN             0x400000a2u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CLEARAGAIN) */
+#define SDLK_CRSEL                  0x400000a3u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CRSEL) */
+#define SDLK_EXSEL                  0x400000a4u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_EXSEL) */
+#define SDLK_KP_00                  0x400000b0u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_00) */
+#define SDLK_KP_000                 0x400000b1u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_000) */
+#define SDLK_THOUSANDSSEPARATOR     0x400000b2u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_THOUSANDSSEPARATOR) */
+#define SDLK_DECIMALSEPARATOR       0x400000b3u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_DECIMALSEPARATOR) */
+#define SDLK_CURRENCYUNIT           0x400000b4u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CURRENCYUNIT) */
+#define SDLK_CURRENCYSUBUNIT        0x400000b5u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CURRENCYSUBUNIT) */
+#define SDLK_KP_LEFTPAREN           0x400000b6u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_LEFTPAREN) */
+#define SDLK_KP_RIGHTPAREN          0x400000b7u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_RIGHTPAREN) */
+#define SDLK_KP_LEFTBRACE           0x400000b8u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_LEFTBRACE) */
+#define SDLK_KP_RIGHTBRACE          0x400000b9u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_RIGHTBRACE) */
+#define SDLK_KP_TAB                 0x400000bau /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_TAB) */
+#define SDLK_KP_BACKSPACE           0x400000bbu /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_BACKSPACE) */
+#define SDLK_KP_A                   0x400000bcu /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_A) */
+#define SDLK_KP_B                   0x400000bdu /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_B) */
+#define SDLK_KP_C                   0x400000beu /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_C) */
+#define SDLK_KP_D                   0x400000bfu /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_D) */
+#define SDLK_KP_E                   0x400000c0u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_E) */
+#define SDLK_KP_F                   0x400000c1u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_F) */
+#define SDLK_KP_XOR                 0x400000c2u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_XOR) */
+#define SDLK_KP_POWER               0x400000c3u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_POWER) */
+#define SDLK_KP_PERCENT             0x400000c4u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_PERCENT) */
+#define SDLK_KP_LESS                0x400000c5u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_LESS) */
+#define SDLK_KP_GREATER             0x400000c6u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_GREATER) */
+#define SDLK_KP_AMPERSAND           0x400000c7u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_AMPERSAND) */
+#define SDLK_KP_DBLAMPERSAND        0x400000c8u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_DBLAMPERSAND) */
+#define SDLK_KP_VERTICALBAR         0x400000c9u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_VERTICALBAR) */
+#define SDLK_KP_DBLVERTICALBAR      0x400000cau /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_DBLVERTICALBAR) */
+#define SDLK_KP_COLON               0x400000cbu /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_COLON) */
+#define SDLK_KP_HASH                0x400000ccu /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_HASH) */
+#define SDLK_KP_SPACE               0x400000cdu /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_SPACE) */
+#define SDLK_KP_AT                  0x400000ceu /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_AT) */
+#define SDLK_KP_EXCLAM              0x400000cfu /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_EXCLAM) */
+#define SDLK_KP_MEMSTORE            0x400000d0u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMSTORE) */
+#define SDLK_KP_MEMRECALL           0x400000d1u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMRECALL) */
+#define SDLK_KP_MEMCLEAR            0x400000d2u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMCLEAR) */
+#define SDLK_KP_MEMADD              0x400000d3u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMADD) */
+#define SDLK_KP_MEMSUBTRACT         0x400000d4u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMSUBTRACT) */
+#define SDLK_KP_MEMMULTIPLY         0x400000d5u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMMULTIPLY) */
+#define SDLK_KP_MEMDIVIDE           0x400000d6u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMDIVIDE) */
+#define SDLK_KP_PLUSMINUS           0x400000d7u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_PLUSMINUS) */
+#define SDLK_KP_CLEAR               0x400000d8u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_CLEAR) */
+#define SDLK_KP_CLEARENTRY          0x400000d9u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_CLEARENTRY) */
+#define SDLK_KP_BINARY              0x400000dau /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_BINARY) */
+#define SDLK_KP_OCTAL               0x400000dbu /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_OCTAL) */
+#define SDLK_KP_DECIMAL             0x400000dcu /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_DECIMAL) */
+#define SDLK_KP_HEXADECIMAL         0x400000ddu /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_HEXADECIMAL) */
+#define SDLK_LCTRL                  0x400000e0u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LCTRL) */
+#define SDLK_LSHIFT                 0x400000e1u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LSHIFT) */
+#define SDLK_LALT                   0x400000e2u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LALT) */
+#define SDLK_LGUI                   0x400000e3u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LGUI) */
+#define SDLK_RCTRL                  0x400000e4u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RCTRL) */
+#define SDLK_RSHIFT                 0x400000e5u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RSHIFT) */
+#define SDLK_RALT                   0x400000e6u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RALT) */
+#define SDLK_RGUI                   0x400000e7u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RGUI) */
+#define SDLK_MODE                   0x40000101u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MODE) */
+#define SDLK_SLEEP                  0x40000102u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SLEEP) */
+#define SDLK_WAKE                   0x40000103u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_WAKE) */
+#define SDLK_CHANNEL_INCREMENT      0x40000104u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CHANNEL_INCREMENT) */
+#define SDLK_CHANNEL_DECREMENT      0x40000105u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CHANNEL_DECREMENT) */
+#define SDLK_MEDIA_PLAY             0x40000106u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MEDIA_PLAY) */
+#define SDLK_MEDIA_PAUSE            0x40000107u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MEDIA_PAUSE) */
+#define SDLK_MEDIA_RECORD           0x40000108u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MEDIA_RECORD) */
+#define SDLK_MEDIA_FAST_FORWARD     0x40000109u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MEDIA_FAST_FORWARD) */
+#define SDLK_MEDIA_REWIND           0x4000010au /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MEDIA_REWIND) */
+#define SDLK_MEDIA_NEXT_TRACK       0x4000010bu /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MEDIA_NEXT_TRACK) */
+#define SDLK_MEDIA_PREVIOUS_TRACK   0x4000010cu /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MEDIA_PREVIOUS_TRACK) */
+#define SDLK_MEDIA_STOP             0x4000010du /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MEDIA_STOP) */
+#define SDLK_MEDIA_EJECT            0x4000010eu /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MEDIA_EJECT) */
+#define SDLK_MEDIA_PLAY_PAUSE       0x4000010fu /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MEDIA_PLAY_PAUSE) */
+#define SDLK_MEDIA_SELECT           0x40000110u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MEDIA_SELECT) */
+#define SDLK_AC_NEW                 0x40000111u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_NEW) */
+#define SDLK_AC_OPEN                0x40000112u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_OPEN) */
+#define SDLK_AC_CLOSE               0x40000113u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_CLOSE) */
+#define SDLK_AC_EXIT                0x40000114u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_EXIT) */
+#define SDLK_AC_SAVE                0x40000115u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_SAVE) */
+#define SDLK_AC_PRINT               0x40000116u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_PRINT) */
+#define SDLK_AC_PROPERTIES          0x40000117u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_PROPERTIES) */
+#define SDLK_AC_SEARCH              0x40000118u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_SEARCH) */
+#define SDLK_AC_HOME                0x40000119u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_HOME) */
+#define SDLK_AC_BACK                0x4000011au /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_BACK) */
+#define SDLK_AC_FORWARD             0x4000011bu /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_FORWARD) */
+#define SDLK_AC_STOP                0x4000011cu /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_STOP) */
+#define SDLK_AC_REFRESH             0x4000011du /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_REFRESH) */
+#define SDLK_AC_BOOKMARKS           0x4000011eu /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_BOOKMARKS) */
+#define SDLK_SOFTLEFT               0x4000011fu /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SOFTLEFT) */
+#define SDLK_SOFTRIGHT              0x40000120u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SOFTRIGHT) */
+#define SDLK_CALL                   0x40000121u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CALL) */
+#define SDLK_ENDCALL                0x40000122u /**< SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_ENDCALL) */
 
 /**
  * Valid key modifiers (possibly OR'd together).
diff --git a/libs/SDL3/include/SDL3/SDL_log.h b/libs/SDL3/include/SDL3/SDL_log.h
index 8feb9e0af..b5db82cd5 100644
--- a/libs/SDL3/include/SDL3/SDL_log.h
+++ b/libs/SDL3/include/SDL3/SDL_log.h
@@ -473,6 +473,20 @@ extern SDL_DECLSPEC void SDLCALL SDL_LogMessageV(int category,
  */
 typedef void (SDLCALL *SDL_LogOutputFunction)(void *userdata, int category, SDL_LogPriority priority, const char *message);
 
+/**
+ * Get the default log output function.
+ *
+ * \returns the default log output callback.
+ *
+ * \threadsafety It is safe to call this function from any thread.
+ *
+ * \since This function is available since SDL 3.1.4.
+ *
+ * \sa SDL_SetLogOutputFunction
+ * \sa SDL_GetLogOutputFunction
+ */
+extern SDL_DECLSPEC SDL_LogOutputFunction SDLCALL SDL_GetDefaultLogOutputFunction(void);
+
 /**
  * Get the current log output function.
  *
@@ -485,6 +499,7 @@ typedef void (SDLCALL *SDL_LogOutputFunction)(void *userdata, int category, SDL_
  *
  * \since This function is available since SDL 3.0.0.
  *
+ * \sa SDL_GetDefaultLogOutputFunction
  * \sa SDL_SetLogOutputFunction
  */
 extern SDL_DECLSPEC void SDLCALL SDL_GetLogOutputFunction(SDL_LogOutputFunction *callback, void **userdata);
@@ -499,6 +514,7 @@ extern SDL_DECLSPEC void SDLCALL SDL_GetLogOutputFunction(SDL_LogOutputFunction
  *
  * \since This function is available since SDL 3.0.0.
  *
+ * \sa SDL_GetDefaultLogOutputFunction
  * \sa SDL_GetLogOutputFunction
  */
 extern SDL_DECLSPEC void SDLCALL SDL_SetLogOutputFunction(SDL_LogOutputFunction callback, void *userdata);
diff --git a/libs/SDL3/include/SDL3/SDL_main.h b/libs/SDL3/include/SDL3/SDL_main.h
index e173bd5c6..b3455ce3d 100644
--- a/libs/SDL3/include/SDL3/SDL_main.h
+++ b/libs/SDL3/include/SDL3/SDL_main.h
@@ -22,13 +22,22 @@
 /**
  * # CategoryMain
  *
- * Redefine main() on some platforms so that it is called by SDL.
+ * Redefine main() if necessary so that it is called by SDL.
  *
- * For details on how SDL_main works, and how to use it, please refer to:
+ * In order to make this consistent on all platforms, the application's main()
+ * should look like this:
  *
- * https://wiki.libsdl.org/SDL3/README/main-functions
+ * ```c
+ *  int main(int argc, char *argv[])
+ *  {
+ *  }
+ * ```
  *
- * (or docs/README-main-functions.md in the SDL source tree)
+ * SDL will take care of platform specific details on how it gets called.
+ *
+ * For more information, see:
+ *
+ * https://wiki.libsdl.org/SDL3/README/main-functions
  */
 
 #ifndef SDL_main_h_
@@ -40,7 +49,11 @@
 #include <SDL3/SDL_events.h>
 
 #ifndef SDL_MAIN_HANDLED
-    #ifdef SDL_PLATFORM_WIN32
+    #if defined(SDL_PLATFORM_PRIVATE_MAIN)
+        /* Private platforms may have their own ideas about entry points. */
+        #include "SDL_main_private.h"
+
+    #elif defined(SDL_PLATFORM_WIN32)
         /* On Windows SDL provides WinMain(), which parses the command line and passes
            the arguments to your main function.
 
@@ -77,8 +90,14 @@
          */
         #define SDL_MAIN_NEEDED
 
-        /* We need to export SDL_main so it can be launched from Java */
-        #define SDLMAIN_DECLSPEC    SDL_DECLSPEC
+        /* As this is launched from Java, the real entry point (main() function)
+           is outside of the the binary built from this code.
+           This define makes sure that, unlike on other platforms, SDL_main.h
+           and SDL_main_impl.h export an `SDL_main()` function (to be called
+           from Java), but don't implement a native `int main(int argc, char* argv[])`
+           or similar.
+         */
+        #define SDL_MAIN_EXPORTED
 
     #elif defined(SDL_PLATFORM_EMSCRIPTEN)
         /* On Emscripten, SDL provides a main function that converts URL
@@ -125,25 +144,14 @@
     #endif
 #endif /* SDL_MAIN_HANDLED */
 
-#ifndef SDLMAIN_DECLSPEC
+#ifdef SDL_MAIN_EXPORTED
+/* We need to export SDL_main so it can be launched from external code,
+   like SDLActivity.java on Android */
+#define SDLMAIN_DECLSPEC    SDL_DECLSPEC
+#else
+/* usually this is empty */
 #define SDLMAIN_DECLSPEC
-#endif
-
-/**
- *  \file SDL_main.h
- *
- *  The application's main() function must be called with C linkage,
- *  and should be declared like this:
- *
- *  ```c
- *  #ifdef __cplusplus
- *  extern "C"
- *  #endif
- *  int main(int argc, char *argv[])
- *  {
- *  }
- *  ```
- */
+#endif /* SDL_MAIN_EXPORTED */
 
 #ifdef SDL_WIKI_DOCUMENTATION_SECTION
 
@@ -234,6 +242,8 @@ extern "C" {
  * SDL_APP_SUCCESS, SDL calls SDL_AppQuit and terminates with an exit code
  * that reports success to the platform.
  *
+ * This function is called by SDL on the main thread.
+ *
  * \param appstate a place where the app can optionally store a pointer for
  *                 future use.
  * \param argc the standard ANSI C main's argc; number of elements in `argv`.
@@ -242,8 +252,6 @@ extern "C" {
  * \returns SDL_APP_FAILURE to terminate with an error, SDL_APP_SUCCESS to
  *          terminate with success, SDL_APP_CONTINUE to continue.
  *
- * \threadsafety This function is not thread safe.
- *
  * \since This function is available since SDL 3.0.0.
  *
  * \sa SDL_AppIterate
@@ -287,11 +295,14 @@ extern SDLMAIN_DECLSPEC SDL_AppResult SDLCALL SDL_AppInit(void **appstate, int a
  * SDL_AppQuit and terminates with an exit code that reports success to the
  * platform.
  *
+ * This function is called by SDL on the main thread.
+ *
  * \param appstate an optional pointer, provided by the app in SDL_AppInit.
  * \returns SDL_APP_FAILURE to terminate with an error, SDL_APP_SUCCESS to
  *          terminate with success, SDL_APP_CONTINUE to continue.
  *
- * \threadsafety This function is not thread safe.
+ * \threadsafety This function may get called concurrently with SDL_AppEvent()
+ *               for events not pushed on the main thread.
  *
  * \since This function is available since SDL 3.0.0.
  *
@@ -306,15 +317,15 @@ extern SDLMAIN_DECLSPEC SDL_AppResult SDLCALL SDL_AppIterate(void *appstate);
  * Apps implement this function when using SDL_MAIN_USE_CALLBACKS. If using a
  * standard "main" function, you should not supply this.
  *
- * This function is called as needed by SDL after SDL_AppInit returns 0; It is
- * called once for each new event.
+ * This function is called as needed by SDL after SDL_AppInit returns
+ * SDL_APP_CONTINUE. It is called once for each new event.
  *
  * There is (currently) no guarantee about what thread this will be called
  * from; whatever thread pushes an event onto SDL's queue will trigger this
  * function. SDL is responsible for pumping the event queue between each call
  * to SDL_AppIterate, so in normal operation one should only get events in a
  * serial fashion, but be careful if you have a thread that explicitly calls
- * SDL_PushEvent.
+ * SDL_PushEvent. SDL itself will push events to the queue on the main thread.
  *
  * Events sent to this function are not owned by the app; if you need to save
  * the data, you should copy it.
@@ -338,7 +349,9 @@ extern SDLMAIN_DECLSPEC SDL_AppResult SDLCALL SDL_AppIterate(void *appstate);
  * \returns SDL_APP_FAILURE to terminate with an error, SDL_APP_SUCCESS to
  *          terminate with success, SDL_APP_CONTINUE to continue.
  *
- * \threadsafety This function is not thread safe.
+ * \threadsafety This function may get called concurrently with
+ *               SDL_AppIterate() or SDL_AppQuit() for events not pushed from
+ *               the main thread.
  *
  * \since This function is available since SDL 3.0.0.
  *
@@ -371,10 +384,13 @@ extern SDLMAIN_DECLSPEC SDL_AppResult SDLCALL SDL_AppEvent(void *appstate, SDL_E
  * function call is the last time this pointer will be provided, so any
  * resources to it should be cleaned up here.
  *
+ * This function is called by SDL on the main thread.
+ *
  * \param appstate an optional pointer, provided by the app in SDL_AppInit.
  * \param result the result code that terminated the app (success or failure).
  *
- * \threadsafety This function is not thread safe.
+ * \threadsafety SDL_AppEvent() may get called concurrently with this function
+ *               if other threads that push events are still active.
  *
  * \since This function is available since SDL 3.0.0.
  *
@@ -570,29 +586,10 @@ extern SDL_DECLSPEC void SDLCALL SDL_GDKSuspendComplete(void);
 
 #if !defined(SDL_MAIN_HANDLED) && !defined(SDL_MAIN_NOIMPL)
     /* include header-only SDL_main implementations */
-    #if defined(SDL_MAIN_USE_CALLBACKS) \
-        || defined(SDL_PLATFORM_WINDOWS) || defined(SDL_PLATFORM_IOS) || defined(SDL_PLATFORM_TVOS) \
-        || defined(SDL_PLATFORM_3DS) || defined(SDL_PLATFORM_NGAGE) || defined(SDL_PLATFORM_PS2) || defined(SDL_PLATFORM_PSP) \
-        || defined(SDL_PLATFORM_EMSCRIPTEN)
-
+    #if defined(SDL_MAIN_USE_CALLBACKS) || defined(SDL_MAIN_NEEDED) || defined(SDL_MAIN_AVAILABLE)
         /* platforms which main (-equivalent) can be implemented in plain C */
         #include <SDL3/SDL_main_impl.h>
-
-    #elif 0  /* C++ platforms (currently none, this used to be here for WinRT, but is left for future platforms that might arrive. */
-        #ifdef __cplusplus
-        #include <SDL3/SDL_main_impl.h>
-        #else
-            /* Note: to get rid of the following warning, you can #define SDL_MAIN_NOIMPL before including SDL_main.h
-             *  in your C sourcefile that contains the standard main. Do *not* use SDL_MAIN_HANDLED for that, then SDL_main won't find your main()!
-             */
-            #ifdef _MSC_VER
-                #pragma message("Note: Your platform needs the SDL_main implementation in a C++ source file. You can keep your main() in plain C (then continue including SDL_main.h there!) and create a fresh .cpp file that only contains #include <SDL3/SDL_main.h>")
-            #elif defined(__GNUC__) /* gcc, clang, mingw and compatible are matched by this and have #warning */
-                #warning "Note: Your platform needs the SDL_main implementation in a C++ source file. You can keep your main() in plain C and create a fresh .cpp file that only contains #include <SDL3/SDL_main.h>"
-            #endif /* __GNUC__ */
-        #endif /* __cplusplus */
-
-    #endif /* C++ platforms */
+    #endif
 #endif
 
 #endif /* SDL_main_h_ */
diff --git a/libs/SDL3/include/SDL3/SDL_main_impl.h b/libs/SDL3/include/SDL3/SDL_main_impl.h
index feca572bc..e5560e388 100644
--- a/libs/SDL3/include/SDL3/SDL_main_impl.h
+++ b/libs/SDL3/include/SDL3/SDL_main_impl.h
@@ -29,7 +29,7 @@
 #endif
 
 /* if someone wants to include SDL_main.h but doesn't want the main handing magic,
-   (maybe to call SDL_RegisterApp()) they can #define SDL_MAIN_HANDLED first
+   (maybe to call SDL_RegisterApp()) they can #define SDL_MAIN_HANDLED first.
    SDL_MAIN_NOIMPL is for SDL-internal usage (only affects implementation,
    not definition of SDL_MAIN_AVAILABLE etc in SDL_main.h) and if the user wants
    to have the SDL_main implementation (from this header) in another source file
@@ -64,10 +64,15 @@
     #endif  /* SDL_MAIN_USE_CALLBACKS */
 
 
-    /* set up the usual SDL_main stuff if we're not using callbacks or if we are but need the normal entry point. */
-    #if !defined(SDL_MAIN_USE_CALLBACKS) || defined(SDL_MAIN_CALLBACK_STANDARD)
+    /* set up the usual SDL_main stuff if we're not using callbacks or if we are but need the normal entry point,
+       unless the real entry point needs to be somewhere else entirely, like Android where it's in Java code */
+    #if (!defined(SDL_MAIN_USE_CALLBACKS) || defined(SDL_MAIN_CALLBACK_STANDARD)) && !defined(SDL_MAIN_EXPORTED)
 
-        #if defined(SDL_PLATFORM_WINDOWS)
+        #if defined(SDL_PLATFORM_PRIVATE_MAIN)
+            /* Private platforms may have their own ideas about entry points. */
+            #include "SDL_main_impl_private.h"
+
+        #elif defined(SDL_PLATFORM_WINDOWS)
 
             /* these defines/typedefs are needed for the WinMain() definition */
             #ifndef WINAPI
@@ -82,7 +87,7 @@
             #if defined(_MSC_VER) && !defined(SDL_PLATFORM_GDK)
 
                 /* This is where execution begins [console apps] */
-                #if defined( UNICODE ) && UNICODE
+                #if defined(UNICODE) && UNICODE
                     int wmain(int argc, wchar_t *wargv[], wchar_t *wenvp)
                     {
                         (void)argc;
@@ -107,7 +112,7 @@
             extern "C" {
             #endif
 
-            #if defined( UNICODE ) && UNICODE
+            #if defined(UNICODE) && UNICODE
             int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrev, PWSTR szCmdLine, int sw)
             #else /* ANSI */
             int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR szCmdLine, int sw)
diff --git a/libs/SDL3/include/SDL3/SDL_oldnames.h b/libs/SDL3/include/SDL3/SDL_oldnames.h
index c99dd958a..af7941686 100644
--- a/libs/SDL3/include/SDL3/SDL_oldnames.h
+++ b/libs/SDL3/include/SDL3/SDL_oldnames.h
@@ -176,7 +176,7 @@
 #define SDL_CONTROLLER_AXIS_INVALID SDL_GAMEPAD_AXIS_INVALID
 #define SDL_CONTROLLER_AXIS_LEFTX SDL_GAMEPAD_AXIS_LEFTX
 #define SDL_CONTROLLER_AXIS_LEFTY SDL_GAMEPAD_AXIS_LEFTY
-#define SDL_CONTROLLER_AXIS_MAX SDL_GAMEPAD_AXIS_MAX
+#define SDL_CONTROLLER_AXIS_MAX SDL_GAMEPAD_AXIS_COUNT
 #define SDL_CONTROLLER_AXIS_RIGHTX SDL_GAMEPAD_AXIS_RIGHTX
 #define SDL_CONTROLLER_AXIS_RIGHTY SDL_GAMEPAD_AXIS_RIGHTY
 #define SDL_CONTROLLER_AXIS_TRIGGERLEFT SDL_GAMEPAD_AXIS_LEFT_TRIGGER
@@ -196,7 +196,7 @@
 #define SDL_CONTROLLER_BUTTON_INVALID SDL_GAMEPAD_BUTTON_INVALID
 #define SDL_CONTROLLER_BUTTON_LEFTSHOULDER SDL_GAMEPAD_BUTTON_LEFT_SHOULDER
 #define SDL_CONTROLLER_BUTTON_LEFTSTICK SDL_GAMEPAD_BUTTON_LEFT_STICK
-#define SDL_CONTROLLER_BUTTON_MAX SDL_GAMEPAD_BUTTON_MAX
+#define SDL_CONTROLLER_BUTTON_MAX SDL_GAMEPAD_BUTTON_COUNT
 #define SDL_CONTROLLER_BUTTON_MISC1 SDL_GAMEPAD_BUTTON_MISC1
 #define SDL_CONTROLLER_BUTTON_PADDLE1 SDL_GAMEPAD_BUTTON_RIGHT_PADDLE1
 #define SDL_CONTROLLER_BUTTON_PADDLE2 SDL_GAMEPAD_BUTTON_LEFT_PADDLE1
@@ -813,7 +813,7 @@
 #define SDL_CONTROLLER_AXIS_INVALID SDL_CONTROLLER_AXIS_INVALID_renamed_SDL_GAMEPAD_AXIS_INVALID
 #define SDL_CONTROLLER_AXIS_LEFTX SDL_CONTROLLER_AXIS_LEFTX_renamed_SDL_GAMEPAD_AXIS_LEFTX
 #define SDL_CONTROLLER_AXIS_LEFTY SDL_CONTROLLER_AXIS_LEFTY_renamed_SDL_GAMEPAD_AXIS_LEFTY
-#define SDL_CONTROLLER_AXIS_MAX SDL_CONTROLLER_AXIS_MAX_renamed_SDL_GAMEPAD_AXIS_MAX
+#define SDL_CONTROLLER_AXIS_MAX SDL_CONTROLLER_AXIS_MAX_renamed_SDL_GAMEPAD_AXIS_COUNT
 #define SDL_CONTROLLER_AXIS_RIGHTX SDL_CONTROLLER_AXIS_RIGHTX_renamed_SDL_GAMEPAD_AXIS_RIGHTX
 #define SDL_CONTROLLER_AXIS_RIGHTY SDL_CONTROLLER_AXIS_RIGHTY_renamed_SDL_GAMEPAD_AXIS_RIGHTY
 #define SDL_CONTROLLER_AXIS_TRIGGERLEFT SDL_CONTROLLER_AXIS_TRIGGERLEFT_renamed_SDL_GAMEPAD_AXIS_LEFT_TRIGGER
@@ -833,7 +833,7 @@
 #define SDL_CONTROLLER_BUTTON_INVALID SDL_CONTROLLER_BUTTON_INVALID_renamed_SDL_GAMEPAD_BUTTON_INVALID
 #define SDL_CONTROLLER_BUTTON_LEFTSHOULDER SDL_CONTROLLER_BUTTON_LEFTSHOULDER_renamed_SDL_GAMEPAD_BUTTON_LEFT_SHOULDER
 #define SDL_CONTROLLER_BUTTON_LEFTSTICK SDL_CONTROLLER_BUTTON_LEFTSTICK_renamed_SDL_GAMEPAD_BUTTON_LEFT_STICK
-#define SDL_CONTROLLER_BUTTON_MAX SDL_CONTROLLER_BUTTON_MAX_renamed_SDL_GAMEPAD_BUTTON_MAX
+#define SDL_CONTROLLER_BUTTON_MAX SDL_CONTROLLER_BUTTON_MAX_renamed_SDL_GAMEPAD_BUTTON_COUNT
 #define SDL_CONTROLLER_BUTTON_MISC1 SDL_CONTROLLER_BUTTON_MISC1_renamed_SDL_GAMEPAD_BUTTON_MISC1
 #define SDL_CONTROLLER_BUTTON_PADDLE1 SDL_CONTROLLER_BUTTON_PADDLE1_renamed_SDL_GAMEPAD_BUTTON_RIGHT_PADDLE1
 #define SDL_CONTROLLER_BUTTON_PADDLE2 SDL_CONTROLLER_BUTTON_PADDLE2_renamed_SDL_GAMEPAD_BUTTON_LEFT_PADDLE1
diff --git a/libs/SDL3/include/SDL3/SDL_opengl.h b/libs/SDL3/include/SDL3/SDL_opengl.h
index 6bdcbe008..1292f4256 100644
--- a/libs/SDL3/include/SDL3/SDL_opengl.h
+++ b/libs/SDL3/include/SDL3/SDL_opengl.h
@@ -783,6 +783,7 @@ typedef double		GLclampd;	/* double precision float in [0,1] */
  * Miscellaneous
  */
 
+#ifndef SDL_OPENGL_1_NO_PROTOTYPES
 GLAPI void GLAPIENTRY glClearIndex( GLfloat c );
 
 GLAPI void GLAPIENTRY glClearColor( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha );
@@ -1480,6 +1481,706 @@ GLAPI void GLAPIENTRY glPushName( GLuint name );
 
 GLAPI void GLAPIENTRY glPopName( void );
 
+#endif
+#ifdef SDL_OPENGL_1_FUNCTION_TYPEDEFS
+
+typedef void (APIENTRYP PFNGLCLEARINDEXPROC) ( GLfloat c );
+
+typedef void (APIENTRYP PFNGLCLEARCOLORPROC) ( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha );
+
+typedef void (APIENTRYP PFNGLCLEARPROC) ( GLbitfield mask );
+
+typedef void (APIENTRYP PFNGLINDEXMASKPROC) ( GLuint mask );
+
+typedef void (APIENTRYP PFNGLCOLORMASKPROC) ( GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha );
+
+typedef void (APIENTRYP PFNGLALPHAFUNCPROC) ( GLenum func, GLclampf ref );
+
+typedef void (APIENTRYP PFNGLBLENDFUNCPROC) ( GLenum sfactor, GLenum dfactor );
+
+typedef void (APIENTRYP PFNGLLOGICOPPROC) ( GLenum opcode );
+
+typedef void (APIENTRYP PFNGLCULLFACEPROC) ( GLenum mode );
+
+typedef void (APIENTRYP PFNGLFRONTFACEPROC) ( GLenum mode );
+
+typedef void (APIENTRYP PFNGLPOINTSIZEPROC) ( GLfloat size );
+
+typedef void (APIENTRYP PFNGLLINEWIDTHPROC) ( GLfloat width );
+
+typedef void (APIENTRYP PFNGLLINESTIPPLEPROC) ( GLint factor, GLushort pattern );
+
+typedef void (APIENTRYP PFNGLPOLYGONMODEPROC) ( GLenum face, GLenum mode );
+
+typedef void (APIENTRYP PFNGLPOLYGONOFFSETPROC) ( GLfloat factor, GLfloat units );
+
+typedef void (APIENTRYP PFNGLPOLYGONSTIPPLEPROC) ( const GLubyte *mask );
+
+typedef void (APIENTRYP PFNGLGETPOLYGONSTIPPLEPROC) ( GLubyte *mask );
+
+typedef void (APIENTRYP PFNGLEDGEFLAGPROC) ( GLboolean flag );
+
+typedef void (APIENTRYP PFNGLEDGEFLAGVPROC) ( const GLboolean *flag );
+
+typedef void (APIENTRYP PFNGLSCISSORPROC) ( GLint x, GLint y, GLsizei width, GLsizei height);
+
+typedef void (APIENTRYP PFNGLCLIPPLANEPROC) ( GLenum plane, const GLdouble *equation );
+
+typedef void (APIENTRYP PFNGLGETCLIPPLANEPROC) ( GLenum plane, GLdouble *equation );
+
+typedef void (APIENTRYP PFNGLDRAWBUFFERPROC) ( GLenum mode );
+
+typedef void (APIENTRYP PFNGLREADBUFFERPROC) ( GLenum mode );
+
+typedef void (APIENTRYP PFNGLENABLEPROC) ( GLenum cap );
+
+typedef void (APIENTRYP PFNGLDISABLEPROC) ( GLenum cap );
+
+typedef GLboolean (APIENTRYP PFNGLISENABLEDPROC) ( GLenum cap );
+
+
+typedef void (APIENTRYP PFNGLENABLECLIENTSTATEPROC) ( GLenum cap );  /* 1.1 */
+
+typedef void (APIENTRYP PFNGLDISABLECLIENTSTATEPROC) ( GLenum cap );  /* 1.1 */
+
+
+typedef void (APIENTRYP PFNGLGETBOOLEANVPROC) ( GLenum pname, GLboolean *params );
+
+typedef void (APIENTRYP PFNGLGETDOUBLEVPROC) ( GLenum pname, GLdouble *params );
+
+typedef void (APIENTRYP PFNGLGETFLOATVPROC) ( GLenum pname, GLfloat *params );
+
+typedef void (APIENTRYP PFNGLGETINTEGERVPROC) ( GLenum pname, GLint *params );
+
+
+typedef void (APIENTRYP PFNGLPUSHATTRIBPROC) ( GLbitfield mask );
+
+typedef void (APIENTRYP PFNGLPOPATTRIBPROC) ( void );
+
+
+typedef void (APIENTRYP PFNGLPUSHCLIENTATTRIBPROC) ( GLbitfield mask );  /* 1.1 */
+
+typedef void (APIENTRYP PFNGLPOPCLIENTATTRIBPROC) ( void );  /* 1.1 */
+
+
+typedef GLint (APIENTRYP PFNGLRENDERMODEPROC) ( GLenum mode );
+
+typedef GLenum (APIENTRYP PFNGLGETERRORPROC) ( void );
+
+typedef const GLubyte * (APIENTRYP PFNGLGETSTRINGPROC) ( GLenum name );
+
+typedef void (APIENTRYP PFNGLFINISHPROC) ( void );
+
+typedef void (APIENTRYP PFNGLFLUSHPROC) ( void );
+
+typedef void (APIENTRYP PFNGLHINTPROC) ( GLenum target, GLenum mode );
+
+
+/*
+ * Depth Buffer
+ */
+
+typedef void (APIENTRYP PFNGLCLEARDEPTHPROC) ( GLclampd depth );
+
+typedef void (APIENTRYP PFNGLDEPTHFUNCPROC) ( GLenum func );
+
+typedef void (APIENTRYP PFNGLDEPTHMASKPROC) ( GLboolean flag );
+
+typedef void (APIENTRYP PFNGLDEPTHRANGEPROC) ( GLclampd near_val, GLclampd far_val );
+
+
+/*
+ * Accumulation Buffer
+ */
+
+typedef void (APIENTRYP PFNGLCLEARACCUMPROC) ( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha );
+
+typedef void (APIENTRYP PFNGLACCUMPROC) ( GLenum op, GLfloat value );
+
+
+/*
+ * Transformation
+ */
+
+typedef void (APIENTRYP PFNGLMATRIXMODEPROC) ( GLenum mode );
+
+typedef void (APIENTRYP PFNGLORTHOPROC) ( GLdouble left, GLdouble right,
+                                 GLdouble bottom, GLdouble top,
+                                 GLdouble near_val, GLdouble far_val );
+
+typedef void (APIENTRYP PFNGLFRUSTUMPROC) ( GLdouble left, GLdouble right,
+                                   GLdouble bottom, GLdouble top,
+                                   GLdouble near_val, GLdouble far_val );
+
+typedef void (APIENTRYP PFNGLVIEWPORTPROC) ( GLint x, GLint y,
+                                    GLsizei width, GLsizei height );
+
+typedef void (APIENTRYP PFNGLPUSHMATRIXPROC) ( void );
+
+typedef void (APIENTRYP PFNGLPOPMATRIXPROC) ( void );
+
+typedef void (APIENTRYP PFNGLLOADIDENTITYPROC) ( void );
+
+typedef void (APIENTRYP PFNGLLOADMATRIXDPROC) ( const GLdouble *m );
+typedef void (APIENTRYP PFNGLLOADMATRIXFPROC) ( const GLfloat *m );
+
+typedef void (APIENTRYP PFNGLMULTMATRIXDPROC) ( const GLdouble *m );
+typedef void (APIENTRYP PFNGLMULTMATRIXFPROC) ( const GLfloat *m );
+
+typedef void (APIENTRYP PFNGLROTATEDPROC) ( GLdouble angle,
+                                   GLdouble x, GLdouble y, GLdouble z );
+typedef void (APIENTRYP PFNGLROTATEFPROC) ( GLfloat angle,
+                                   GLfloat x, GLfloat y, GLfloat z );
+
+typedef void (APIENTRYP PFNGLSCALEDPROC) ( GLdouble x, GLdouble y, GLdouble z );
+typedef void (APIENTRYP PFNGLSCALEFPROC) ( GLfloat x, GLfloat y, GLfloat z );
+
+typedef void (APIENTRYP PFNGLTRANSLATEDPROC) ( GLdouble x, GLdouble y, GLdouble z );
+typedef void (APIENTRYP PFNGLTRANSLATEFPROC) ( GLfloat x, GLfloat y, GLfloat z );
+
+
+/*
+ * Display Lists
+ */
+
+typedef GLboolean (APIENTRYP PFNGLISLISTPROC) ( GLuint list );
+
+typedef void (APIENTRYP PFNGLDELETELISTSPROC) ( GLuint list, GLsizei range );
+
+typedef GLuint (APIENTRYP PFNGLGENLISTSPROC) ( GLsizei range );
+
+typedef void (APIENTRYP PFNGLNEWLISTPROC) ( GLuint list, GLenum mode );
+
+typedef void (APIENTRYP PFNGLENDLISTPROC) ( void );
+
+typedef void (APIENTRYP PFNGLCALLLISTPROC) ( GLuint list );
+
+typedef void (APIENTRYP PFNGLCALLLISTSPROC) ( GLsizei n, GLenum type,
+                                     const GLvoid *lists );
+
+typedef void (APIENTRYP PFNGLLISTBASEPROC) ( GLuint base );
+
+
+/*
+ * Drawing Functions
+ */
+
+typedef void (APIENTRYP PFNGLBEGINPROC) ( GLenum mode );
+
+typedef void (APIENTRYP PFNGLENDPROC) ( void );
+
+
+typedef void (APIENTRYP PFNGLVERTEX2DPROC) ( GLdouble x, GLdouble y );
+typedef void (APIENTRYP PFNGLVERTEX2FPROC) ( GLfloat x, GLfloat y );
+typedef void (APIENTRYP PFNGLVERTEX2IPROC) ( GLint x, GLint y );
+typedef void (APIENTRYP PFNGLVERTEX2SPROC) ( GLshort x, GLshort y );
+
+typedef void (APIENTRYP PFNGLVERTEX3DPROC) ( GLdouble x, GLdouble y, GLdouble z );
+typedef void (APIENTRYP PFNGLVERTEX3FPROC) ( GLfloat x, GLfloat y, GLfloat z );
+typedef void (APIENTRYP PFNGLVERTEX3IPROC) ( GLint x, GLint y, GLint z );
+typedef void (APIENTRYP PFNGLVERTEX3SPROC) ( GLshort x, GLshort y, GLshort z );
+
+typedef void (APIENTRYP PFNGLVERTEX4DPROC) ( GLdouble x, GLdouble y, GLdouble z, GLdouble w );
+typedef void (APIENTRYP PFNGLVERTEX4FPROC) ( GLfloat x, GLfloat y, GLfloat z, GLfloat w );
+typedef void (APIENTRYP PFNGLVERTEX4IPROC) ( GLint x, GLint y, GLint z, GLint w );
+typedef void (APIENTRYP PFNGLVERTEX4SPROC) ( GLshort x, GLshort y, GLshort z, GLshort w );
+
+typedef void (APIENTRYP PFNGLVERTEX2DVPROC) ( const GLdouble *v );
+typedef void (APIENTRYP PFNGLVERTEX2FVPROC) ( const GLfloat *v );
+typedef void (APIENTRYP PFNGLVERTEX2IVPROC) ( const GLint *v );
+typedef void (APIENTRYP PFNGLVERTEX2SVPROC) ( const GLshort *v );
+
+typedef void (APIENTRYP PFNGLVERTEX3DVPROC) ( const GLdouble *v );
+typedef void (APIENTRYP PFNGLVERTEX3FVPROC) ( const GLfloat *v );
+typedef void (APIENTRYP PFNGLVERTEX3IVPROC) ( const GLint *v );
+typedef void (APIENTRYP PFNGLVERTEX3SVPROC) ( const GLshort *v );
+
+typedef void (APIENTRYP PFNGLVERTEX4DVPROC) ( const GLdouble *v );
+typedef void (APIENTRYP PFNGLVERTEX4FVPROC) ( const GLfloat *v );
+typedef void (APIENTRYP PFNGLVERTEX4IVPROC) ( const GLint *v );
+typedef void (APIENTRYP PFNGLVERTEX4SVPROC) ( const GLshort *v );
+
+
+typedef void (APIENTRYP PFNGLNORMAL3BPROC) ( GLbyte nx, GLbyte ny, GLbyte nz );
+typedef void (APIENTRYP PFNGLNORMAL3DPROC) ( GLdouble nx, GLdouble ny, GLdouble nz );
+typedef void (APIENTRYP PFNGLNORMAL3FPROC) ( GLfloat nx, GLfloat ny, GLfloat nz );
+typedef void (APIENTRYP PFNGLNORMAL3IPROC) ( GLint nx, GLint ny, GLint nz );
+typedef void (APIENTRYP PFNGLNORMAL3SPROC) ( GLshort nx, GLshort ny, GLshort nz );
+
+typedef void (APIENTRYP PFNGLNORMAL3BVPROC) ( const GLbyte *v );
+typedef void (APIENTRYP PFNGLNORMAL3DVPROC) ( const GLdouble *v );
+typedef void (APIENTRYP PFNGLNORMAL3FVPROC) ( const GLfloat *v );
+typedef void (APIENTRYP PFNGLNORMAL3IVPROC) ( const GLint *v );
+typedef void (APIENTRYP PFNGLNORMAL3SVPROC) ( const GLshort *v );
+
+
+typedef void (APIENTRYP PFNGLINDEXDPROC) ( GLdouble c );
+typedef void (APIENTRYP PFNGLINDEXFPROC) ( GLfloat c );
+typedef void (APIENTRYP PFNGLINDEXIPROC) ( GLint c );
+typedef void (APIENTRYP PFNGLINDEXSPROC) ( GLshort c );
+typedef void (APIENTRYP PFNGLINDEXUBPROC) ( GLubyte c );  /* 1.1 */
+
+typedef void (APIENTRYP PFNGLINDEXDVPROC) ( const GLdouble *c );
+typedef void (APIENTRYP PFNGLINDEXFVPROC) ( const GLfloat *c );
+typedef void (APIENTRYP PFNGLINDEXIVPROC) ( const GLint *c );
+typedef void (APIENTRYP PFNGLINDEXSVPROC) ( const GLshort *c );
+typedef void (APIENTRYP PFNGLINDEXUBVPROC) ( const GLubyte *c );  /* 1.1 */
+
+typedef void (APIENTRYP PFNGLCOLOR3BPROC) ( GLbyte red, GLbyte green, GLbyte blue );
+typedef void (APIENTRYP PFNGLCOLOR3DPROC) ( GLdouble red, GLdouble green, GLdouble blue );
+typedef void (APIENTRYP PFNGLCOLOR3FPROC) ( GLfloat red, GLfloat green, GLfloat blue );
+typedef void (APIENTRYP PFNGLCOLOR3IPROC) ( GLint red, GLint green, GLint blue );
+typedef void (APIENTRYP PFNGLCOLOR3SPROC) ( GLshort red, GLshort green, GLshort blue );
+typedef void (APIENTRYP PFNGLCOLOR3UBPROC) ( GLubyte red, GLubyte green, GLubyte blue );
+typedef void (APIENTRYP PFNGLCOLOR3UIPROC) ( GLuint red, GLuint green, GLuint blue );
+typedef void (APIENTRYP PFNGLCOLOR3USPROC) ( GLushort red, GLushort green, GLushort blue );
+
+typedef void (APIENTRYP PFNGLCOLOR4BPROC) ( GLbyte red, GLbyte green,
+                                   GLbyte blue, GLbyte alpha );
+typedef void (APIENTRYP PFNGLCOLOR4DPROC) ( GLdouble red, GLdouble green,
+                                   GLdouble blue, GLdouble alpha );
+typedef void (APIENTRYP PFNGLCOLOR4FPROC) ( GLfloat red, GLfloat green,
+                                   GLfloat blue, GLfloat alpha );
+typedef void (APIENTRYP PFNGLCOLOR4IPROC) ( GLint red, GLint green,
+                                   GLint blue, GLint alpha );
+typedef void (APIENTRYP PFNGLCOLOR4SPROC) ( GLshort red, GLshort green,
+                                   GLshort blue, GLshort alpha );
+typedef void (APIENTRYP PFNGLCOLOR4UBPROC) ( GLubyte red, GLubyte green,
+                                    GLubyte blue, GLubyte alpha );
+typedef void (APIENTRYP PFNGLCOLOR4UIPROC) ( GLuint red, GLuint green,
+                                    GLuint blue, GLuint alpha );
+typedef void (APIENTRYP PFNGLCOLOR4USPROC) ( GLushort red, GLushort green,
+                                    GLushort blue, GLushort alpha );
+
+
+typedef void (APIENTRYP PFNGLCOLOR3BVPROC) ( const GLbyte *v );
+typedef void (APIENTRYP PFNGLCOLOR3DVPROC) ( const GLdouble *v );
+typedef void (APIENTRYP PFNGLCOLOR3FVPROC) ( const GLfloat *v );
+typedef void (APIENTRYP PFNGLCOLOR3IVPROC) ( const GLint *v );
+typedef void (APIENTRYP PFNGLCOLOR3SVPROC) ( const GLshort *v );
+typedef void (APIENTRYP PFNGLCOLOR3UBVPROC) ( const GLubyte *v );
+typedef void (APIENTRYP PFNGLCOLOR3UIVPROC) ( const GLuint *v );
+typedef void (APIENTRYP PFNGLCOLOR3USVPROC) ( const GLushort *v );
+
+typedef void (APIENTRYP PFNGLCOLOR4BVPROC) ( const GLbyte *v );
+typedef void (APIENTRYP PFNGLCOLOR4DVPROC) ( const GLdouble *v );
+typedef void (APIENTRYP PFNGLCOLOR4FVPROC) ( const GLfloat *v );
+typedef void (APIENTRYP PFNGLCOLOR4IVPROC) ( const GLint *v );
+typedef void (APIENTRYP PFNGLCOLOR4SVPROC) ( const GLshort *v );
+typedef void (APIENTRYP PFNGLCOLOR4UBVPROC) ( const GLubyte *v );
+typedef void (APIENTRYP PFNGLCOLOR4UIVPROC) ( const GLuint *v );
+typedef void (APIENTRYP PFNGLCOLOR4USVPROC) ( const GLushort *v );
+
+
+typedef void (APIENTRYP PFNGLTEXCOORD1DPROC) ( GLdouble s );
+typedef void (APIENTRYP PFNGLTEXCOORD1FPROC) ( GLfloat s );
+typedef void (APIENTRYP PFNGLTEXCOORD1IPROC) ( GLint s );
+typedef void (APIENTRYP PFNGLTEXCOORD1SPROC) ( GLshort s );
+
+typedef void (APIENTRYP PFNGLTEXCOORD2DPROC) ( GLdouble s, GLdouble t );
+typedef void (APIENTRYP PFNGLTEXCOORD2FPROC) ( GLfloat s, GLfloat t );
+typedef void (APIENTRYP PFNGLTEXCOORD2IPROC) ( GLint s, GLint t );
+typedef void (APIENTRYP PFNGLTEXCOORD2SPROC) ( GLshort s, GLshort t );
+
+typedef void (APIENTRYP PFNGLTEXCOORD3DPROC) ( GLdouble s, GLdouble t, GLdouble r );
+typedef void (APIENTRYP PFNGLTEXCOORD3FPROC) ( GLfloat s, GLfloat t, GLfloat r );
+typedef void (APIENTRYP PFNGLTEXCOORD3IPROC) ( GLint s, GLint t, GLint r );
+typedef void (APIENTRYP PFNGLTEXCOORD3SPROC) ( GLshort s, GLshort t, GLshort r );
+
+typedef void (APIENTRYP PFNGLTEXCOORD4DPROC) ( GLdouble s, GLdouble t, GLdouble r, GLdouble q );
+typedef void (APIENTRYP PFNGLTEXCOORD4FPROC) ( GLfloat s, GLfloat t, GLfloat r, GLfloat q );
+typedef void (APIENTRYP PFNGLTEXCOORD4IPROC) ( GLint s, GLint t, GLint r, GLint q );
+typedef void (APIENTRYP PFNGLTEXCOORD4SPROC) ( GLshort s, GLshort t, GLshort r, GLshort q );
+
+typedef void (APIENTRYP PFNGLTEXCOORD1DVPROC) ( const GLdouble *v );
+typedef void (APIENTRYP PFNGLTEXCOORD1FVPROC) ( const GLfloat *v );
+typedef void (APIENTRYP PFNGLTEXCOORD1IVPROC) ( const GLint *v );
+typedef void (APIENTRYP PFNGLTEXCOORD1SVPROC) ( const GLshort *v );
+
+typedef void (APIENTRYP PFNGLTEXCOORD2DVPROC) ( const GLdouble *v );
+typedef void (APIENTRYP PFNGLTEXCOORD2FVPROC) ( const GLfloat *v );
+typedef void (APIENTRYP PFNGLTEXCOORD2IVPROC) ( const GLint *v );
+typedef void (APIENTRYP PFNGLTEXCOORD2SVPROC) ( const GLshort *v );
+
+typedef void (APIENTRYP PFNGLTEXCOORD3DVPROC) ( const GLdouble *v );
+typedef void (APIENTRYP PFNGLTEXCOORD3FVPROC) ( const GLfloat *v );
+typedef void (APIENTRYP PFNGLTEXCOORD3IVPROC) ( const GLint *v );
+typedef void (APIENTRYP PFNGLTEXCOORD3SVPROC) ( const GLshort *v );
+
+typedef void (APIENTRYP PFNGLTEXCOORD4DVPROC) ( const GLdouble *v );
+typedef void (APIENTRYP PFNGLTEXCOORD4FVPROC) ( const GLfloat *v );
+typedef void (APIENTRYP PFNGLTEXCOORD4IVPROC) ( const GLint *v );
+typedef void (APIENTRYP PFNGLTEXCOORD4SVPROC) ( const GLshort *v );
+
+
+typedef void (APIENTRYP PFNGLRASTERPOS2DPROC) ( GLdouble x, GLdouble y );
+typedef void (APIENTRYP PFNGLRASTERPOS2FPROC) ( GLfloat x, GLfloat y );
+typedef void (APIENTRYP PFNGLRASTERPOS2IPROC) ( GLint x, GLint y );
+typedef void (APIENTRYP PFNGLRASTERPOS2SPROC) ( GLshort x, GLshort y );
+
+typedef void (APIENTRYP PFNGLRASTERPOS3DPROC) ( GLdouble x, GLdouble y, GLdouble z );
+typedef void (APIENTRYP PFNGLRASTERPOS3FPROC) ( GLfloat x, GLfloat y, GLfloat z );
+typedef void (APIENTRYP PFNGLRASTERPOS3IPROC) ( GLint x, GLint y, GLint z );
+typedef void (APIENTRYP PFNGLRASTERPOS3SPROC) ( GLshort x, GLshort y, GLshort z );
+
+typedef void (APIENTRYP PFNGLRASTERPOS4DPROC) ( GLdouble x, GLdouble y, GLdouble z, GLdouble w );
+typedef void (APIENTRYP PFNGLRASTERPOS4FPROC) ( GLfloat x, GLfloat y, GLfloat z, GLfloat w );
+typedef void (APIENTRYP PFNGLRASTERPOS4IPROC) ( GLint x, GLint y, GLint z, GLint w );
+typedef void (APIENTRYP PFNGLRASTERPOS4SPROC) ( GLshort x, GLshort y, GLshort z, GLshort w );
+
+typedef void (APIENTRYP PFNGLRASTERPOS2DVPROC) ( const GLdouble *v );
+typedef void (APIENTRYP PFNGLRASTERPOS2FVPROC) ( const GLfloat *v );
+typedef void (APIENTRYP PFNGLRASTERPOS2IVPROC) ( const GLint *v );
+typedef void (APIENTRYP PFNGLRASTERPOS2SVPROC) ( const GLshort *v );
+
+typedef void (APIENTRYP PFNGLRASTERPOS3DVPROC) ( const GLdouble *v );
+typedef void (APIENTRYP PFNGLRASTERPOS3FVPROC) ( const GLfloat *v );
+typedef void (APIENTRYP PFNGLRASTERPOS3IVPROC) ( const GLint *v );
+typedef void (APIENTRYP PFNGLRASTERPOS3SVPROC) ( const GLshort *v );
+
+typedef void (APIENTRYP PFNGLRASTERPOS4DVPROC) ( const GLdouble *v );
+typedef void (APIENTRYP PFNGLRASTERPOS4FVPROC) ( const GLfloat *v );
+typedef void (APIENTRYP PFNGLRASTERPOS4IVPROC) ( const GLint *v );
+typedef void (APIENTRYP PFNGLRASTERPOS4SVPROC) ( const GLshort *v );
+
+
+typedef void (APIENTRYP PFNGLRECTDPROC) ( GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2 );
+typedef void (APIENTRYP PFNGLRECTFPROC) ( GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2 );
+typedef void (APIENTRYP PFNGLRECTIPROC) ( GLint x1, GLint y1, GLint x2, GLint y2 );
+typedef void (APIENTRYP PFNGLRECTSPROC) ( GLshort x1, GLshort y1, GLshort x2, GLshort y2 );
+
+
+typedef void (APIENTRYP PFNGLRECTDVPROC) ( const GLdouble *v1, const GLdouble *v2 );
+typedef void (APIENTRYP PFNGLRECTFVPROC) ( const GLfloat *v1, const GLfloat *v2 );
+typedef void (APIENTRYP PFNGLRECTIVPROC) ( const GLint *v1, const GLint *v2 );
+typedef void (APIENTRYP PFNGLRECTSVPROC) ( const GLshort *v1, const GLshort *v2 );
+
+
+/*
+ * Vertex Arrays  (1.1)
+ */
+
+typedef void (APIENTRYP PFNGLVERTEXPOINTERPROC) ( GLint size, GLenum type,
+                                       GLsizei stride, const GLvoid *ptr );
+
+typedef void (APIENTRYP PFNGLNORMALPOINTERPROC) ( GLenum type, GLsizei stride,
+                                       const GLvoid *ptr );
+
+typedef void (APIENTRYP PFNGLCOLORPOINTERPROC) ( GLint size, GLenum type,
+                                      GLsizei stride, const GLvoid *ptr );
+
+typedef void (APIENTRYP PFNGLINDEXPOINTERPROC) ( GLenum type, GLsizei stride,
+                                      const GLvoid *ptr );
+
+typedef void (APIENTRYP PFNGLTEXCOORDPOINTERPROC) ( GLint size, GLenum type,
+                                         GLsizei stride, const GLvoid *ptr );
+
+typedef void (APIENTRYP PFNGLEDGEFLAGPOINTERPROC) ( GLsizei stride, const GLvoid *ptr );
+
+typedef void (APIENTRYP PFNGLGETPOINTERVPROC) ( GLenum pname, GLvoid **params );
+
+typedef void (APIENTRYP PFNGLARRAYELEMENTPROC) ( GLint i );
+
+typedef void (APIENTRYP PFNGLDRAWARRAYSPROC) ( GLenum mode, GLint first, GLsizei count );
+
+typedef void (APIENTRYP PFNGLDRAWELEMENTSPROC) ( GLenum mode, GLsizei count,
+                                      GLenum type, const GLvoid *indices );
+
+typedef void (APIENTRYP PFNGLINTERLEAVEDARRAYSPROC) ( GLenum format, GLsizei stride,
+                                           const GLvoid *pointer );
+
+/*
+ * Lighting
+ */
+
+typedef void (APIENTRYP PFNGLSHADEMODELPROC) ( GLenum mode );
+
+typedef void (APIENTRYP PFNGLLIGHTFPROC) ( GLenum light, GLenum pname, GLfloat param );
+typedef void (APIENTRYP PFNGLLIGHTIPROC) ( GLenum light, GLenum pname, GLint param );
+typedef void (APIENTRYP PFNGLLIGHTFVPROC) ( GLenum light, GLenum pname,
+                                 const GLfloat *params );
+typedef void (APIENTRYP PFNGLLIGHTIVPROC) ( GLenum light, GLenum pname,
+                                 const GLint *params );
+
+typedef void (APIENTRYP PFNGLGETLIGHTFVPROC) ( GLenum light, GLenum pname,
+                                    GLfloat *params );
+typedef void (APIENTRYP PFNGLGETLIGHTIVPROC) ( GLenum light, GLenum pname,
+                                    GLint *params );
+
+typedef void (APIENTRYP PFNGLLIGHTMODELFPROC) ( GLenum pname, GLfloat param );
+typedef void (APIENTRYP PFNGLLIGHTMODELIPROC) ( GLenum pname, GLint param );
+typedef void (APIENTRYP PFNGLLIGHTMODELFVPROC) ( GLenum pname, const GLfloat *params );
+typedef void (APIENTRYP PFNGLLIGHTMODELIVPROC) ( GLenum pname, const GLint *params );
+
+typedef void (APIENTRYP PFNGLMATERIALFPROC) ( GLenum face, GLenum pname, GLfloat param );
+typedef void (APIENTRYP PFNGLMATERIALIPROC) ( GLenum face, GLenum pname, GLint param );
+typedef void (APIENTRYP PFNGLMATERIALFVPROC) ( GLenum face, GLenum pname, const GLfloat *params );
+typedef void (APIENTRYP PFNGLMATERIALIVPROC) ( GLenum face, GLenum pname, const GLint *params );
+
+typedef void (APIENTRYP PFNGLGETMATERIALFVPROC) ( GLenum face, GLenum pname, GLfloat *params );
+typedef void (APIENTRYP PFNGLGETMATERIALIVPROC) ( GLenum face, GLenum pname, GLint *params );
+
+typedef void (APIENTRYP PFNGLCOLORMATERIALPROC) ( GLenum face, GLenum mode );
+
+
+/*
+ * Raster functions
+ */
+
+typedef void (APIENTRYP PFNGLPIXELZOOMPROC) ( GLfloat xfactor, GLfloat yfactor );
+
+typedef void (APIENTRYP PFNGLPIXELSTOREFPROC) ( GLenum pname, GLfloat param );
+typedef void (APIENTRYP PFNGLPIXELSTOREIPROC) ( GLenum pname, GLint param );
+
+typedef void (APIENTRYP PFNGLPIXELTRANSFERFPROC) ( GLenum pname, GLfloat param );
+typedef void (APIENTRYP PFNGLPIXELTRANSFERIPROC) ( GLenum pname, GLint param );
+
+typedef void (APIENTRYP PFNGLPIXELMAPFVPROC) ( GLenum map, GLsizei mapsize,
+                                    const GLfloat *values );
+typedef void (APIENTRYP PFNGLPIXELMAPUIVPROC) ( GLenum map, GLsizei mapsize,
+                                     const GLuint *values );
+typedef void (APIENTRYP PFNGLPIXELMAPUSVPROC) ( GLenum map, GLsizei mapsize,
+                                     const GLushort *values );
+
+typedef void (APIENTRYP PFNGLGETPIXELMAPFVPROC) ( GLenum map, GLfloat *values );
+typedef void (APIENTRYP PFNGLGETPIXELMAPUIVPROC) ( GLenum map, GLuint *values );
+typedef void (APIENTRYP PFNGLGETPIXELMAPUSVPROC) ( GLenum map, GLushort *values );
+
+typedef void (APIENTRYP PFNGLBITMAPPROC) ( GLsizei width, GLsizei height,
+                                GLfloat xorig, GLfloat yorig,
+                                GLfloat xmove, GLfloat ymove,
+                                const GLubyte *bitmap );
+
+typedef void (APIENTRYP PFNGLREADPIXELSPROC) ( GLint x, GLint y,
+                                    GLsizei width, GLsizei height,
+                                    GLenum format, GLenum type,
+                                    GLvoid *pixels );
+
+typedef void (APIENTRYP PFNGLDRAWPIXELSPROC) ( GLsizei width, GLsizei height,
+                                    GLenum format, GLenum type,
+                                    const GLvoid *pixels );
+
+typedef void (APIENTRYP PFNGLCOPYPIXELSPROC) ( GLint x, GLint y,
+                                    GLsizei width, GLsizei height,
+                                    GLenum type );
+
+/*
+ * Stenciling
+ */
+
+typedef void (APIENTRYP PFNGLSTENCILFUNCPROC) ( GLenum func, GLint ref, GLuint mask );
+
+typedef void (APIENTRYP PFNGLSTENCILMASKPROC) ( GLuint mask );
+
+typedef void (APIENTRYP PFNGLSTENCILOPPROC) ( GLenum fail, GLenum zfail, GLenum zpass );
+
+typedef void (APIENTRYP PFNGLCLEARSTENCILPROC) ( GLint s );
+
+
+
+/*
+ * Texture mapping
+ */
+
+typedef void (APIENTRYP PFNGLTEXGENDPROC) ( GLenum coord, GLenum pname, GLdouble param );
+typedef void (APIENTRYP PFNGLTEXGENFPROC) ( GLenum coord, GLenum pname, GLfloat param );
+typedef void (APIENTRYP PFNGLTEXGENIPROC) ( GLenum coord, GLenum pname, GLint param );
+
+typedef void (APIENTRYP PFNGLTEXGENDVPROC) ( GLenum coord, GLenum pname, const GLdouble *params );
+typedef void (APIENTRYP PFNGLTEXGENFVPROC) ( GLenum coord, GLenum pname, const GLfloat *params );
+typedef void (APIENTRYP PFNGLTEXGENIVPROC) ( GLenum coord, GLenum pname, const GLint *params );
+
+typedef void (APIENTRYP PFNGLGETTEXGENDVPROC) ( GLenum coord, GLenum pname, GLdouble *params );
+typedef void (APIENTRYP PFNGLGETTEXGENFVPROC) ( GLenum coord, GLenum pname, GLfloat *params );
+typedef void (APIENTRYP PFNGLGETTEXGENIVPROC) ( GLenum coord, GLenum pname, GLint *params );
+
+
+typedef void (APIENTRYP PFNGLTEXENVFPROC) ( GLenum target, GLenum pname, GLfloat param );
+typedef void (APIENTRYP PFNGLTEXENVIPROC) ( GLenum target, GLenum pname, GLint param );
+
+typedef void (APIENTRYP PFNGLTEXENVFVPROC) ( GLenum target, GLenum pname, const GLfloat *params );
+typedef void (APIENTRYP PFNGLTEXENVIVPROC) ( GLenum target, GLenum pname, const GLint *params );
+
+typedef void (APIENTRYP PFNGLGETTEXENVFVPROC) ( GLenum target, GLenum pname, GLfloat *params );
+typedef void (APIENTRYP PFNGLGETTEXENVIVPROC) ( GLenum target, GLenum pname, GLint *params );
+
+
+typedef void (APIENTRYP PFNGLTEXPARAMETERFPROC) ( GLenum target, GLenum pname, GLfloat param );
+typedef void (APIENTRYP PFNGLTEXPARAMETERIPROC) ( GLenum target, GLenum pname, GLint param );
+
+typedef void (APIENTRYP PFNGLTEXPARAMETERFVPROC) ( GLenum target, GLenum pname,
+                                          const GLfloat *params );
+typedef void (APIENTRYP PFNGLTEXPARAMETERIVPROC) ( GLenum target, GLenum pname,
+                                          const GLint *params );
+
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERFVPROC) ( GLenum target,
+                                           GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERIVPROC) ( GLenum target,
+                                           GLenum pname, GLint *params );
+
+typedef void (APIENTRYP PFNGLGETTEXLEVELPARAMETERFVPROC) ( GLenum target, GLint level,
+                                                GLenum pname, GLfloat *params );
+typedef void (APIENTRYP PFNGLGETTEXLEVELPARAMETERIVPROC) ( GLenum target, GLint level,
+                                                GLenum pname, GLint *params );
+
+
+typedef void (APIENTRYP PFNGLTEXIMAGE1DPROC) ( GLenum target, GLint level,
+                                    GLint internalFormat,
+                                    GLsizei width, GLint border,
+                                    GLenum format, GLenum type,
+                                    const GLvoid *pixels );
+
+typedef void (APIENTRYP PFNGLTEXIMAGE2DPROC) ( GLenum target, GLint level,
+                                    GLint internalFormat,
+                                    GLsizei width, GLsizei height,
+                                    GLint border, GLenum format, GLenum type,
+                                    const GLvoid *pixels );
+
+typedef void (APIENTRYP PFNGLGETTEXIMAGEPROC) ( GLenum target, GLint level,
+                                     GLenum format, GLenum type,
+                                     GLvoid *pixels );
+
+
+/* 1.1 functions */
+
+typedef void (APIENTRYP PFNGLGENTEXTURESPROC) ( GLsizei n, GLuint *textures );
+
+typedef void (APIENTRYP PFNGLDELETETEXTURESPROC) ( GLsizei n, const GLuint *textures);
+
+typedef void (APIENTRYP PFNGLBINDTEXTUREPROC) ( GLenum target, GLuint texture );
+
+typedef void (APIENTRYP PFNGLPRIORITIZETEXTURESPROC) ( GLsizei n,
+                                            const GLuint *textures,
+                                            const GLclampf *priorities );
+
+typedef GLboolean (APIENTRYP PFNGLARETEXTURESRESIDENTPROC) ( GLsizei n,
+                                                  const GLuint *textures,
+                                                  GLboolean *residences );
+
+typedef GLboolean (APIENTRYP PFNGLISTEXTUREPROC) ( GLuint texture );
+
+
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE1DPROC) ( GLenum target, GLint level,
+                                       GLint xoffset,
+                                       GLsizei width, GLenum format,
+                                       GLenum type, const GLvoid *pixels );
+
+
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE2DPROC) ( GLenum target, GLint level,
+                                       GLint xoffset, GLint yoffset,
+                                       GLsizei width, GLsizei height,
+                                       GLenum format, GLenum type,
+                                       const GLvoid *pixels );
+
+
+typedef void (APIENTRYP PFNGLCOPYTEXIMAGE1DPROC) ( GLenum target, GLint level,
+                                        GLenum internalformat,
+                                        GLint x, GLint y,
+                                        GLsizei width, GLint border );
+
+
+typedef void (APIENTRYP PFNGLCOPYTEXIMAGE2DPROC) ( GLenum target, GLint level,
+                                        GLenum internalformat,
+                                        GLint x, GLint y,
+                                        GLsizei width, GLsizei height,
+                                        GLint border );
+
+
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE1DPROC) ( GLenum target, GLint level,
+                                           GLint xoffset, GLint x, GLint y,
+                                           GLsizei width );
+
+
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE2DPROC) ( GLenum target, GLint level,
+                                           GLint xoffset, GLint yoffset,
+                                           GLint x, GLint y,
+                                           GLsizei width, GLsizei height );
+
+
+/*
+ * Evaluators
+ */
+
+typedef void (APIENTRYP PFNGLMAP1DPROC) ( GLenum target, GLdouble u1, GLdouble u2,
+                               GLint stride,
+                               GLint order, const GLdouble *points );
+typedef void (APIENTRYP PFNGLMAP1FPROC) ( GLenum target, GLfloat u1, GLfloat u2,
+                               GLint stride,
+                               GLint order, const GLfloat *points );
+
+typedef void (APIENTRYP PFNGLMAP2DPROC) ( GLenum target,
+		     GLdouble u1, GLdouble u2, GLint ustride, GLint uorder,
+		     GLdouble v1, GLdouble v2, GLint vstride, GLint vorder,
+		     const GLdouble *points );
+typedef void (APIENTRYP PFNGLMAP2FPROC) ( GLenum target,
+		     GLfloat u1, GLfloat u2, GLint ustride, GLint uorder,
+		     GLfloat v1, GLfloat v2, GLint vstride, GLint vorder,
+		     const GLfloat *points );
+
+typedef void (APIENTRYP PFNGLGETMAPDVPROC) ( GLenum target, GLenum query, GLdouble *v );
+typedef void (APIENTRYP PFNGLGETMAPFVPROC) ( GLenum target, GLenum query, GLfloat *v );
+typedef void (APIENTRYP PFNGLGETMAPIVPROC) ( GLenum target, GLenum query, GLint *v );
+
+typedef void (APIENTRYP PFNGLEVALCOORD1DPROC) ( GLdouble u );
+typedef void (APIENTRYP PFNGLEVALCOORD1FPROC) ( GLfloat u );
+
+typedef void (APIENTRYP PFNGLEVALCOORD1DVPROC) ( const GLdouble *u );
+typedef void (APIENTRYP PFNGLEVALCOORD1FVPROC) ( const GLfloat *u );
+
+typedef void (APIENTRYP PFNGLEVALCOORD2DPROC) ( GLdouble u, GLdouble v );
+typedef void (APIENTRYP PFNGLEVALCOORD2FPROC) ( GLfloat u, GLfloat v );
+
+typedef void (APIENTRYP PFNGLEVALCOORD2DVPROC) ( const GLdouble *u );
+typedef void (APIENTRYP PFNGLEVALCOORD2FVPROC) ( const GLfloat *u );
+
+typedef void (APIENTRYP PFNGLMAPGRID1DPROC) ( GLint un, GLdouble u1, GLdouble u2 );
+typedef void (APIENTRYP PFNGLMAPGRID1FPROC) ( GLint un, GLfloat u1, GLfloat u2 );
+
+typedef void (APIENTRYP PFNGLMAPGRID2DPROC) ( GLint un, GLdouble u1, GLdouble u2,
+                                   GLint vn, GLdouble v1, GLdouble v2 );
+typedef void (APIENTRYP PFNGLMAPGRID2FPROC) ( GLint un, GLfloat u1, GLfloat u2,
+                                   GLint vn, GLfloat v1, GLfloat v2 );
+
+typedef void (APIENTRYP PFNGLEVALPOINT1PROC) ( GLint i );
+
+typedef void (APIENTRYP PFNGLEVALPOINT2PROC) ( GLint i, GLint j );
+
+typedef void (APIENTRYP PFNGLEVALMESH1PROC) ( GLenum mode, GLint i1, GLint i2 );
+
+typedef void (APIENTRYP PFNGLEVALMESH2PROC) ( GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2 );
+
+
+/*
+ * Fog
+ */
+
+typedef void (APIENTRYP PFNGLFOGFPROC) ( GLenum pname, GLfloat param );
+
+typedef void (APIENTRYP PFNGLFOGIPROC) ( GLenum pname, GLint param );
+
+typedef void (APIENTRYP PFNGLFOGFVPROC) ( GLenum pname, const GLfloat *params );
+
+typedef void (APIENTRYP PFNGLFOGIVPROC) ( GLenum pname, const GLint *params );
+
+
+/*
+ * Selection and Feedback
+ */
+
+typedef void (APIENTRYP PFNGLFEEDBACKBUFFERPROC) ( GLsizei size, GLenum type, GLfloat *buffer );
+
+typedef void (APIENTRYP PFNGLPASSTHROUGHPROC) ( GLfloat token );
+
+typedef void (APIENTRYP PFNGLSELECTBUFFERPROC) ( GLsizei size, GLuint *buffer );
+
+typedef void (APIENTRYP PFNGLINITNAMESPROC) ( void );
+
+typedef void (APIENTRYP PFNGLLOADNAMEPROC) ( GLuint name );
+
+typedef void (APIENTRYP PFNGLPUSHNAMEPROC) ( GLuint name );
+
+typedef void (APIENTRYP PFNGLPOPNAMEPROC) ( void );
+#endif
 
 
 /*
@@ -1528,6 +2229,8 @@ GLAPI void GLAPIENTRY glPopName( void );
 #define GL_MAX_3D_TEXTURE_SIZE			0x8073
 #define GL_TEXTURE_BINDING_3D			0x806A
 
+#ifndef SDL_OPENGL_1_NO_PROTOTYPES
+
 GLAPI void GLAPIENTRY glDrawRangeElements( GLenum mode, GLuint start,
 	GLuint end, GLsizei count, GLenum type, const GLvoid *indices );
 
@@ -1551,6 +2254,34 @@ GLAPI void GLAPIENTRY glCopyTexSubImage3D( GLenum target, GLint level,
                                              GLint y, GLsizei width,
                                              GLsizei height );
 
+#endif
+#ifdef SDL_OPENGL_1_FUNCTION_TYPEDEFS
+
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSPROC) ( GLenum mode, GLuint start,
+	GLuint end, GLsizei count, GLenum type, const GLvoid *indices );
+
+typedef void (APIENTRYP PFNGLTEXIMAGE3DPROC) ( GLenum target, GLint level,
+                                      GLint internalFormat,
+                                      GLsizei width, GLsizei height,
+                                      GLsizei depth, GLint border,
+                                      GLenum format, GLenum type,
+                                      const GLvoid *pixels );
+
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DPROC) ( GLenum target, GLint level,
+                                         GLint xoffset, GLint yoffset,
+                                         GLint zoffset, GLsizei width,
+                                         GLsizei height, GLsizei depth,
+                                         GLenum format,
+                                         GLenum type, const GLvoid *pixels);
+
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DPROC) ( GLenum target, GLint level,
+                                             GLint xoffset, GLint yoffset,
+                                             GLint zoffset, GLint x,
+                                             GLint y, GLsizei width,
+                                             GLsizei height );
+
+#endif
+
 typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
 typedef void (APIENTRYP PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
 typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
@@ -1638,6 +2369,8 @@ typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level,
 #define GL_BLEND_COLOR				0x8005
 
 
+#ifndef SDL_OPENGL_1_NO_PROTOTYPES
+
 GLAPI void GLAPIENTRY glColorTable( GLenum target, GLenum internalformat,
                                     GLsizei width, GLenum format,
                                     GLenum type, const GLvoid *table );
@@ -1746,6 +2479,119 @@ GLAPI void GLAPIENTRY glSeparableFilter2D( GLenum target,
 GLAPI void GLAPIENTRY glGetSeparableFilter( GLenum target, GLenum format,
 	GLenum type, GLvoid *row, GLvoid *column, GLvoid *span );
 
+#endif
+#ifdef SDL_OPENGL_1_FUNCTION_TYPEDEFS
+
+typedef void (APIENTRYP PFNGLCOLORTABLEPROC) ( GLenum target, GLenum internalformat,
+                                    GLsizei width, GLenum format,
+                                    GLenum type, const GLvoid *table );
+
+typedef void (APIENTRYP PFNGLCOLORSUBTABLEPROC) ( GLenum target,
+                                       GLsizei start, GLsizei count,
+                                       GLenum format, GLenum type,
+                                       const GLvoid *data );
+
+typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname,
+                                              const GLint *params);
+
+typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname,
+                                              const GLfloat *params);
+
+typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEPROC) ( GLenum target, GLsizei start,
+                                           GLint x, GLint y, GLsizei width );
+
+typedef void (APIENTRYP PFNGLCOPYCOLORTABLEPROC) ( GLenum target, GLenum internalformat,
+                                        GLint x, GLint y, GLsizei width );
+
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPROC) ( GLenum target, GLenum format,
+                                       GLenum type, GLvoid *table );
+
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVPROC) ( GLenum target, GLenum pname,
+                                                  GLfloat *params );
+
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVPROC) ( GLenum target, GLenum pname,
+                                                  GLint *params );
+
+typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) ( GLenum mode );
+
+typedef void (APIENTRYP PFNGLBLENDCOLORPROC) ( GLclampf red, GLclampf green,
+                                    GLclampf blue, GLclampf alpha );
+
+typedef void (APIENTRYP PFNGLHISTOGRAMPROC) ( GLenum target, GLsizei width,
+				   GLenum internalformat, GLboolean sink );
+
+typedef void (APIENTRYP PFNGLRESETHISTOGRAMPROC) ( GLenum target );
+
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPROC) ( GLenum target, GLboolean reset,
+				      GLenum format, GLenum type,
+				      GLvoid *values );
+
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVPROC) ( GLenum target, GLenum pname,
+						 GLfloat *params );
+
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVPROC) ( GLenum target, GLenum pname,
+						 GLint *params );
+
+typedef void (APIENTRYP PFNGLMINMAXPROC) ( GLenum target, GLenum internalformat,
+				GLboolean sink );
+
+typedef void (APIENTRYP PFNGLRESETMINMAXPROC) ( GLenum target );
+
+typedef void (APIENTRYP PFNGLGETMINMAXPROC) ( GLenum target, GLboolean reset,
+                                   GLenum format, GLenum types,
+                                   GLvoid *values );
+
+typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVPROC) ( GLenum target, GLenum pname,
+					      GLfloat *params );
+
+typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVPROC) ( GLenum target, GLenum pname,
+					      GLint *params );
+
+typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DPROC) ( GLenum target,
+	GLenum internalformat, GLsizei width, GLenum format, GLenum type,
+	const GLvoid *image );
+
+typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DPROC) ( GLenum target,
+	GLenum internalformat, GLsizei width, GLsizei height, GLenum format,
+	GLenum type, const GLvoid *image );
+
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFPROC) ( GLenum target, GLenum pname,
+	GLfloat params );
+
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVPROC) ( GLenum target, GLenum pname,
+	const GLfloat *params );
+
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIPROC) ( GLenum target, GLenum pname,
+	GLint params );
+
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVPROC) ( GLenum target, GLenum pname,
+	const GLint *params );
+
+typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DPROC) ( GLenum target,
+	GLenum internalformat, GLint x, GLint y, GLsizei width );
+
+typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DPROC) ( GLenum target,
+	GLenum internalformat, GLint x, GLint y, GLsizei width,
+	GLsizei height);
+
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTERPROC) ( GLenum target, GLenum format,
+	GLenum type, GLvoid *image );
+
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVPROC) ( GLenum target, GLenum pname,
+	GLfloat *params );
+
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVPROC) ( GLenum target, GLenum pname,
+	GLint *params );
+
+typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DPROC) ( GLenum target,
+	GLenum internalformat, GLsizei width, GLsizei height, GLenum format,
+	GLenum type, const GLvoid *row, const GLvoid *column );
+
+typedef void (APIENTRYP PFNGLGETSEPARABLEFILTERPROC) ( GLenum target, GLenum format,
+	GLenum type, GLvoid *row, GLvoid *column, GLvoid *span );
+
+#endif
+
 
 
 
@@ -1858,6 +2704,8 @@ GLAPI void GLAPIENTRY glGetSeparableFilter( GLenum target, GLenum format,
 /* texture_border_clamp */
 #define GL_CLAMP_TO_BORDER			0x812D
 
+#ifndef SDL_OPENGL_1_NO_PROTOTYPES
+
 GLAPI void GLAPIENTRY glActiveTexture( GLenum texture );
 
 GLAPI void GLAPIENTRY glClientActiveTexture( GLenum texture );
@@ -1951,6 +2799,104 @@ GLAPI void GLAPIENTRY glMultTransposeMatrixf( const GLfloat m[16] );
 
 GLAPI void GLAPIENTRY glSampleCoverage( GLclampf value, GLboolean invert );
 
+#endif
+#ifdef SDL_OPENGL_1_FUNCTION_TYPEDEFS
+
+typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) ( GLenum texture );
+
+typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREPROC) ( GLenum texture );
+
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DPROC) ( GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data );
+
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) ( GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data );
+
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DPROC) ( GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data );
+
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC) ( GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data );
+
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) ( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data );
+
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) ( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data );
+
+typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEPROC) ( GLenum target, GLint lod, GLvoid *img );
+
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DPROC) ( GLenum target, GLdouble s );
+
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVPROC) ( GLenum target, const GLdouble *v );
+
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FPROC) ( GLenum target, GLfloat s );
+
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVPROC) ( GLenum target, const GLfloat *v );
+
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IPROC) ( GLenum target, GLint s );
+
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVPROC) ( GLenum target, const GLint *v );
+
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SPROC) ( GLenum target, GLshort s );
+
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVPROC) ( GLenum target, const GLshort *v );
+
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DPROC) ( GLenum target, GLdouble s, GLdouble t );
+
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVPROC) ( GLenum target, const GLdouble *v );
+
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) ( GLenum target, GLfloat s, GLfloat t );
+
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVPROC) ( GLenum target, const GLfloat *v );
+
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IPROC) ( GLenum target, GLint s, GLint t );
+
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVPROC) ( GLenum target, const GLint *v );
+
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SPROC) ( GLenum target, GLshort s, GLshort t );
+
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVPROC) ( GLenum target, const GLshort *v );
+
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DPROC) ( GLenum target, GLdouble s, GLdouble t, GLdouble r );
+
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVPROC) ( GLenum target, const GLdouble *v );
+
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FPROC) ( GLenum target, GLfloat s, GLfloat t, GLfloat r );
+
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVPROC) ( GLenum target, const GLfloat *v );
+
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IPROC) ( GLenum target, GLint s, GLint t, GLint r );
+
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVPROC) ( GLenum target, const GLint *v );
+
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SPROC) ( GLenum target, GLshort s, GLshort t, GLshort r );
+
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVPROC) ( GLenum target, const GLshort *v );
+
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DPROC) ( GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q );
+
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVPROC) ( GLenum target, const GLdouble *v );
+
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FPROC) ( GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q );
+
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVPROC) ( GLenum target, const GLfloat *v );
+
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IPROC) ( GLenum target, GLint s, GLint t, GLint r, GLint q );
+
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVPROC) ( GLenum target, const GLint *v );
+
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SPROC) ( GLenum target, GLshort s, GLshort t, GLshort r, GLshort q );
+
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVPROC) ( GLenum target, const GLshort *v );
+
+
+typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDPROC) ( const GLdouble m[16] );
+
+typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFPROC) ( const GLfloat m[16] );
+
+typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDPROC) ( const GLdouble m[16] );
+
+typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFPROC) ( const GLfloat m[16] );
+
+typedef void (APIENTRYP PFNGLSAMPLECOVERAGEPROC) ( GLclampf value, GLboolean invert );
+
+#endif
+
 
 typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
 typedef void (APIENTRYP PFNGLSAMPLECOVERAGEPROC) (GLclampf value, GLboolean invert);
@@ -2006,6 +2952,8 @@ typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint le
 #define GL_CLIENT_ACTIVE_TEXTURE_ARB		0x84E1
 #define GL_MAX_TEXTURE_UNITS_ARB		0x84E2
 
+#ifndef SDL_OPENGL_1_NO_PROTOTYPES
+
 GLAPI void GLAPIENTRY glActiveTextureARB(GLenum texture);
 GLAPI void GLAPIENTRY glClientActiveTextureARB(GLenum texture);
 GLAPI void GLAPIENTRY glMultiTexCoord1dARB(GLenum target, GLdouble s);
@@ -2041,6 +2989,46 @@ GLAPI void GLAPIENTRY glMultiTexCoord4ivARB(GLenum target, const GLint *v);
 GLAPI void GLAPIENTRY glMultiTexCoord4sARB(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
 GLAPI void GLAPIENTRY glMultiTexCoord4svARB(GLenum target, const GLshort *v);
 
+#endif
+#ifdef SDL_OPENGL_1_FUNCTION_TYPEDEFS
+
+typedef void (APIENTRYP PFNGLACTIVETEXTUREARBPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREARBPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DARBPROC) (GLenum target, GLdouble s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FARBPROC) (GLenum target, GLfloat s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IARBPROC) (GLenum target, GLint s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SARBPROC) (GLenum target, GLshort s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DARBPROC) (GLenum target, GLdouble s, GLdouble t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FARBPROC) (GLenum target, GLfloat s, GLfloat t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IARBPROC) (GLenum target, GLint s, GLint t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SARBPROC) (GLenum target, GLshort s, GLshort t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IARBPROC) (GLenum target, GLint s, GLint t, GLint r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IARBPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLshort *v);
+
+#endif
+
 typedef void (APIENTRYP PFNGLACTIVETEXTUREARBPROC) (GLenum texture);
 typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREARBPROC) (GLenum texture);
 typedef void (APIENTRYP PFNGLMULTITEXCOORD1DARBPROC) (GLenum target, GLdouble s);
diff --git a/libs/SDL3/include/SDL3/SDL_render.h b/libs/SDL3/include/SDL3/SDL_render.h
index 820fa5a43..29b2e40f9 100644
--- a/libs/SDL3/include/SDL3/SDL_render.h
+++ b/libs/SDL3/include/SDL3/SDL_render.h
@@ -2464,6 +2464,57 @@ extern SDL_DECLSPEC bool SDLCALL SDL_SetRenderVSync(SDL_Renderer *renderer, int
  */
 extern SDL_DECLSPEC bool SDLCALL SDL_GetRenderVSync(SDL_Renderer *renderer, int *vsync);
 
+/**
+ * The size, in pixels, of a single SDL_RenderDebugText() character.
+ *
+ * The font is monospaced and square, so this applies to all characters.
+ *
+ * \since This macro is available since SDL 3.1.5.
+ *
+ * \sa SDL_RenderDebugText
+ */
+#define SDL_DEBUG_TEXT_FONT_CHARACTER_SIZE 8
+
+/**
+ * Draw debug text to an SDL_Renderer.
+ *
+ * This function will render a string of text to an SDL_Renderer. Note that
+ * this is a convenience function for debugging, with severe limitations, and
+ * not intended to be used for production apps and games.
+ *
+ * Among these limitations:
+ *
+ * - It accepts UTF-8 strings, but will only renders ASCII characters.
+ * - It has a single, tiny size (8x8 pixels). One can use logical presentation
+ *   or scaling to adjust it, but it will be blurry.
+ * - It uses a simple, hardcoded bitmap font. It does not allow different font
+ *   selections and it does not support truetype, for proper scaling.
+ * - It does no word-wrapping and does not treat newline characters as a line
+ *   break. If the text goes out of the window, it's gone.
+ *
+ * For serious text rendering, there are several good options, such as
+ * SDL_ttf, stb_truetype, or other external libraries.
+ *
+ * On first use, this will create an internal texture for rendering glyphs.
+ * This texture will live until the renderer is destroyed.
+ *
+ * The text is drawn in the color specified by SDL_SetRenderDrawColor().
+ *
+ * \param renderer the renderer which should draw a line of text.
+ * \param x the x coordinate where the top-left corner of the text will draw.
+ * \param y the y coordinate where the top-left corner of the text will draw.
+ * \param str the string to render.
+ * \returns true on success or false on failure; call SDL_GetError() for more
+ *          information.
+ *
+ * \threadsafety You may only call this function from the main thread.
+ *
+ * \since This function is available since SDL 3.1.4.
+ *
+ * \sa SDL_DEBUG_TEXT_FONT_CHARACTER_SIZE
+ */
+extern SDL_DECLSPEC bool SDLCALL SDL_RenderDebugText(SDL_Renderer *renderer, float x, float y, const char *str);
+
 /* Ends C function definitions when using C++ */
 #ifdef __cplusplus
 }
diff --git a/libs/SDL3/include/SDL3/SDL_stdinc.h b/libs/SDL3/include/SDL3/SDL_stdinc.h
index c484c3712..a2c91caf8 100644
--- a/libs/SDL3/include/SDL3/SDL_stdinc.h
+++ b/libs/SDL3/include/SDL3/SDL_stdinc.h
@@ -428,7 +428,7 @@ typedef Sint64 SDL_Time;
 #define SDL_PRIs64 "I64d"
 #elif defined(PRIs64)
 #define SDL_PRIs64 PRIs64
-#elif defined(__LP64__) && !defined(SDL_PLATFORM_APPLE)
+#elif defined(__LP64__) && !defined(SDL_PLATFORM_APPLE) && !defined(__EMSCRIPTEN__)
 #define SDL_PRIs64 "ld"
 #else
 #define SDL_PRIs64 "lld"
@@ -439,7 +439,7 @@ typedef Sint64 SDL_Time;
 #define SDL_PRIu64 "I64u"
 #elif defined(PRIu64)
 #define SDL_PRIu64 PRIu64
-#elif defined(__LP64__) && !defined(SDL_PLATFORM_APPLE)
+#elif defined(__LP64__) && !defined(SDL_PLATFORM_APPLE) && !defined(__EMSCRIPTEN__)
 #define SDL_PRIu64 "lu"
 #else
 #define SDL_PRIu64 "llu"
@@ -554,7 +554,7 @@ SDL_COMPILE_TIME_ASSERT(longlong_size64, sizeof(long long) == 8); /* using I64 f
 #define SDL_PRINTF_FORMAT_STRING
 #define SDL_SCANF_FORMAT_STRING
 #endif
-#ifdef __GNUC__
+#if defined(__GNUC__) || defined(__clang__)
 #define SDL_PRINTF_VARARG_FUNC( fmtargnumber ) __attribute__ (( format( __printf__, fmtargnumber, fmtargnumber+1 )))
 #define SDL_PRINTF_VARARG_FUNCV( fmtargnumber ) __attribute__(( format( __printf__, fmtargnumber, 0 )))
 #define SDL_SCANF_VARARG_FUNC( fmtargnumber ) __attribute__ (( format( __scanf__, fmtargnumber, fmtargnumber+1 )))
@@ -2472,13 +2472,14 @@ extern SDL_DECLSPEC char * SDLCALL SDL_strpbrk(const char *str, const char *brea
 /**
  * The Unicode REPLACEMENT CHARACTER codepoint.
  *
- * SDL_StepUTF8() reports this codepoint when it encounters a UTF-8 string
- * with encoding errors.
+ * SDL_StepUTF8() and SDL_StepBackUTF8() report this codepoint when they
+ * encounter a UTF-8 string with encoding errors.
  *
  * This tends to render as something like a question mark in most places.
  *
  * \since This macro is available since SDL 3.0.0.
  *
+ * \sa SDL_StepBackUTF8
  * \sa SDL_StepUTF8
  */
 #define SDL_INVALID_UNICODE_CODEPOINT 0xFFFD
@@ -2528,6 +2529,37 @@ extern SDL_DECLSPEC char * SDLCALL SDL_strpbrk(const char *str, const char *brea
  */
 extern SDL_DECLSPEC Uint32 SDLCALL SDL_StepUTF8(const char **pstr, size_t *pslen);
 
+/**
+ * Decode a UTF-8 string in reverse, one Unicode codepoint at a time.
+ *
+ * This will go to the start of the previous Unicode codepoint in the string,
+ * move `*pstr` to that location and return that codepoint.
+ *
+ * If `*pstr` is already at the start of the string), it will not advance
+ * `*pstr` at all.
+ *
+ * Generally this function is called in a loop until it returns zero,
+ * adjusting its parameter each iteration.
+ *
+ * If an invalid UTF-8 sequence is encountered, this function returns
+ * SDL_INVALID_UNICODE_CODEPOINT.
+ *
+ * Several things can generate invalid UTF-8 sequences, including overlong
+ * encodings, the use of UTF-16 surrogate values, and truncated data. Please
+ * refer to
+ * [RFC3629](https://www.ietf.org/rfc/rfc3629.txt)
+ * for details.
+ *
+ * \param start a pointer to the beginning of the UTF-8 string.
+ * \param pstr a pointer to a UTF-8 string pointer to be read and adjusted.
+ * \returns the previous Unicode codepoint in the string.
+ *
+ * \threadsafety It is safe to call this function from any thread.
+ *
+ * \since This function is available since SDL 3.1.4.
+ */
+extern SDL_DECLSPEC Uint32 SDLCALL SDL_StepBackUTF8(const char *start, const char **pstr);
+
 /**
  * Convert a single Unicode codepoint to UTF-8.
  *
@@ -4212,6 +4244,9 @@ size_t wcslcpy(wchar_t *dst, const wchar_t *src, size_t size);
 size_t wcslcat(wchar_t *dst, const wchar_t *src, size_t size);
 #endif
 
+/* strdup is not ANSI but POSIX, and its prototype might be hidden... */
+char *strdup(const char *str);
+
 /* Starting LLVM 16, the analyser errors out if these functions do not have
    their prototype defined (clang-diagnostic-implicit-function-declaration) */
 #include <stdio.h>
diff --git a/libs/SDL3/include/SDL3/SDL_system.h b/libs/SDL3/include/SDL3/SDL_system.h
index 88e318ddf..eee8ee2c5 100644
--- a/libs/SDL3/include/SDL3/SDL_system.h
+++ b/libs/SDL3/include/SDL3/SDL_system.h
@@ -261,6 +261,13 @@ extern SDL_DECLSPEC void SDLCALL SDL_SetiOSEventPump(bool enabled);
 /*
  * Platform specific functions for Android
  */
+
+#if defined(__cplusplus)
+typedef struct _JNIEnv JNIEnv;
+#else
+typedef const struct JNINativeInterface* JNIEnv;
+#endif
+
 #ifdef SDL_PLATFORM_ANDROID
 
 /**
@@ -283,7 +290,7 @@ extern SDL_DECLSPEC void SDLCALL SDL_SetiOSEventPump(bool enabled);
  *
  * \sa SDL_GetAndroidActivity
  */
-extern SDL_DECLSPEC void * SDLCALL SDL_GetAndroidJNIEnv(void);
+extern SDL_DECLSPEC JNIEnv * SDLCALL SDL_GetAndroidJNIEnv(void);
 
 /**
  * Retrieve the Java instance of the Android activity class.
@@ -565,6 +572,31 @@ extern SDL_DECLSPEC bool SDLCALL SDL_IsTablet(void);
  */
 extern SDL_DECLSPEC bool SDLCALL SDL_IsTV(void);
 
+/**
+ * Application sandbox environment.
+ *
+ * \since This enum is available since SDL 3.1.6.
+ */
+typedef enum SDL_Sandbox
+{
+    SDL_SANDBOX_NONE = 0,
+    SDL_SANDBOX_UNKNOWN,
+    SDL_SANDBOX_FLATPAK,
+    SDL_SANDBOX_SNAP,
+    SDL_SANDBOX_MACOS
+} SDL_Sandbox;
+
+/**
+ * Get the application sandbox environment, if any.
+ *
+ * \returns the application sandbox environment or SDL_SANDBOX_NONE if the
+ *          application is not running in a sandbox environment.
+ *
+ * \since This function is available since SDL 3.1.4.
+ */
+extern SDL_DECLSPEC SDL_Sandbox SDLCALL SDL_GetSandbox(void);
+
+
 /* Functions used by iOS app delegates to notify SDL about state changes. */
 
 /**
diff --git a/libs/SDL3/include/SDL3/SDL_timer.h b/libs/SDL3/include/SDL3/SDL_timer.h
index fa8b2bb22..5b6508aa8 100644
--- a/libs/SDL3/include/SDL3/SDL_timer.h
+++ b/libs/SDL3/include/SDL3/SDL_timer.h
@@ -115,8 +115,8 @@ extern SDL_DECLSPEC void SDLCALL SDL_Delay(Uint32 ms);
  * Wait a specified number of nanoseconds before returning.
  *
  * This function waits a specified number of nanoseconds before returning. It
- * will attempt to wait as close to the requested time as possible, busy
- * waiting if necessary, but could return later due to OS scheduling.
+ * waits at least the specified time, but possibly longer due to OS
+ * scheduling.
  *
  * \param ns the number of nanoseconds to delay.
  *
@@ -124,6 +124,19 @@ extern SDL_DECLSPEC void SDLCALL SDL_Delay(Uint32 ms);
  */
 extern SDL_DECLSPEC void SDLCALL SDL_DelayNS(Uint64 ns);
 
+/**
+ * Wait a specified number of nanoseconds before returning.
+ *
+ * This function waits a specified number of nanoseconds before returning. It
+ * will attempt to wait as close to the requested time as possible, busy
+ * waiting if necessary, but could return later due to OS scheduling.
+ *
+ * \param ns the number of nanoseconds to delay.
+ *
+ * \since This function is available since SDL 3.1.4.
+ */
+extern SDL_DECLSPEC void SDLCALL SDL_DelayPrecise(Uint64 ns);
+
 /**
  * Definition of the timer ID type.
  *
diff --git a/libs/SDL3/include/SDL3/SDL_version.h b/libs/SDL3/include/SDL3/SDL_version.h
index 09b010dc0..5dd542622 100644
--- a/libs/SDL3/include/SDL3/SDL_version.h
+++ b/libs/SDL3/include/SDL3/SDL_version.h
@@ -62,7 +62,7 @@ extern "C" {
  *
  * \since This macro is available since SDL 3.0.0.
  */
-#define SDL_MICRO_VERSION   3
+#define SDL_MICRO_VERSION   5
 
 /**
  * This macro turns the version numbers into a numeric value.
diff --git a/libs/SDL3/include/SDL3/SDL_video.h b/libs/SDL3/include/SDL3/SDL_video.h
index 4310f03e3..f4d6949be 100644
--- a/libs/SDL3/include/SDL3/SDL_video.h
+++ b/libs/SDL3/include/SDL3/SDL_video.h
@@ -939,7 +939,7 @@ extern SDL_DECLSPEC SDL_Window ** SDLCALL SDL_GetWindows(int *count);
  * corresponding UnloadLibrary function is called by SDL_DestroyWindow().
  *
  * If SDL_WINDOW_VULKAN is specified and there isn't a working Vulkan driver,
- * SDL_CreateWindow() will fail because SDL_Vulkan_LoadLibrary() will fail.
+ * SDL_CreateWindow() will fail, because SDL_Vulkan_LoadLibrary() will fail.
  *
  * If SDL_WINDOW_METAL is specified on an OS that does not support Metal,
  * SDL_CreateWindow() will fail.
@@ -961,6 +961,7 @@ extern SDL_DECLSPEC SDL_Window ** SDLCALL SDL_GetWindows(int *count);
  *
  * \since This function is available since SDL 3.0.0.
  *
+ * \sa SDL_CreateWindowAndRenderer
  * \sa SDL_CreatePopupWindow
  * \sa SDL_CreateWindowWithProperties
  * \sa SDL_DestroyWindow
@@ -970,36 +971,41 @@ extern SDL_DECLSPEC SDL_Window * SDLCALL SDL_CreateWindow(const char *title, int
 /**
  * Create a child popup window of the specified parent window.
  *
- * 'flags' **must** contain exactly one of the following: -
- * 'SDL_WINDOW_TOOLTIP': The popup window is a tooltip and will not pass any
- * input events. - 'SDL_WINDOW_POPUP_MENU': The popup window is a popup menu.
- * The topmost popup menu will implicitly gain the keyboard focus.
+ * The flags parameter **must** contain at least one of the following:
+ *
+ * - `SDL_WINDOW_TOOLTIP`: The popup window is a tooltip and will not pass any
+ *   input events.
+ * - `SDL_WINDOW_POPUP_MENU`: The popup window is a popup menu. The topmost
+ *   popup menu will implicitly gain the keyboard focus.
  *
  * The following flags are not relevant to popup window creation and will be
  * ignored:
  *
- * - 'SDL_WINDOW_MINIMIZED'
- * - 'SDL_WINDOW_MAXIMIZED'
- * - 'SDL_WINDOW_FULLSCREEN'
- * - 'SDL_WINDOW_BORDERLESS'
+ * - `SDL_WINDOW_MINIMIZED`
+ * - `SDL_WINDOW_MAXIMIZED`
+ * - `SDL_WINDOW_FULLSCREEN`
+ * - `SDL_WINDOW_BORDERLESS`
+ *
+ * The following flags are incompatible with popup window creation and will
+ * cause it to fail:
+ *
+ * - `SDL_WINDOW_UTILITY`
+ * - `SDL_WINDOW_MODAL`
  *
  * The parent parameter **must** be non-null and a valid window. The parent of
  * a popup window can be either a regular, toplevel window, or another popup
  * window.
  *
  * Popup windows cannot be minimized, maximized, made fullscreen, raised,
- * flash, be made a modal window, be the parent of a modal window, or grab the
- * mouse and/or keyboard. Attempts to do so will fail.
+ * flash, be made a modal window, be the parent of a toplevel window, or grab
+ * the mouse and/or keyboard. Attempts to do so will fail.
  *
  * Popup windows implicitly do not have a border/decorations and do not appear
  * on the taskbar/dock or in lists of windows such as alt-tab menus.
  *
- * If a parent window is hidden, any child popup windows will be recursively
- * hidden as well. Child popup windows not explicitly hidden will be restored
- * when the parent is shown.
- *
- * If the parent window is destroyed, any child popup windows will be
- * recursively destroyed as well.
+ * If a parent window is hidden or destroyed, any child popup windows will be
+ * recursively hidden or destroyed as well. Child popup windows not explicitly
+ * hidden will be restored when the parent is shown.
  *
  * \param parent the parent of the window, must not be NULL.
  * \param offset_x the x position of the popup window relative to the origin
@@ -1056,7 +1062,7 @@ extern SDL_DECLSPEC SDL_Window * SDLCALL SDL_CreatePopupWindow(SDL_Window *paren
  * - `SDL_PROP_WINDOW_CREATE_OPENGL_BOOLEAN`: true if the window will be used
  *   with OpenGL rendering
  * - `SDL_PROP_WINDOW_CREATE_PARENT_POINTER`: an SDL_Window that will be the
- *   parent of this window, required for windows with the "toolip", "menu",
+ *   parent of this window, required for windows with the "tooltip", "menu",
  *   and "modal" properties
  * - `SDL_PROP_WINDOW_CREATE_RESIZABLE_BOOLEAN`: true if the window should be
  *   resizable
@@ -1093,8 +1099,9 @@ extern SDL_DECLSPEC SDL_Window * SDLCALL SDL_CreatePopupWindow(SDL_Window *paren
  *   [README/wayland](README/wayland) for more information on using custom
  *   surfaces.
  * - `SDL_PROP_WINDOW_CREATE_WAYLAND_CREATE_EGL_WINDOW_BOOLEAN` - true if the
- *   application wants an associated `wl_egl_window` object to be created,
- *   even if the window does not have the OpenGL property or flag set.
+ *   application wants an associated `wl_egl_window` object to be created and
+ *   attached to the window, even if the window does not have the OpenGL
+ *   property or `SDL_WINDOW_OPENGL` flag set.
  * - `SDL_PROP_WINDOW_CREATE_WAYLAND_WL_SURFACE_POINTER` - the wl_surface
  *   associated with the window, if you want to wrap an existing window. See
  *   [README/wayland](README/wayland) for more information.
@@ -1250,7 +1257,7 @@ extern SDL_DECLSPEC SDL_Window * SDLCALL SDL_GetWindowParent(SDL_Window *window)
  * - `SDL_PROP_WINDOW_UIKIT_WINDOW_POINTER`: the `(__unsafe_unretained)`
  *   UIWindow associated with the window
  * - `SDL_PROP_WINDOW_UIKIT_METAL_VIEW_TAG_NUMBER`: the NSInteger tag
- *   assocated with metal views on the window
+ *   associated with metal views on the window
  * - `SDL_PROP_WINDOW_UIKIT_OPENGL_FRAMEBUFFER_NUMBER`: the OpenGL view's
  *   framebuffer object. It must be bound when rendering to the screen using
  *   OpenGL.
@@ -1560,7 +1567,7 @@ extern SDL_DECLSPEC bool SDLCALL SDL_GetWindowSize(SDL_Window *window, int *w, i
  * Some devices have portions of the screen which are partially obscured or
  * not interactive, possibly due to on-screen controls, curved edges, camera
  * notches, TV overscan, etc. This function provides the area of the window
- * which is safe to have interactible content. You should continue rendering
+ * which is safe to have interactable content. You should continue rendering
  * into the rest of the window, but it should not contain visually important
  * or interactible content.
  *
@@ -1889,7 +1896,7 @@ extern SDL_DECLSPEC bool SDLCALL SDL_MaximizeWindow(SDL_Window *window);
  * Request that the window be minimized to an iconic representation.
  *
  * On some windowing systems this request is asynchronous and the new window
- * state may not have have been applied immediately upon the return of this
+ * state may not have been applied immediately upon the return of this
  * function. If an immediate change is required, call SDL_SyncWindow() to
  * block until the changes have taken effect.
  *
@@ -2292,9 +2299,16 @@ extern SDL_DECLSPEC float SDLCALL SDL_GetWindowOpacity(SDL_Window *window);
  * reparented to the new owner. Setting the parent window to NULL unparents
  * the window and removes child window status.
  *
+ * If a parent window is hidden or destroyed, the operation will be
+ * recursively applied to child windows. Child windows hidden with the parent
+ * that did not have their hidden status explicitly set will be restored when
+ * the parent is shown.
+ *
  * Attempting to set the parent of a window that is currently in the modal
- * state will fail. Use SDL_SetWindowModalFor() to cancel the modal status
- * before attempting to change the parent.
+ * state will fail. Use SDL_SetWindowModal() to cancel the modal status before
+ * attempting to change the parent.
+ *
+ * Popup windows cannot change parents and attempts to do so will fail.
  *
  * Setting a parent window that is currently the sibling or descendent of the
  * child window results in undefined behavior.
@@ -2445,12 +2459,14 @@ extern SDL_DECLSPEC bool SDLCALL SDL_SetWindowHitTest(SDL_Window *window, SDL_Hi
  *
  * This sets the alpha channel of a transparent window and any fully
  * transparent areas are also transparent to mouse clicks. If you are using
- * something besides the SDL render API, then you are responsible for setting
- * the alpha channel of the window yourself.
+ * something besides the SDL render API, then you are responsible for drawing
+ * the alpha channel of the window to match the shape alpha channel to get
+ * consistent cross-platform results.
  *
  * The shape is copied inside this function, so you can free it afterwards. If
  * your shape surface changes, you should call SDL_SetWindowShape() again to
- * update the window.
+ * update the window. This is an expensive operation, so should be done
+ * sparingly.
  *
  * The window must have been created with the SDL_WINDOW_TRANSPARENT flag.
  *
@@ -2479,8 +2495,8 @@ extern SDL_DECLSPEC bool SDLCALL SDL_FlashWindow(SDL_Window *window, SDL_FlashOp
 /**
  * Destroy a window.
  *
- * Any popups or modal windows owned by the window will be recursively
- * destroyed as well.
+ * Any child windows owned by the window will be recursively destroyed as
+ * well.
  *
  * \param window the window to destroy.
  *
diff --git a/libs/SDL3/include/build_config/SDL_build_config.h b/libs/SDL3/include/build_config/SDL_build_config.h
index eca4268cb..b712b1e3e 100644
--- a/libs/SDL3/include/build_config/SDL_build_config.h
+++ b/libs/SDL3/include/build_config/SDL_build_config.h
@@ -31,7 +31,9 @@
  */
 
 /* Add any platform that doesn't build using the configure system. */
-#if defined(SDL_PLATFORM_WIN32)
+#if defined(SDL_PLATFORM_PRIVATE)
+#include "SDL_build_config_private.h"
+#elif defined(SDL_PLATFORM_WIN32)
 #include "SDL_build_config_windows.h"
 #elif defined(SDL_PLATFORM_WINGDK)
 #include "SDL_build_config_wingdk.h"
@@ -43,8 +45,6 @@
 #include "SDL_build_config_ios.h"
 #elif defined(SDL_PLATFORM_ANDROID)
 #include "SDL_build_config_android.h"
-#elif defined(SDL_PLATFORM_EMSCRIPTEN)
-#include "SDL_build_config_emscripten.h"
 #elif defined(SDL_PLATFORM_NGAGE)
 #include "SDL_build_config_ngage.h"
 #else
diff --git a/libs/SDL3/include/build_config/SDL_build_config.h.cmake b/libs/SDL3/include/build_config/SDL_build_config.h.cmake
index d0598aea8..ae900e8af 100644
--- a/libs/SDL3/include/build_config/SDL_build_config.h.cmake
+++ b/libs/SDL3/include/build_config/SDL_build_config.h.cmake
@@ -75,8 +75,10 @@
 #cmakedefine HAVE_MALLOC 1
 #cmakedefine HAVE_CALLOC 1
 #cmakedefine HAVE_REALLOC 1
+#cmakedefine HAVE_FDATASYNC 1
 #cmakedefine HAVE_FREE 1
 #cmakedefine HAVE_GETENV 1
+#cmakedefine HAVE_GETHOSTNAME 1
 #cmakedefine HAVE_SETENV 1
 #cmakedefine HAVE_PUTENV 1
 #cmakedefine HAVE_UNSETENV 1
@@ -504,6 +506,10 @@
 #cmakedefine SDL_CAMERA_DRIVER_MEDIAFOUNDATION @SDL_CAMERA_DRIVER_MEDIAFOUNDATION@
 #cmakedefine SDL_CAMERA_DRIVER_PIPEWIRE @SDL_CAMERA_DRIVER_PIPEWIRE@
 #cmakedefine SDL_CAMERA_DRIVER_PIPEWIRE_DYNAMIC @SDL_CAMERA_DRIVER_PIPEWIRE_DYNAMIC@
+#cmakedefine SDL_CAMERA_DRIVER_VITA @SDL_CAMERA_DRIVER_VITA@
+
+/* Enable dialog subsystem */
+#cmakedefine SDL_DIALOG_DUMMY @SDL_DIALOG_DUMMY@
 
 /* Enable misc subsystem */
 #cmakedefine SDL_MISC_DUMMY @SDL_MISC_DUMMY@
@@ -513,8 +519,6 @@
 
 /* Enable assembly routines */
 #cmakedefine SDL_ALTIVEC_BLITTERS @SDL_ALTIVEC_BLITTERS@
-#cmakedefine SDL_ARM_SIMD_BLITTERS @SDL_ARM_SIMD_BLITTERS@
-#cmakedefine SDL_ARM_NEON_BLITTERS @SDL_ARM_NEON_BLITTERS@
 
 /* Whether SDL_DYNAMIC_API needs dlopen */
 #cmakedefine DYNAPI_NEEDS_DLOPEN @DYNAPI_NEEDS_DLOPEN@
diff --git a/libs/SDL3/include/build_config/SDL_build_config_android.h b/libs/SDL3/include/build_config/SDL_build_config_android.h
index db5e3cebd..34f26270e 100644
--- a/libs/SDL3/include/build_config/SDL_build_config_android.h
+++ b/libs/SDL3/include/build_config/SDL_build_config_android.h
@@ -57,8 +57,10 @@
 #define HAVE_MALLOC 1
 #define HAVE_CALLOC 1
 #define HAVE_REALLOC    1
+#define HAVE_FDATASYNC 1
 #define HAVE_FREE   1
 #define HAVE_GETENV 1
+#define HAVE_GETHOSTNAME 1
 #define HAVE_PUTENV 1
 #define HAVE_SETENV 1
 #define HAVE_UNSETENV   1
diff --git a/libs/SDL3/include/build_config/SDL_build_config_emscripten.h b/libs/SDL3/include/build_config/SDL_build_config_emscripten.h
deleted file mode 100644
index d19cf8856..000000000
--- a/libs/SDL3/include/build_config/SDL_build_config_emscripten.h
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2024 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-#ifndef SDL_build_config_emscripten_h
-#define SDL_build_config_emscripten_h
-#define SDL_build_config_h_
-
-#include <SDL3/SDL_platform_defines.h>
-
-/**
- *  \file SDL_build_config_emscripten.h
- *
- *  This is a configuration that can be used to build SDL for Emscripten.
- */
-
-#define HAVE_GCC_ATOMICS 1
-
-/* Useful headers */
-#define HAVE_ALLOCA_H 1
-#define HAVE_FLOAT_H 1
-#define HAVE_ICONV_H 1
-#define HAVE_INTTYPES_H 1
-#define HAVE_LIMITS_H 1
-#define HAVE_MALLOC_H 1
-#define HAVE_MATH_H 1
-#define HAVE_MEMORY_H 1
-#define HAVE_SIGNAL_H 1
-#define HAVE_STDARG_H 1
-#define HAVE_STDBOOL_H 1
-#define HAVE_STDDEF_H 1
-#define HAVE_STDINT_H 1
-#define HAVE_STDIO_H 1
-#define HAVE_STDLIB_H 1
-#define HAVE_STRINGS_H 1
-#define HAVE_STRING_H 1
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_WCHAR_H 1
-
-/* C library functions */
-#define HAVE_LIBC   1
-#define HAVE_DLOPEN 1
-#define HAVE_MALLOC 1
-#define HAVE_CALLOC 1
-#define HAVE_REALLOC 1
-#define HAVE_FREE 1
-#define HAVE_GETENV 1
-#define HAVE_SETENV 1
-#define HAVE_PUTENV 1
-#define HAVE_UNSETENV 1
-#define HAVE_ABS 1
-#define HAVE_BCOPY 1
-#define HAVE_MEMSET 1
-#define HAVE_MEMCPY 1
-#define HAVE_MEMMOVE 1
-#define HAVE_MEMCMP 1
-#define HAVE_WCSLEN 1
-#define HAVE_WCSDUP 1
-#define HAVE_WCSSTR 1
-#define HAVE_WCSCMP 1
-#define HAVE_WCSNCMP 1
-#define HAVE_STRLEN 1
-#define HAVE_STRLCPY 1
-#define HAVE_STRLCAT 1
-#define HAVE_STRCHR 1
-#define HAVE_STRRCHR 1
-#define HAVE_STRSTR 1
-#define HAVE_STRTOK_R 1
-#define HAVE_STRTOL 1
-#define HAVE_STRTOUL 1
-#define HAVE_STRTOLL 1
-#define HAVE_STRTOULL 1
-#define HAVE_STRTOD 1
-#define HAVE_ATOI 1
-#define HAVE_ATOF 1
-#define HAVE_STRCMP 1
-#define HAVE_STRNCMP 1
-#define HAVE_SSCANF 1
-#define HAVE_VSSCANF 1
-#define HAVE_VSNPRINTF 1
-#define HAVE_ACOS 1
-#define HAVE_ACOSF 1
-#define HAVE_ASIN 1
-#define HAVE_ASINF 1
-#define HAVE_ATAN 1
-#define HAVE_ATANF 1
-#define HAVE_ATAN2 1
-#define HAVE_ATAN2F 1
-#define HAVE_CEIL 1
-#define HAVE_CEILF 1
-#define HAVE_COPYSIGN 1
-#define HAVE_COPYSIGNF 1
-#define HAVE_COS 1
-#define HAVE_COSF 1
-#define HAVE_EXP 1
-#define HAVE_EXPF 1
-#define HAVE_FABS 1
-#define HAVE_FABSF 1
-#define HAVE_FLOOR 1
-#define HAVE_FLOORF 1
-#define HAVE_FMOD 1
-#define HAVE_FMODF 1
-#define HAVE_LOG 1
-#define HAVE_LOGF 1
-#define HAVE_LOG10 1
-#define HAVE_LOG10F 1
-#define HAVE_LROUND 1
-#define HAVE_LROUNDF 1
-#define HAVE_POW 1
-#define HAVE_POWF 1
-#define HAVE_ROUND  1
-#define HAVE_ROUNDF 1
-#define HAVE_SCALBN 1
-#define HAVE_SCALBNF 1
-#define HAVE_SIN 1
-#define HAVE_SINF 1
-#define HAVE_SQRT 1
-#define HAVE_SQRTF 1
-#define HAVE_TAN 1
-#define HAVE_TANF 1
-#define HAVE_TRUNC 1
-#define HAVE_TRUNCF 1
-#define HAVE_FSEEKO 1
-#define HAVE_FSEEKO64 1
-#define HAVE_SIGACTION 1
-#define HAVE_SA_SIGACTION 1
-#define HAVE_SETJMP 1
-#define HAVE_NANOSLEEP 1
-#define HAVE_SYSCONF 1
-#define HAVE_CLOCK_GETTIME 1
-/* #undef HAVE_GETPAGESIZE */
-#define HAVE_ICONV 1
-
-/* SDL internal assertion support */
-/* #undef SDL_DEFAULT_ASSERT_LEVEL */
-
-#define SDL_HAPTIC_DISABLED 1
-#define SDL_HIDAPI_DISABLED 1
-#ifndef __EMSCRIPTEN_PTHREADS__
-#define SDL_THREADS_DISABLED 1
-#endif
-
-/* Enable various audio drivers */
-#define SDL_AUDIO_DRIVER_DISK 1
-#define SDL_AUDIO_DRIVER_DUMMY 1
-#define SDL_AUDIO_DRIVER_EMSCRIPTEN 1
-
-/* Enable various input drivers */
-#define SDL_JOYSTICK_EMSCRIPTEN 1
-#define SDL_JOYSTICK_VIRTUAL    1
-
-/* Enable various process implementations */
-#define SDL_PROCESS_DUMMY 1
-
-/* Enable various sensor drivers */
-#define SDL_SENSOR_DUMMY 1
-
-/* Enable various shared object loading systems */
-#define SDL_LOADSO_DLOPEN 1
-
-/* Enable various threading systems */
-#ifdef __EMSCRIPTEN_PTHREADS__
-#define SDL_THREAD_PTHREAD 1
-#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX 1
-#endif
-
-/* Enable various timer systems */
-#define SDL_TIMER_UNIX 1
-
-/* Enable various video drivers */
-#define SDL_VIDEO_DRIVER_EMSCRIPTEN 1
-
-#define SDL_VIDEO_RENDER_OGL_ES2 1
-
-/* Enable OpenGL support */
-/* #undef SDL_VIDEO_OPENGL */
-/* #undef SDL_VIDEO_OPENGL_ES */
-#define SDL_VIDEO_OPENGL_ES2 1
-/* #undef SDL_VIDEO_OPENGL_BGL */
-/* #undef SDL_VIDEO_OPENGL_CGL */
-/* #undef SDL_VIDEO_OPENGL_GLX */
-/* #undef SDL_VIDEO_OPENGL_WGL */
-#define SDL_VIDEO_OPENGL_EGL 1
-/* #undef SDL_VIDEO_OPENGL_OSMESA */
-/* #undef SDL_VIDEO_OPENGL_OSMESA_DYNAMIC */
-
-/* Enable system power support */
-#define SDL_POWER_EMSCRIPTEN 1
-
-/* Enable system filesystem support */
-#define SDL_FILESYSTEM_EMSCRIPTEN 1
-#define SDL_FSOPS_POSIX 1
-
-/* Enable the camera driver */
-#define SDL_CAMERA_DRIVER_EMSCRIPTEN  1
-
-#endif /* SDL_build_config_emscripten_h */
diff --git a/libs/SDL3/include/build_config/SDL_build_config_ios.h b/libs/SDL3/include/build_config/SDL_build_config_ios.h
index 2f40f6641..c606f2ef6 100644
--- a/libs/SDL3/include/build_config/SDL_build_config_ios.h
+++ b/libs/SDL3/include/build_config/SDL_build_config_ios.h
@@ -51,6 +51,7 @@
 #define HAVE_REALLOC    1
 #define HAVE_FREE   1
 #define HAVE_GETENV 1
+#define HAVE_GETHOSTNAME 1
 #define HAVE_PUTENV 1
 #define HAVE_SETENV 1
 #define HAVE_UNSETENV   1
@@ -227,4 +228,7 @@
 
 #define SDL_CAMERA_DRIVER_DUMMY 1
 
+/* Enable dialog subsystem */
+#define SDL_DIALOG_DUMMY 1
+
 #endif /* SDL_build_config_ios_h_ */
diff --git a/libs/SDL3/include/build_config/SDL_build_config_macos.h b/libs/SDL3/include/build_config/SDL_build_config_macos.h
index cd041b9e9..08bbd81d8 100644
--- a/libs/SDL3/include/build_config/SDL_build_config_macos.h
+++ b/libs/SDL3/include/build_config/SDL_build_config_macos.h
@@ -56,6 +56,7 @@
 #define HAVE_REALLOC    1
 #define HAVE_FREE   1
 #define HAVE_GETENV 1
+#define HAVE_GETHOSTNAME 1
 #define HAVE_SETENV 1
 #define HAVE_PUTENV 1
 #define HAVE_UNSETENV   1
diff --git a/libs/SDL3/include/build_config/SDL_build_config_minimal.h b/libs/SDL3/include/build_config/SDL_build_config_minimal.h
index 5dc4305a9..962dee351 100644
--- a/libs/SDL3/include/build_config/SDL_build_config_minimal.h
+++ b/libs/SDL3/include/build_config/SDL_build_config_minimal.h
@@ -96,4 +96,7 @@ typedef unsigned int uintptr_t;
 /* Enable the camera driver (src/camera/dummy/\*.c) */
 #define SDL_CAMERA_DRIVER_DUMMY  1
 
+/* Enable dialog subsystem */
+#define SDL_DIALOG_DUMMY 1
+
 #endif /* SDL_build_config_minimal_h_ */
diff --git a/libs/SDL3/include/build_config/SDL_build_config_ngage.h b/libs/SDL3/include/build_config/SDL_build_config_ngage.h
index a834bc09f..9ccf75a89 100644
--- a/libs/SDL3/include/build_config/SDL_build_config_ngage.h
+++ b/libs/SDL3/include/build_config/SDL_build_config_ngage.h
@@ -93,4 +93,7 @@ typedef unsigned long      uintptr_t;
 /* Enable the camera driver (src/camera/dummy/\*.c) */
 #define SDL_CAMERA_DRIVER_DUMMY  1
 
+/* Enable dialog subsystem */
+#define SDL_DIALOG_DUMMY 1
+
 #endif /* SDL_build_config_ngage_h_ */
diff --git a/libs/SDL3/include/build_config/SDL_build_config_xbox.h b/libs/SDL3/include/build_config/SDL_build_config_xbox.h
index 02e06799e..82b4f3c11 100644
--- a/libs/SDL3/include/build_config/SDL_build_config_xbox.h
+++ b/libs/SDL3/include/build_config/SDL_build_config_xbox.h
@@ -228,4 +228,7 @@
 /* Enable the camera driver (src/camera/dummy/\*.c) */
 #define SDL_CAMERA_DRIVER_DUMMY  1
 
+/* Enable dialog subsystem */
+#define SDL_DIALOG_DUMMY 1
+
 #endif /* SDL_build_config_wingdk_h_ */
diff --git a/libs/SDL3/include/build_config/SDL_revision.h.cmake b/libs/SDL3/include/build_config/SDL_revision.h.cmake
index bd94c5f2f..d002306f2 100644
--- a/libs/SDL3/include/build_config/SDL_revision.h.cmake
+++ b/libs/SDL3/include/build_config/SDL_revision.h.cmake
@@ -11,19 +11,19 @@
   freely, subject to the following restrictions:
 
   1. The origin of this software must not be misrepresented; you must not
-  claim that you wrote the original software. If you use this software
-  in a product, an acknowledgment in the product documentation would be
-  appreciated but is not required.
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
   2. Altered source versions must be plainly marked as such, and must not be
-  misrepresented as being the original software.
+     misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 */
 
 /**
-*  \file SDL_revision.h
-*
-*  Header file containing the SDL revision.
-*/
+ *  \file SDL_revision.h
+ *
+ *  Header file containing the SDL revision.
+ */
 
 #ifndef SDL_revision_h_
 #define SDL_revision_h_
diff --git a/libs/SDL3/src/SDL.c b/libs/SDL3/src/SDL.c
index c140ef36c..bb04a0ee6 100644
--- a/libs/SDL3/src/SDL.c
+++ b/libs/SDL3/src/SDL.c
@@ -55,6 +55,9 @@
 #include "video/SDL_surface_c.h"
 #include "video/SDL_video_c.h"
 #include "filesystem/SDL_filesystem_c.h"
+#ifdef SDL_PLATFORM_ANDROID
+#include "core/android/SDL_android.h"
+#endif
 
 #define SDL_INIT_EVERYTHING ~0U
 
@@ -251,10 +254,26 @@ void SDL_SetMainReady(void)
 // Initialize all the subsystems that require initialization before threads start
 void SDL_InitMainThread(void)
 {
+    static bool done_info = false;
+
     SDL_InitTLSData();
     SDL_InitEnvironment();
     SDL_InitTicks();
     SDL_InitFilesystem();
+
+    if (!done_info) {
+        const char *value;
+
+        value = SDL_GetAppMetadataProperty(SDL_PROP_APP_METADATA_NAME_STRING);
+        SDL_LogInfo(SDL_LOG_CATEGORY_SYSTEM, "App name: %s", value ? value : "<unspecified>");
+        value = SDL_GetAppMetadataProperty(SDL_PROP_APP_METADATA_VERSION_STRING);
+        SDL_LogInfo(SDL_LOG_CATEGORY_SYSTEM, "App version: %s", value ? value : "<unspecified>");
+        value = SDL_GetAppMetadataProperty(SDL_PROP_APP_METADATA_IDENTIFIER_STRING);
+        SDL_LogInfo(SDL_LOG_CATEGORY_SYSTEM, "App ID: %s", value ? value : "<unspecified>");
+        SDL_LogInfo(SDL_LOG_CATEGORY_SYSTEM, "SDL revision: %s", SDL_REVISION);
+
+        done_info = true;
+    }
 }
 
 static void SDL_QuitMainThread(void)
@@ -643,7 +662,9 @@ const char *SDL_GetRevision(void)
 // Get the name of the platform
 const char *SDL_GetPlatform(void)
 {
-#if defined(SDL_PLATFORM_AIX)
+#if defined(SDL_PLATFORM_PRIVATE)
+    return SDL_PLATFORM_PRIVATE_NAME;
+#elif defined(SDL_PLATFORM_AIX)
     return "AIX";
 #elif defined(SDL_PLATFORM_ANDROID)
     return "Android";
@@ -711,7 +732,6 @@ const char *SDL_GetPlatform(void)
 bool SDL_IsTablet(void)
 {
 #ifdef SDL_PLATFORM_ANDROID
-    extern bool SDL_IsAndroidTablet(void);
     return SDL_IsAndroidTablet();
 #elif defined(SDL_PLATFORM_IOS)
     extern bool SDL_IsIPad(void);
@@ -724,7 +744,6 @@ bool SDL_IsTablet(void)
 bool SDL_IsTV(void)
 {
 #ifdef SDL_PLATFORM_ANDROID
-    extern bool SDL_IsAndroidTV(void);
     return SDL_IsAndroidTV();
 #elif defined(SDL_PLATFORM_IOS)
     extern bool SDL_IsAppleTV(void);
@@ -734,6 +753,44 @@ bool SDL_IsTV(void)
 #endif
 }
 
+static SDL_Sandbox SDL_DetectSandbox(void)
+{
+#if defined(SDL_PLATFORM_LINUX)
+    if (access("/.flatpak-info", F_OK) == 0) {
+        return SDL_SANDBOX_FLATPAK;
+    }
+
+    /* For Snap, we check multiple variables because they might be set for
+     * unrelated reasons. This is the same thing WebKitGTK does. */
+    if (SDL_getenv("SNAP") && SDL_getenv("SNAP_NAME") && SDL_getenv("SNAP_REVISION")) {
+        return SDL_SANDBOX_SNAP;
+    }
+
+    if (access("/run/host/container-manager", F_OK) == 0) {
+        return SDL_SANDBOX_UNKNOWN;
+    }
+
+#elif defined(SDL_PLATFORM_MACOS)
+    if (SDL_getenv("APP_SANDBOX_CONTAINER_ID")) {
+        return SDL_SANDBOX_MACOS;
+    }
+#endif
+
+    return SDL_SANDBOX_NONE;
+}
+
+SDL_Sandbox SDL_GetSandbox(void)
+{
+    static SDL_Sandbox sandbox;
+    static bool sandbox_initialized;
+
+    if (!sandbox_initialized) {
+        sandbox = SDL_DetectSandbox();
+        sandbox_initialized = true;
+    }
+    return sandbox;
+}
+
 #ifdef SDL_PLATFORM_WIN32
 
 #if (!defined(HAVE_LIBC) || defined(__WATCOMC__)) && !defined(SDL_STATIC_LIB)
diff --git a/libs/SDL3/src/SDL_assert.c b/libs/SDL3/src/SDL_assert.c
index c60737f24..e7f75962e 100644
--- a/libs/SDL3/src/SDL_assert.c
+++ b/libs/SDL3/src/SDL_assert.c
@@ -245,7 +245,9 @@ static SDL_AssertState SDLCALL SDL_PromptAssertion(const SDL_AssertData *data, v
             state = (SDL_AssertState)selected;
         }
     } else {
-#ifdef SDL_PLATFORM_EMSCRIPTEN
+#ifdef SDL_PLATFORM_PRIVATE_ASSERT
+        SDL_PRIVATE_PROMPTASSERTION();
+#elif defined(SDL_PLATFORM_EMSCRIPTEN)
         // This is nasty, but we can't block on a custom UI.
         for (;;) {
             bool okay = true;
@@ -283,7 +285,7 @@ static SDL_AssertState SDLCALL SDL_PromptAssertion(const SDL_AssertData *data, v
                 break;
             }
         }
-#elif defined(HAVE_STDIO_H)
+#elif defined(HAVE_STDIO_H) && !defined(SDL_PLATFORM_3DS)
         // this is a little hacky.
         for (;;) {
             char buf[32];
@@ -310,6 +312,8 @@ static SDL_AssertState SDLCALL SDL_PromptAssertion(const SDL_AssertData *data, v
                 break;
             }
         }
+#else
+        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_WARNING, "Assertion Failed", message, window);
 #endif // HAVE_STDIO_H
     }
 
diff --git a/libs/SDL3/src/SDL_error.c b/libs/SDL3/src/SDL_error.c
index f5cb0c2c1..dca5a86c7 100644
--- a/libs/SDL3/src/SDL_error.c
+++ b/libs/SDL3/src/SDL_error.c
@@ -25,18 +25,29 @@
 #include "SDL_error_c.h"
 
 bool SDL_SetError(SDL_PRINTF_FORMAT_STRING const char *fmt, ...)
+{
+    va_list ap;
+    bool result;
+
+    va_start(ap, fmt);
+    result = SDL_SetErrorV(fmt, ap);
+    va_end(ap);
+    return result;
+}
+
+bool SDL_SetErrorV(SDL_PRINTF_FORMAT_STRING const char *fmt, va_list ap)
 {
     // Ignore call if invalid format pointer was passed
     if (fmt) {
-        va_list ap;
         int result;
         SDL_error *error = SDL_GetErrBuf(true);
+        va_list ap2;
 
         error->error = SDL_ErrorCodeGeneric;
 
-        va_start(ap, fmt);
-        result = SDL_vsnprintf(error->str, error->len, fmt, ap);
-        va_end(ap);
+        va_copy(ap2, ap);
+        result = SDL_vsnprintf(error->str, error->len, fmt, ap2);
+        va_end(ap2);
 
         if (result >= 0 && (size_t)result >= error->len && error->realloc_func) {
             size_t len = (size_t)result + 1;
@@ -44,9 +55,9 @@ bool SDL_SetError(SDL_PRINTF_FORMAT_STRING const char *fmt, ...)
             if (str) {
                 error->str = str;
                 error->len = len;
-                va_start(ap, fmt);
-                (void)SDL_vsnprintf(error->str, error->len, fmt, ap);
-                va_end(ap);
+                va_copy(ap2, ap);
+                (void)SDL_vsnprintf(error->str, error->len, fmt, ap2);
+                va_end(ap2);
             }
         }
 
diff --git a/libs/SDL3/src/SDL_hashtable.c b/libs/SDL3/src/SDL_hashtable.c
index a4828836c..c77f55fe3 100644
--- a/libs/SDL3/src/SDL_hashtable.c
+++ b/libs/SDL3/src/SDL_hashtable.c
@@ -95,7 +95,7 @@ SDL_HashTable *SDL_CreateHashTable(void *data,
     return table;
 }
 
-static SDL_INLINE Uint32 calc_hash(const SDL_HashTable *restrict table, const void *key)
+static SDL_INLINE Uint32 calc_hash(const SDL_HashTable *table, const void *key)
 {
     const Uint32 BitMixer = 0x9E3779B1u;
     return table->hash(key, table->data) * BitMixer;
@@ -112,7 +112,7 @@ static SDL_INLINE Uint32 get_probe_length(Uint32 zero_idx, Uint32 actual_idx, Ui
     return actual_idx - zero_idx;
 }
 
-static SDL_HashItem *find_item(const SDL_HashTable *restrict ht, const void *key, Uint32 hash, Uint32 *restrict i, Uint32 *restrict probe_len)
+static SDL_HashItem *find_item(const SDL_HashTable *ht, const void *key, Uint32 hash, Uint32 *i, Uint32 *probe_len)
 {
     Uint32 hash_mask = ht->hash_mask;
     Uint32 max_probe_len = ht->max_probe_len;
@@ -146,14 +146,14 @@ static SDL_HashItem *find_item(const SDL_HashTable *restrict ht, const void *key
     }
 }
 
-static SDL_HashItem *find_first_item(const SDL_HashTable *restrict ht, const void *key, Uint32 hash)
+static SDL_HashItem *find_first_item(const SDL_HashTable *ht, const void *key, Uint32 hash)
 {
     Uint32 i = hash & ht->hash_mask;
     Uint32 probe_len = 0;
     return find_item(ht, key, hash, &i, &probe_len);
 }
 
-static SDL_HashItem *insert_item(SDL_HashItem *restrict item_to_insert, SDL_HashItem *restrict table, Uint32 hash_mask, Uint32 *max_probe_len_ptr)
+static SDL_HashItem *insert_item(SDL_HashItem *item_to_insert, SDL_HashItem *table, Uint32 hash_mask, Uint32 *max_probe_len_ptr)
 {
     Uint32 idx = item_to_insert->hash & hash_mask;
     SDL_HashItem temp_item, *target = NULL;
@@ -213,7 +213,7 @@ static SDL_HashItem *insert_item(SDL_HashItem *restrict item_to_insert, SDL_Hash
     return target;
 }
 
-static void delete_item(SDL_HashTable *restrict ht, SDL_HashItem *item)
+static void delete_item(SDL_HashTable *ht, SDL_HashItem *item)
 {
     Uint32 hash_mask = ht->hash_mask;
     SDL_HashItem *table = ht->table;
@@ -241,7 +241,7 @@ static void delete_item(SDL_HashTable *restrict ht, SDL_HashItem *item)
     }
 }
 
-static bool resize(SDL_HashTable *restrict ht, Uint32 new_size)
+static bool resize(SDL_HashTable *ht, Uint32 new_size)
 {
     SDL_HashItem *old_table = ht->table;
     Uint32 old_size = ht->hash_mask + 1;
@@ -267,7 +267,7 @@ static bool resize(SDL_HashTable *restrict ht, Uint32 new_size)
     return true;
 }
 
-static bool maybe_resize(SDL_HashTable *restrict ht)
+static bool maybe_resize(SDL_HashTable *ht)
 {
     Uint32 capacity = ht->hash_mask + 1;
 
@@ -276,7 +276,7 @@ static bool maybe_resize(SDL_HashTable *restrict ht)
     }
 
     Uint32 max_load_factor = 217; // range: 0-255; 217 is roughly 85%
-    Uint32 resize_threshold = (max_load_factor * (Uint64)capacity) >> 8;
+    Uint32 resize_threshold = (Uint32)((max_load_factor * (Uint64)capacity) >> 8);
 
     if (ht->num_occupied_slots > resize_threshold) {
         return resize(ht, capacity * 2);
@@ -285,7 +285,7 @@ static bool maybe_resize(SDL_HashTable *restrict ht)
     return true;
 }
 
-bool SDL_InsertIntoHashTable(SDL_HashTable *restrict table, const void *key, const void *value)
+bool SDL_InsertIntoHashTable(SDL_HashTable *table, const void *key, const void *value)
 {
     SDL_HashItem *item;
     Uint32 hash;
@@ -307,6 +307,7 @@ bool SDL_InsertIntoHashTable(SDL_HashTable *restrict table, const void *key, con
     new_item.value = value;
     new_item.hash = hash;
     new_item.live = true;
+    new_item.probe_len = 0;
 
     table->num_occupied_slots++;
 
@@ -455,7 +456,7 @@ bool SDL_HashTableEmpty(SDL_HashTable *table)
     return !(table && table->num_occupied_slots);
 }
 
-static void nuke_all(SDL_HashTable *restrict table)
+static void nuke_all(SDL_HashTable *table)
 {
     void *data = table->data;
     SDL_HashItem *end = table->table + (table->hash_mask + 1);
@@ -468,7 +469,7 @@ static void nuke_all(SDL_HashTable *restrict table)
     }
 }
 
-void SDL_EmptyHashTable(SDL_HashTable *restrict table)
+void SDL_EmptyHashTable(SDL_HashTable *table)
 {
     if (table) {
         if (table->nuke) {
diff --git a/libs/SDL3/src/SDL_hints.c b/libs/SDL3/src/SDL_hints.c
index 6fcd8b8c2..91c2bfec9 100644
--- a/libs/SDL3/src/SDL_hints.c
+++ b/libs/SDL3/src/SDL_hints.c
@@ -83,13 +83,28 @@ static void SDLCALL CleanupHintProperty(void *userdata, void *value)
     SDL_free(hint);
 }
 
+static const char* GetHintEnvironmentVariable(const char *name)
+{
+    const char *result = SDL_getenv(name);
+    if (!result && name && *name) {
+        // fall back to old (SDL2) names of environment variables that
+        // are important to users (e.g. many use SDL_VIDEODRIVER=wayland)
+        if (SDL_strcmp(name, SDL_HINT_VIDEO_DRIVER) == 0) {
+            result = SDL_getenv("SDL_VIDEODRIVER");
+        } else if (SDL_strcmp(name, SDL_HINT_AUDIO_DRIVER) == 0) {
+            result = SDL_getenv("SDL_AUDIODRIVER");
+        }
+    }
+    return result;
+}
+
 bool SDL_SetHintWithPriority(const char *name, const char *value, SDL_HintPriority priority)
 {
     if (!name || !*name) {
         return SDL_InvalidParamError("name");
     }
 
-    const char *env = SDL_getenv(name);
+    const char *env = GetHintEnvironmentVariable(name);
     if (env && (priority < SDL_HINT_OVERRIDE)) {
         return SDL_SetError("An environment variable is taking priority");
     }
@@ -143,7 +158,7 @@ bool SDL_ResetHint(const char *name)
         return SDL_InvalidParamError("name");
     }
 
-    const char *env = SDL_getenv(name);
+    const char *env = GetHintEnvironmentVariable(name);
 
     const SDL_PropertiesID hints = GetHintProperties(false);
     if (!hints) {
@@ -182,7 +197,7 @@ static void SDLCALL ResetHintsCallback(void *userdata, SDL_PropertiesID hints, c
         return;  // uh...okay.
     }
 
-    const char *env = SDL_getenv(name);
+    const char *env = GetHintEnvironmentVariable(name);
     if ((!env && hint->value) || (env && !hint->value) || (env && SDL_strcmp(env, hint->value) != 0)) {
         SDL_HintWatch *entry = hint->callbacks;
         while (entry) {
@@ -213,7 +228,7 @@ const char *SDL_GetHint(const char *name)
         return NULL;
     }
 
-    const char *result = SDL_getenv(name);
+    const char *result = GetHintEnvironmentVariable(name);
 
     const SDL_PropertiesID hints = GetHintProperties(false);
     if (hints) {
@@ -237,10 +252,10 @@ int SDL_GetStringInteger(const char *value, int default_value)
     if (!value || !*value) {
         return default_value;
     }
-    if (*value == '0' || SDL_strcasecmp(value, "false") == 0) {
+    if (SDL_strcasecmp(value, "false") == 0) {
         return 0;
     }
-    if (*value == '1' || SDL_strcasecmp(value, "true") == 0) {
+    if (SDL_strcasecmp(value, "true") == 0) {
         return 1;
     }
     if (*value == '-' || SDL_isdigit(*value)) {
diff --git a/libs/SDL3/src/SDL_log.c b/libs/SDL3/src/SDL_log.c
index 1b9be017e..f9598487c 100644
--- a/libs/SDL3/src/SDL_log.c
+++ b/libs/SDL3/src/SDL_log.c
@@ -696,6 +696,9 @@ static void SDLCALL SDL_LogOutput(void *userdata, int category, SDL_LogPriority
 #endif // !defined(SDL_PLATFORM_GDK)
         length = SDL_strlen(GetLogPriorityPrefix(priority)) + SDL_strlen(message) + 1 + 1 + 1;
         output = SDL_small_alloc(char, length, &isstack);
+        if (!output) {
+            return;
+        }
         (void)SDL_snprintf(output, length, "%s%s\r\n", GetLogPriorityPrefix(priority), message);
         tstr = WIN_UTF8ToString(output);
 
@@ -772,6 +775,11 @@ static void SDLCALL SDL_LogOutput(void *userdata, int category, SDL_LogPriority
 #endif
 }
 
+SDL_LogOutputFunction SDL_GetDefaultLogOutputFunction(void)
+{
+    return SDL_LogOutput;
+}
+
 void SDL_GetLogOutputFunction(SDL_LogOutputFunction *callback, void **userdata)
 {
     SDL_LockMutex(SDL_log_function_lock);
diff --git a/libs/SDL3/src/SDL_utils.c b/libs/SDL3/src/SDL_utils.c
index b1fb89af6..8607798a3 100644
--- a/libs/SDL3/src/SDL_utils.c
+++ b/libs/SDL3/src/SDL_utils.c
@@ -20,7 +20,7 @@
 */
 #include "SDL_internal.h"
 
-#if defined(SDL_PLATFORM_UNIX) || defined(SDL_PLATFORM_APPLE)
+#if defined(HAVE_GETHOSTNAME) && !defined(SDL_PLATFORM_WINDOWS)
 #include <unistd.h>
 #endif
 
@@ -299,7 +299,7 @@ int SDL_URIToLocal(const char *src, char *dst)
             const size_t src_len = hostname_end - (src + 1);
             size_t hostname_len;
 
-#if defined(SDL_PLATFORM_UNIX) || defined(SDL_PLATFORM_APPLE)
+#if defined(HAVE_GETHOSTNAME) && !defined(SDL_PLATFORM_WINDOWS)
             char hostname[257];
             if (gethostname(hostname, 255) == 0) {
                 hostname[256] = '\0';
diff --git a/libs/SDL3/src/audio/SDL_audio.c b/libs/SDL3/src/audio/SDL_audio.c
index b232bef59..2de86cec5 100644
--- a/libs/SDL3/src/audio/SDL_audio.c
+++ b/libs/SDL3/src/audio/SDL_audio.c
@@ -26,6 +26,9 @@
 
 // Available audio drivers
 static const AudioBootStrap *const bootstrap[] = {
+#ifdef SDL_AUDIO_DRIVER_PRIVATE
+    &PRIVATEAUDIO_bootstrap,
+#endif
 #ifdef SDL_AUDIO_DRIVER_PULSEAUDIO
 #ifdef SDL_AUDIO_DRIVER_PIPEWIRE
     &PIPEWIRE_PREFERRED_bootstrap,
diff --git a/libs/SDL3/src/audio/SDL_sysaudio.h b/libs/SDL3/src/audio/SDL_sysaudio.h
index 8adfe9ab8..0ddc0af92 100644
--- a/libs/SDL3/src/audio/SDL_sysaudio.h
+++ b/libs/SDL3/src/audio/SDL_sysaudio.h
@@ -353,6 +353,7 @@ typedef struct AudioBootStrap
 } AudioBootStrap;
 
 // Not all of these are available in a given build. Use #ifdefs, etc.
+extern AudioBootStrap PRIVATEAUDIO_bootstrap;
 extern AudioBootStrap PIPEWIRE_PREFERRED_bootstrap;
 extern AudioBootStrap PIPEWIRE_bootstrap;
 extern AudioBootStrap PULSEAUDIO_bootstrap;
diff --git a/libs/SDL3/src/audio/SDL_wave.c b/libs/SDL3/src/audio/SDL_wave.c
index 9ce1c85b1..2facaaebd 100644
--- a/libs/SDL3/src/audio/SDL_wave.c
+++ b/libs/SDL3/src/audio/SDL_wave.c
@@ -2093,7 +2093,8 @@ bool SDL_LoadWAV_IO(SDL_IOStream *src, bool closeio, SDL_AudioSpec *spec, Uint8
 
     // Make sure we are passed a valid data source
     if (!src) {
-        goto done;  // Error may come from SDL_IOStream.
+        SDL_InvalidParamError("src");
+        goto done;
     } else if (!spec) {
         SDL_InvalidParamError("spec");
         goto done;
@@ -2132,6 +2133,19 @@ bool SDL_LoadWAV_IO(SDL_IOStream *src, bool closeio, SDL_AudioSpec *spec, Uint8
 
 bool SDL_LoadWAV(const char *path, SDL_AudioSpec *spec, Uint8 **audio_buf, Uint32 *audio_len)
 {
-    return SDL_LoadWAV_IO(SDL_IOFromFile(path, "rb"), 1, spec, audio_buf, audio_len);
+    SDL_IOStream *stream = SDL_IOFromFile(path, "rb");
+    if (!stream) {
+        if (spec) {
+            SDL_zerop(spec);
+        }
+        if (audio_buf) {
+            *audio_buf = NULL;
+        }
+        if (audio_len) {
+            *audio_len = 0;
+        }
+        return false;
+    }
+    return SDL_LoadWAV_IO(stream, true, spec, audio_buf, audio_len);
 }
 
diff --git a/libs/SDL3/src/audio/emscripten/SDL_emscriptenaudio.c b/libs/SDL3/src/audio/emscripten/SDL_emscriptenaudio.c
index 89ddbcd23..00ae39a69 100644
--- a/libs/SDL3/src/audio/emscripten/SDL_emscriptenaudio.c
+++ b/libs/SDL3/src/audio/emscripten/SDL_emscriptenaudio.c
@@ -40,6 +40,13 @@ static bool EMSCRIPTENAUDIO_PlayDevice(SDL_AudioDevice *device, const Uint8 *buf
 {
     const int framelen = SDL_AUDIO_FRAMESIZE(device->spec);
     MAIN_THREAD_EM_ASM({
+        /* Convert incoming buf pointer to a HEAPF32 offset. */
+        #ifdef __wasm64__
+        var buf = $0 / 4;
+        #else
+        var buf = $0 >>> 2;
+        #endif
+
         var SDL3 = Module['SDL3'];
         var numChannels = SDL3.audio_playback.currentPlaybackBuffer['numberOfChannels'];
         for (var c = 0; c < numChannels; ++c) {
@@ -49,7 +56,7 @@ static bool EMSCRIPTENAUDIO_PlayDevice(SDL_AudioDevice *device, const Uint8 *buf
             }
 
             for (var j = 0; j < $1; ++j) {
-                channelData[j] = HEAPF32[$0 + ((j*numChannels + c) << 2) >> 2];  // !!! FIXME: why are these shifts here?
+                channelData[j] = HEAPF32[buf + (j*numChannels + c)];
             }
         }
     }, buffer, buffer_size / framelen);
diff --git a/libs/SDL3/src/camera/SDL_camera.c b/libs/SDL3/src/camera/SDL_camera.c
index d220a3d66..c9c8f3b65 100644
--- a/libs/SDL3/src/camera/SDL_camera.c
+++ b/libs/SDL3/src/camera/SDL_camera.c
@@ -50,6 +50,9 @@ static const CameraBootStrap *const bootstrap[] = {
 #ifdef SDL_CAMERA_DRIVER_MEDIAFOUNDATION
     &MEDIAFOUNDATION_bootstrap,
 #endif
+#ifdef SDL_CAMERA_DRIVER_VITA
+    &VITACAMERA_bootstrap,
+#endif
 #ifdef SDL_CAMERA_DRIVER_DUMMY
     &DUMMYCAMERA_bootstrap,
 #endif
diff --git a/libs/SDL3/src/camera/SDL_syscamera.h b/libs/SDL3/src/camera/SDL_syscamera.h
index 51b88355e..4fa78e7a8 100644
--- a/libs/SDL3/src/camera/SDL_syscamera.h
+++ b/libs/SDL3/src/camera/SDL_syscamera.h
@@ -27,8 +27,6 @@
 
 #define DEBUG_CAMERA 0
 
-typedef struct SDL_Camera SDL_Camera;
-
 /* Backends should call this as devices are added to the system (such as
    a USB camera being plugged in), and should also be called for
    for every device found during DetectDevices(). */
@@ -217,5 +215,6 @@ extern CameraBootStrap COREMEDIA_bootstrap;
 extern CameraBootStrap ANDROIDCAMERA_bootstrap;
 extern CameraBootStrap EMSCRIPTENCAMERA_bootstrap;
 extern CameraBootStrap MEDIAFOUNDATION_bootstrap;
+extern CameraBootStrap VITACAMERA_bootstrap;
 
 #endif // SDL_syscamera_h_
diff --git a/libs/SDL3/src/camera/vita/SDL_camera_vita.c b/libs/SDL3/src/camera/vita/SDL_camera_vita.c
new file mode 100644
index 000000000..8c9bf429f
--- /dev/null
+++ b/libs/SDL3/src/camera/vita/SDL_camera_vita.c
@@ -0,0 +1,258 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2023 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "SDL_internal.h"
+
+#ifdef SDL_CAMERA_DRIVER_VITA
+
+#include "../SDL_syscamera.h"
+#include <psp2/camera.h>
+#include <psp2/kernel/sysmem.h>
+
+static struct  {
+    Sint32 w;
+    Sint32 h;
+    Sint32 res;
+} resolutions[] = {
+    {640, 480, SCE_CAMERA_RESOLUTION_640_480},
+    {320, 240, SCE_CAMERA_RESOLUTION_320_240},
+    {160, 120, SCE_CAMERA_RESOLUTION_160_120},
+    {352, 288, SCE_CAMERA_RESOLUTION_352_288},
+    {176, 144, SCE_CAMERA_RESOLUTION_176_144},
+    {480, 272, SCE_CAMERA_RESOLUTION_480_272},
+    {640, 360, SCE_CAMERA_RESOLUTION_640_360},
+    {0, 0, 0}
+};
+
+static Sint32 fps[] = {5, 10, 15, 20, 24, 25, 30, 60, 0};
+
+static void GatherCameraSpecs(Sint32 devid, CameraFormatAddData *add_data, char **fullname, SDL_CameraPosition *position)
+{
+    SDL_zerop(add_data);
+
+    if (devid == SCE_CAMERA_DEVICE_FRONT) {
+        *position = SDL_CAMERA_POSITION_FRONT_FACING;
+        *fullname = SDL_strdup("Front-facing camera");
+    } else if (devid == SCE_CAMERA_DEVICE_BACK) {
+        *position = SDL_CAMERA_POSITION_BACK_FACING;
+        *fullname = SDL_strdup("Back-facing camera");
+    }
+
+    if (!*fullname) {
+        *fullname = SDL_strdup("Generic camera");
+    }
+
+    // Note: there are actually more fps and pixelformats. Planar YUV is fastest. Support only YUV and integer fps for now
+    Sint32 idx = 0;
+    while (resolutions[idx].res > 0) {
+        Sint32 fps_idx = 0;
+        while (fps[fps_idx] > 0) {
+            SDL_AddCameraFormat(add_data, SDL_PIXELFORMAT_IYUV, SDL_COLORSPACE_BT601_LIMITED, resolutions[idx].w, resolutions[idx].h, fps[fps_idx], 1); /* SCE_CAMERA_FORMAT_ARGB */
+            fps_idx++;
+        }
+        idx++;
+    }
+}
+
+static bool FindVitaCameraByID(SDL_Camera *device, void *userdata)
+{
+    Sint32 devid = (Sint32) userdata;
+    return (devid == (Sint32)device->handle);
+}
+
+static void MaybeAddDevice(Sint32 devid)
+{
+    #if DEBUG_CAMERA
+    SDL_Log("CAMERA: MaybeAddDevice('%d')", devid);
+    #endif
+
+    if (SDL_FindPhysicalCameraByCallback(FindVitaCameraByID, (void *) devid)) {
+        return;  // already have this one.
+    }
+
+    SDL_CameraPosition position = SDL_CAMERA_POSITION_UNKNOWN;
+    char *fullname = NULL;
+    CameraFormatAddData add_data;
+    GatherCameraSpecs(devid, &add_data, &fullname, &position);
+
+    if (add_data.num_specs > 0) {
+        SDL_AddCamera(fullname, position, add_data.num_specs, add_data.specs, (void*)devid);
+    }
+
+    SDL_free(fullname);
+    SDL_free(add_data.specs);
+}
+
+static SceUID imbUid = -1;
+
+static void freeBuffers(SceCameraInfo* info)
+{
+    if (imbUid != -1) {
+        sceKernelFreeMemBlock(imbUid);
+        info->pIBase = NULL;
+        imbUid = -1;
+    }
+}
+
+static bool VITACAMERA_OpenDevice(SDL_Camera *device, const SDL_CameraSpec *spec)
+{
+    // we can't open more than one camera, so error-out early
+    if (imbUid != -1) {
+        return SDL_SetError("Only one camera can be active");
+    }
+
+    SceCameraInfo* info = (SceCameraInfo*)SDL_calloc(1, sizeof(SceCameraInfo));
+
+    info->size = sizeof(SceCameraInfo);
+    info->priority = SCE_CAMERA_PRIORITY_SHARE;
+    info->buffer = 0; // target buffer set by sceCameraOpen
+
+    info->framerate = spec->framerate_numerator / spec->framerate_denominator;
+
+    Sint32 idx = 0;
+    while (resolutions[idx].res > 0) {
+        if (spec->width == resolutions[idx].w && spec->height == resolutions[idx].h) {
+            info->resolution = resolutions[idx].res;
+            break;
+        }
+        idx++;
+    }
+
+    info->range = 1;
+    info->format = SCE_CAMERA_FORMAT_YUV420_PLANE;
+    info->pitch = 0; // same size surface
+
+    info->sizeIBase =  spec->width*spec->height;;
+    info->sizeUBase =  ((spec->width+1)/2) * ((spec->height+1) / 2);
+    info->sizeVBase =  ((spec->width+1)/2) * ((spec->height+1) / 2);
+
+    // PHYCONT memory size *must* be a multiple of 1MB, we can just always spend 2MB, since we don't use PHYCONT anywhere else
+    imbUid = sceKernelAllocMemBlock("CameraI", SCE_KERNEL_MEMBLOCK_TYPE_USER_MAIN_PHYCONT_NC_RW, 2*1024*1024 , NULL);
+    if (imbUid < 0)
+    {
+        return SDL_SetError("sceKernelAllocMemBlock error: 0x%08X", imbUid);
+    }
+    sceKernelGetMemBlockBase(imbUid, &(info->pIBase));
+
+    info->pUBase = info->pIBase + info->sizeIBase;
+    info->pVBase = info->pIBase + (info->sizeIBase + info->sizeUBase);
+
+    device->hidden = (struct SDL_PrivateCameraData *)info;
+
+    int ret = sceCameraOpen((int)device->handle, info);
+    if (ret == 0) {
+        ret = sceCameraStart((int)device->handle);
+        if (ret == 0) {
+            SDL_CameraPermissionOutcome(device, true);
+            return true;
+        } else {
+            SDL_SetError("sceCameraStart error: 0x%08X", imbUid);
+        }
+    } else {
+        SDL_SetError("sceCameraOpen error: 0x%08X", imbUid);
+    }
+
+    freeBuffers(info);
+
+    return false;
+}
+
+static void VITACAMERA_CloseDevice(SDL_Camera *device)
+{
+    if (device->hidden) {
+        sceCameraStop((int)device->handle);
+        sceCameraClose((int)device->handle);
+        freeBuffers((SceCameraInfo*)device->hidden);
+        SDL_free(device->hidden);
+    }
+}
+
+static bool VITACAMERA_WaitDevice(SDL_Camera *device)
+{
+    while(!sceCameraIsActive((int)device->handle)) {}
+    return true;
+}
+
+static SDL_CameraFrameResult VITACAMERA_AcquireFrame(SDL_Camera *device, SDL_Surface *frame, Uint64 *timestampNS)
+{
+    SceCameraRead read = {0};
+    read.size = sizeof(SceCameraRead);
+    read.mode = 1; // don't wait next frame
+
+    int ret = sceCameraRead((int)device->handle, &read);
+
+    if (ret < 0) {
+        SDL_SetError("sceCameraRead error: 0x%08X", ret);
+        return SDL_CAMERA_FRAME_ERROR;
+    }
+
+    *timestampNS = read.timestamp;
+
+    SceCameraInfo* info = (SceCameraInfo*)(device->hidden);
+
+    frame->pitch = info->width;
+    frame->pixels = SDL_aligned_alloc(SDL_GetSIMDAlignment(), info->sizeIBase + info->sizeUBase + info->sizeVBase);
+
+    if (frame->pixels) {
+        SDL_memcpy(frame->pixels, info->pIBase, info->sizeIBase + info->sizeUBase + info->sizeVBase);
+        return SDL_CAMERA_FRAME_READY;
+    }
+
+    return SDL_CAMERA_FRAME_ERROR;
+}
+
+static void VITACAMERA_ReleaseFrame(SDL_Camera *device, SDL_Surface *frame)
+{
+    SDL_aligned_free(frame->pixels);
+}
+
+static void VITACAMERA_DetectDevices(void)
+{
+    MaybeAddDevice(SCE_CAMERA_DEVICE_FRONT);
+    MaybeAddDevice(SCE_CAMERA_DEVICE_BACK);
+}
+
+static void VITACAMERA_FreeDeviceHandle(SDL_Camera *device)
+{
+}
+
+static void VITACAMERA_Deinitialize(void)
+{
+}
+
+static bool VITACAMERA_Init(SDL_CameraDriverImpl *impl)
+{
+    impl->DetectDevices = VITACAMERA_DetectDevices;
+    impl->OpenDevice = VITACAMERA_OpenDevice;
+    impl->CloseDevice = VITACAMERA_CloseDevice;
+    impl->WaitDevice = VITACAMERA_WaitDevice;
+    impl->AcquireFrame = VITACAMERA_AcquireFrame;
+    impl->ReleaseFrame = VITACAMERA_ReleaseFrame;
+    impl->FreeDeviceHandle = VITACAMERA_FreeDeviceHandle;
+    impl->Deinitialize = VITACAMERA_Deinitialize;
+
+    return true;
+}
+
+CameraBootStrap VITACAMERA_bootstrap = {
+    "vita", "SDL PSVita camera driver", VITACAMERA_Init, false
+};
+
+#endif  // SDL_CAMERA_DRIVER_VITA
diff --git a/libs/SDL3/src/core/SDL_core_unsupported.c b/libs/SDL3/src/core/SDL_core_unsupported.c
index b36c7f744..54fa095a8 100644
--- a/libs/SDL3/src/core/SDL_core_unsupported.c
+++ b/libs/SDL3/src/core/SDL_core_unsupported.c
@@ -146,8 +146,8 @@ const char *SDL_GetAndroidInternalStoragePath(void)
     return NULL;
 }
 
-SDL_DECLSPEC void *SDLCALL SDL_GetAndroidJNIEnv(void);
-void *SDL_GetAndroidJNIEnv(void)
+SDL_DECLSPEC JNIEnv *SDLCALL SDL_GetAndroidJNIEnv(void);
+JNIEnv *SDL_GetAndroidJNIEnv(void)
 {
     SDL_Unsupported();
     return NULL;
diff --git a/libs/SDL3/src/core/android/SDL_android.c b/libs/SDL3/src/core/android/SDL_android.c
index 78d8b7194..7f8b56ee8 100644
--- a/libs/SDL3/src/core/android/SDL_android.c
+++ b/libs/SDL3/src/core/android/SDL_android.c
@@ -2177,7 +2177,7 @@ bool Android_JNI_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *b
 //////////////////////////////////////////////////////////////////////////////
 */
 
-void *SDL_GetAndroidJNIEnv(void)
+JNIEnv *SDL_GetAndroidJNIEnv(void)
 {
     return Android_JNI_GetEnv();
 }
diff --git a/libs/SDL3/src/core/android/SDL_android.h b/libs/SDL3/src/core/android/SDL_android.h
index 4d810c99c..4c3fb5fbe 100644
--- a/libs/SDL3/src/core/android/SDL_android.h
+++ b/libs/SDL3/src/core/android/SDL_android.h
@@ -146,6 +146,7 @@ bool Android_JNI_OpenURL(const char *url);
 int SDL_GetAndroidSDKVersion(void);
 
 bool SDL_IsAndroidTablet(void);
+bool SDL_IsAndroidTV(void);
 
 // File Dialogs
 bool Android_JNI_OpenFileDialog(SDL_DialogFileCallback callback, void* userdata,
diff --git a/libs/SDL3/src/core/linux/SDL_dbus.c b/libs/SDL3/src/core/linux/SDL_dbus.c
index e3f132d86..3fd78c75c 100644
--- a/libs/SDL3/src/core/linux/SDL_dbus.c
+++ b/libs/SDL3/src/core/linux/SDL_dbus.c
@@ -20,7 +20,6 @@
 */
 #include "SDL_internal.h"
 #include "SDL_dbus.h"
-#include "SDL_sandbox.h"
 #include "../../stdlib/SDL_vacopy.h"
 
 #ifdef SDL_USE_LIBDBUS
@@ -443,7 +442,7 @@ bool SDL_DBus_ScreensaverInhibit(bool inhibit)
         return false;
     }
 
-    if (SDL_DetectSandbox() != SDL_SANDBOX_NONE) {
+    if (SDL_GetSandbox() != SDL_SANDBOX_NONE) {
         const char *bus_name = "org.freedesktop.portal.Desktop";
         const char *path = "/org/freedesktop/portal/desktop";
         const char *interface = "org.freedesktop.portal.Inhibit";
diff --git a/libs/SDL3/src/core/linux/SDL_sandbox.c b/libs/SDL3/src/core/linux/SDL_sandbox.c
deleted file mode 100644
index 5a8df8487..000000000
--- a/libs/SDL3/src/core/linux/SDL_sandbox.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2024 Sam Lantinga <slouken@libsdl.org>
-  Copyright (C) 2022 Collabora Ltd.
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-#include "SDL_internal.h"
-
-#include "SDL_sandbox.h"
-
-#include <unistd.h>
-
-SDL_Sandbox SDL_DetectSandbox(void)
-{
-    if (access("/.flatpak-info", F_OK) == 0) {
-        return SDL_SANDBOX_FLATPAK;
-    }
-
-    /* For Snap, we check multiple variables because they might be set for
-     * unrelated reasons. This is the same thing WebKitGTK does. */
-    if (SDL_getenv("SNAP") != NULL &&
-        SDL_getenv("SNAP_NAME") != NULL &&
-        SDL_getenv("SNAP_REVISION") != NULL) {
-        return SDL_SANDBOX_SNAP;
-    }
-
-    if (access("/run/host/container-manager", F_OK) == 0) {
-        return SDL_SANDBOX_UNKNOWN_CONTAINER;
-    }
-
-    return SDL_SANDBOX_NONE;
-}
diff --git a/libs/SDL3/src/core/linux/SDL_sandbox.h b/libs/SDL3/src/core/linux/SDL_sandbox.h
deleted file mode 100644
index d480658ce..000000000
--- a/libs/SDL3/src/core/linux/SDL_sandbox.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2024 Sam Lantinga <slouken@libsdl.org>
-  Copyright (C) 2022 Collabora Ltd.
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-#ifndef SDL_SANDBOX_H
-#define SDL_SANDBOX_H
-
-typedef enum
-{
-    SDL_SANDBOX_NONE = 0,
-    SDL_SANDBOX_UNKNOWN_CONTAINER,
-    SDL_SANDBOX_FLATPAK,
-    SDL_SANDBOX_SNAP,
-} SDL_Sandbox;
-
-// Return the sandbox type currently in use, if any
-SDL_Sandbox SDL_DetectSandbox(void);
-
-#endif // SDL_SANDBOX_H
diff --git a/libs/SDL3/src/core/windows/SDL_windows.h b/libs/SDL3/src/core/windows/SDL_windows.h
index 854c072ce..a6d857983 100644
--- a/libs/SDL3/src/core/windows/SDL_windows.h
+++ b/libs/SDL3/src/core/windows/SDL_windows.h
@@ -119,7 +119,7 @@ extern "C" {
 // Sets an error message based on a given HRESULT
 extern bool WIN_SetErrorFromHRESULT(const char *prefix, HRESULT hr);
 
-// Sets an error message based on GetLastError(). Always return -1.
+// Sets an error message based on GetLastError(). Always returns false.
 extern bool WIN_SetError(const char *prefix);
 
 // Load a function from combase.dll
diff --git a/libs/SDL3/src/core/windows/version.rc b/libs/SDL3/src/core/windows/version.rc
index 6deeea36d..6d267503e 100644
--- a/libs/SDL3/src/core/windows/version.rc
+++ b/libs/SDL3/src/core/windows/version.rc
@@ -9,8 +9,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,1,3,0
- PRODUCTVERSION 3,1,3,0
+ FILEVERSION 3,1,5,0
+ PRODUCTVERSION 3,1,5,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x40004L
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "\0"
             VALUE "FileDescription", "SDL\0"
-            VALUE "FileVersion", "3, 1, 3, 0\0"
+            VALUE "FileVersion", "3, 1, 5, 0\0"
             VALUE "InternalName", "SDL\0"
             VALUE "LegalCopyright", "Copyright (C) 2024 Sam Lantinga\0"
             VALUE "OriginalFilename", "SDL3.dll\0"
             VALUE "ProductName", "Simple DirectMedia Layer\0"
-            VALUE "ProductVersion", "3, 1, 3, 0\0"
+            VALUE "ProductVersion", "3, 1, 5, 0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/libs/SDL3/src/dialog/cocoa/SDL_cocoadialog.m b/libs/SDL3/src/dialog/cocoa/SDL_cocoadialog.m
index eee685e26..250066373 100644
--- a/libs/SDL3/src/dialog/cocoa/SDL_cocoadialog.m
+++ b/libs/SDL3/src/dialog/cocoa/SDL_cocoadialog.m
@@ -21,6 +21,8 @@
 #include "SDL_internal.h"
 #include "../SDL_dialog_utils.h"
 
+#ifdef SDL_PLATFORM_MACOS
+
 #import <Cocoa/Cocoa.h>
 #import <UniformTypeIdentifiers/UTType.h>
 
@@ -33,10 +35,6 @@
 
 void show_file_dialog(cocoa_FileDialogType type, SDL_DialogFileCallback callback, void* userdata, SDL_Window* window, const SDL_DialogFileFilter *filters, int nfilters, const char* default_location, bool allow_many)
 {
-#if defined(SDL_PLATFORM_TVOS) || defined(SDL_PLATFORM_IOS)
-    SDL_SetError("tvOS and iOS don't support path-based file dialogs");
-    callback(userdata, NULL, -1);
-#else
     if (filters) {
         const char *msg = validate_filters(filters, nfilters);
 
@@ -175,7 +173,6 @@ void show_file_dialog(cocoa_FileDialogType type, SDL_DialogFileCallback callback
             callback(userdata, files, -1);
         }
     }
-#endif // defined(SDL_PLATFORM_TVOS) || defined(SDL_PLATFORM_IOS)
 }
 
 void SDL_ShowOpenFileDialog(SDL_DialogFileCallback callback, void* userdata, SDL_Window* window, const SDL_DialogFileFilter *filters, int nfilters, const char* default_location, bool allow_many)
@@ -192,3 +189,5 @@ void SDL_ShowOpenFolderDialog(SDL_DialogFileCallback callback, void* userdata, S
 {
     show_file_dialog(FDT_OPENFOLDER, callback, userdata, window, NULL, 0, default_location, allow_many);
 }
+
+#endif // SDL_PLATFORM_MACOS
diff --git a/libs/SDL3/src/dialog/dummy/SDL_dummydialog.c b/libs/SDL3/src/dialog/dummy/SDL_dummydialog.c
index 209efe766..81ba1f59d 100644
--- a/libs/SDL3/src/dialog/dummy/SDL_dummydialog.c
+++ b/libs/SDL3/src/dialog/dummy/SDL_dummydialog.c
@@ -20,6 +20,8 @@
 */
 #include "SDL_internal.h"
 
+#ifdef SDL_DIALOG_DUMMY
+
 void SDL_ShowOpenFileDialog(SDL_DialogFileCallback callback, void* userdata, SDL_Window* window, const SDL_DialogFileFilter *filters, int nfilters, const char* default_location, bool allow_many)
 {
   SDL_Unsupported();
@@ -37,3 +39,5 @@ void SDL_ShowOpenFolderDialog(SDL_DialogFileCallback callback, void* userdata, S
   SDL_Unsupported();
   callback(userdata, NULL, -1);
 }
+
+#endif // SDL_DIALOG_DUMMY
diff --git a/libs/SDL3/src/dynapi/SDL_dynapi.c b/libs/SDL3/src/dynapi/SDL_dynapi.c
index c0078ad99..21b9bb80f 100644
--- a/libs/SDL3/src/dynapi/SDL_dynapi.c
+++ b/libs/SDL3/src/dynapi/SDL_dynapi.c
@@ -194,11 +194,6 @@ typedef struct
 #undef SDL_DYNAPI_PROC
 } SDL_DYNAPI_jump_table;
 
-// Predeclare the default functions for initializing the jump table.
-#define SDL_DYNAPI_PROC(rc, fn, params, args, ret) static rc SDLCALL fn##_DEFAULT params;
-#include "SDL_dynapi_procs.h"
-#undef SDL_DYNAPI_PROC
-
 // The actual jump table.
 static SDL_DYNAPI_jump_table jump_table = {
 #define SDL_DYNAPI_PROC(rc, fn, params, args, ret) fn##_DEFAULT,
diff --git a/libs/SDL3/src/dynapi/SDL_dynapi.h b/libs/SDL3/src/dynapi/SDL_dynapi.h
index be52f2c29..fd2e3b06a 100644
--- a/libs/SDL3/src/dynapi/SDL_dynapi.h
+++ b/libs/SDL3/src/dynapi/SDL_dynapi.h
@@ -43,7 +43,9 @@
 #include "TargetConditionals.h"
 #endif
 
-#if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE // probably not useful on iOS.
+#if defined(SDL_PLATFORM_PRIVATE) // probably not useful on private platforms.
+#define SDL_DYNAMIC_API 0
+#elif defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE // probably not useful on iOS.
 #define SDL_DYNAMIC_API 0
 #elif defined(SDL_PLATFORM_ANDROID) // probably not useful on Android.
 #define SDL_DYNAMIC_API 0
diff --git a/libs/SDL3/src/dynapi/SDL_dynapi.sym b/libs/SDL3/src/dynapi/SDL_dynapi.sym
index ab7704b53..e0efccc2b 100644
--- a/libs/SDL3/src/dynapi/SDL_dynapi.sym
+++ b/libs/SDL3/src/dynapi/SDL_dynapi.sym
@@ -1176,6 +1176,13 @@ SDL3_0.0.0 {
     SDL_wcsnstr;
     SDL_wcsstr;
     SDL_wcstol;
+    SDL_StepBackUTF8;
+    SDL_DelayPrecise;
+    SDL_CalculateGPUTextureFormatSize;
+    SDL_SetErrorV;
+    SDL_GetDefaultLogOutputFunction;
+    SDL_RenderDebugText;
+    SDL_GetSandbox;
     # extra symbols go here (don't modify this line)
   local: *;
 };
diff --git a/libs/SDL3/src/dynapi/SDL_dynapi_overrides.h b/libs/SDL3/src/dynapi/SDL_dynapi_overrides.h
index ab9ac5352..4f5f16d88 100644
--- a/libs/SDL3/src/dynapi/SDL_dynapi_overrides.h
+++ b/libs/SDL3/src/dynapi/SDL_dynapi_overrides.h
@@ -1201,3 +1201,10 @@
 #define SDL_wcsnstr SDL_wcsnstr_REAL
 #define SDL_wcsstr SDL_wcsstr_REAL
 #define SDL_wcstol SDL_wcstol_REAL
+#define SDL_StepBackUTF8 SDL_StepBackUTF8_REAL
+#define SDL_DelayPrecise SDL_DelayPrecise_REAL
+#define SDL_CalculateGPUTextureFormatSize SDL_CalculateGPUTextureFormatSize_REAL
+#define SDL_SetErrorV SDL_SetErrorV_REAL
+#define SDL_GetDefaultLogOutputFunction SDL_GetDefaultLogOutputFunction_REAL
+#define SDL_RenderDebugText SDL_RenderDebugText_REAL
+#define SDL_GetSandbox SDL_GetSandbox_REAL
diff --git a/libs/SDL3/src/dynapi/SDL_dynapi_procs.h b/libs/SDL3/src/dynapi/SDL_dynapi_procs.h
index 2c1ef580c..165de3c06 100644
--- a/libs/SDL3/src/dynapi/SDL_dynapi_procs.h
+++ b/libs/SDL3/src/dynapi/SDL_dynapi_procs.h
@@ -255,7 +255,7 @@ SDL_DYNAPI_PROC(const char*,SDL_GetAndroidCachePath,(void),(),return)
 SDL_DYNAPI_PROC(const char*,SDL_GetAndroidExternalStoragePath,(void),(),return)
 SDL_DYNAPI_PROC(Uint32,SDL_GetAndroidExternalStorageState,(void),(),return)
 SDL_DYNAPI_PROC(const char*,SDL_GetAndroidInternalStoragePath,(void),(),return)
-SDL_DYNAPI_PROC(void*,SDL_GetAndroidJNIEnv,(void),(),return)
+SDL_DYNAPI_PROC(JNIEnv*,SDL_GetAndroidJNIEnv,(void),(),return)
 SDL_DYNAPI_PROC(int,SDL_GetAndroidSDKVersion,(void),(),return)
 SDL_DYNAPI_PROC(const char*,SDL_GetAppMetadataProperty,(const char *a),(a),return)
 SDL_DYNAPI_PROC(SDL_AssertionHandler,SDL_GetAssertionHandler,(void **a),(a),return)
@@ -1207,3 +1207,10 @@ SDL_DYNAPI_PROC(size_t,SDL_wcsnlen,(const wchar_t *a, size_t b),(a,b),return)
 SDL_DYNAPI_PROC(wchar_t*,SDL_wcsnstr,(const wchar_t *a, const wchar_t *b, size_t c),(a,b,c),return)
 SDL_DYNAPI_PROC(wchar_t*,SDL_wcsstr,(const wchar_t *a, const wchar_t *b),(a,b),return)
 SDL_DYNAPI_PROC(long,SDL_wcstol,(const wchar_t *a, wchar_t **b, int c),(a,b,c),return)
+SDL_DYNAPI_PROC(Uint32,SDL_StepBackUTF8,(const char *a, const char **b),(a,b),return)
+SDL_DYNAPI_PROC(void,SDL_DelayPrecise,(Uint64 a),(a),)
+SDL_DYNAPI_PROC(Uint32,SDL_CalculateGPUTextureFormatSize,(SDL_GPUTextureFormat a, Uint32 b, Uint32 c, Uint32 d),(a,b,c,d),return)
+SDL_DYNAPI_PROC(bool,SDL_SetErrorV,(SDL_PRINTF_FORMAT_STRING const char *a,va_list b),(a,b),return)
+SDL_DYNAPI_PROC(SDL_LogOutputFunction,SDL_GetDefaultLogOutputFunction,(void),(),return)
+SDL_DYNAPI_PROC(bool,SDL_RenderDebugText,(SDL_Renderer *a,float b,float c,const char *d),(a,b,c,d),return)
+SDL_DYNAPI_PROC(SDL_Sandbox,SDL_GetSandbox,(void),(),return)
diff --git a/libs/SDL3/src/dynapi/gendynapi.py b/libs/SDL3/src/dynapi/gendynapi.py
index 651174aa0..dae72d241 100644
--- a/libs/SDL3/src/dynapi/gendynapi.py
+++ b/libs/SDL3/src/dynapi/gendynapi.py
@@ -24,60 +24,68 @@
 #  output looks sane (git diff, it adds to existing files), and commit it.
 #  It keeps the dynamic API jump table operating correctly.
 #
-#  OS-specific API:
+#  Platform-specific API:
 #   After running the script, you have to manually add #ifdef SDL_PLATFORM_WIN32
-#   or similar around the function in 'SDL_dynapi_procs.h'
+#   or similar around the function in 'SDL_dynapi_procs.h'.
 #
 
 import argparse
+import dataclasses
 import json
+import logging
 import os
-import pathlib
+from pathlib import Path
 import pprint
 import re
 
 
-SDL_ROOT = pathlib.Path(__file__).resolve().parents[2]
+SDL_ROOT = Path(__file__).resolve().parents[2]
 
 SDL_INCLUDE_DIR = SDL_ROOT / "include/SDL3"
 SDL_DYNAPI_PROCS_H = SDL_ROOT / "src/dynapi/SDL_dynapi_procs.h"
 SDL_DYNAPI_OVERRIDES_H = SDL_ROOT / "src/dynapi/SDL_dynapi_overrides.h"
 SDL_DYNAPI_SYM = SDL_ROOT / "src/dynapi/SDL_dynapi.sym"
 
-full_API = []
+RE_EXTERN_C = re.compile(r'.*extern[ "]*C[ "].*')
+RE_COMMENT_REMOVE_CONTENT = re.compile(r'\/\*.*\*/')
+RE_PARSING_FUNCTION = re.compile(r'(.*SDLCALL[^\(\)]*) ([a-zA-Z0-9_]+) *\((.*)\) *;.*')
 
+#eg:
+# void (SDLCALL *callback)(void*, int)
+# \1(\2)\3
+RE_PARSING_CALLBACK = re.compile(r'([^\(\)]*)\(([^\(\)]+)\)(.*)')
 
-def main():
 
-    # Parse 'sdl_dynapi_procs_h' file to find existing functions
-    existing_procs = find_existing_procs()
+logger = logging.getLogger(__name__)
 
-    # Get list of SDL headers
-    sdl_list_includes = get_header_list()
 
-    reg_externC = re.compile(r'.*extern[ "]*C[ "].*')
-    reg_comment_remove_content = re.compile(r'\/\*.*\*/')
-    reg_parsing_function = re.compile(r'(.*SDLCALL[^\(\)]*) ([a-zA-Z0-9_]+) *\((.*)\) *;.*')
+@dataclasses.dataclass(frozen=True)
+class SdlProcedure:
+    retval: str
+    name: str
+    parameter: list[str]
+    parameter_name: list[str]
+    header: str
+    comment: str
 
-    #eg:
-    # void (SDLCALL *callback)(void*, int)
-    # \1(\2)\3
-    reg_parsing_callback = re.compile(r'([^\(\)]*)\(([^\(\)]+)\)(.*)')
+    @property
+    def variadic(self) -> bool:
+        return "..." in self.parameter
 
-    for filename in sdl_list_includes:
-        if args.debug:
-            print("Parse header: %s" % filename)
 
-        input = open(filename)
+def parse_header(header_path: Path) -> list[SdlProcedure]:
+    logger.debug("Parse header: %s", header_path)
 
-        parsing_function = False
-        current_func = ""
-        parsing_comment = False
-        current_comment = ""
+    header_procedures = []
 
-        ignore_wiki_documentation = False
+    parsing_function = False
+    current_func = ""
+    parsing_comment = False
+    current_comment = ""
+    ignore_wiki_documentation = False
 
-        for line in input:
+    with header_path.open() as f:
+        for line in f:
 
             # Skip lines if we're in a wiki documentation block.
             if ignore_wiki_documentation:
@@ -95,13 +103,13 @@ def main():
                 continue
 
             # Discard "extern C" line
-            match = reg_externC.match(line)
+            match = RE_EXTERN_C.match(line)
             if match:
                 continue
 
             # Remove one line comment // ...
-            # eg: extern SDL_DECLSPEC SDL_hid_device * SDLCALL SDL_hid_open_path(const char *path, int bExclusive /* = false */);
-            line = reg_comment_remove_content.sub('', line)
+            # eg: extern SDL_DECLSPEC SDL_hid_device * SDLCALL SDL_hid_open_path(const char *path, int bExclusive /* = false */)
+            line = RE_COMMENT_REMOVE_CONTENT.sub('', line)
 
             # Get the comment block /* ... */ across several lines
             match_start = "/*" in line
@@ -131,14 +139,14 @@ def main():
                     continue
                 # Start grabbing the new function
                 current_func = line.strip()
-                parsing_function = True;
+                parsing_function = True
 
             # If it contains ';', then the function is complete
             if ";" not in current_func:
                 continue
 
             # Got function/comment, reset vars
-            parsing_function = False;
+            parsing_function = False
             func = current_func
             comment = current_comment
             current_func = ""
@@ -146,47 +154,48 @@ def main():
 
             # Discard if it doesn't contain 'SDLCALL'
             if "SDLCALL" not in func:
-                if args.debug:
-                    print("  Discard, doesn't have SDLCALL: " + func)
+                logger.debug("  Discard, doesn't have SDLCALL: %r", func)
                 continue
 
             # Discard if it contains 'SDLMAIN_DECLSPEC' (these are not SDL symbols).
             if "SDLMAIN_DECLSPEC" in func:
-                if args.debug:
-                    print("  Discard, has SDLMAIN_DECLSPEC: " + func)
+                logger.debug("  Discard, has SDLMAIN_DECLSPEC: %r", func)
                 continue
 
-            if args.debug:
-                print("  Raw data: " + func);
+            logger.debug("Raw data: %r", func)
 
             # Replace unusual stuff...
-            func = func.replace(" SDL_PRINTF_VARARG_FUNC(1)", "");
-            func = func.replace(" SDL_PRINTF_VARARG_FUNC(2)", "");
-            func = func.replace(" SDL_PRINTF_VARARG_FUNC(3)", "");
-            func = func.replace(" SDL_PRINTF_VARARG_FUNCV(1)", "");
-            func = func.replace(" SDL_PRINTF_VARARG_FUNCV(2)", "");
-            func = func.replace(" SDL_PRINTF_VARARG_FUNCV(3)", "");
-            func = func.replace(" SDL_WPRINTF_VARARG_FUNC(3)", "");
-            func = func.replace(" SDL_WPRINTF_VARARG_FUNCV(3)", "");
-            func = func.replace(" SDL_SCANF_VARARG_FUNC(2)", "");
-            func = func.replace(" SDL_SCANF_VARARG_FUNCV(2)", "");
-            func = func.replace(" SDL_ANALYZER_NORETURN", "");
-            func = func.replace(" SDL_MALLOC", "");
-            func = func.replace(" SDL_ALLOC_SIZE2(1, 2)", "");
-            func = func.replace(" SDL_ALLOC_SIZE(2)", "");
-            func = re.sub(r" SDL_ACQUIRE\(.*\)", "", func);
-            func = re.sub(r" SDL_ACQUIRE_SHARED\(.*\)", "", func);
-            func = re.sub(r" SDL_TRY_ACQUIRE\(.*\)", "", func);
-            func = re.sub(r" SDL_TRY_ACQUIRE_SHARED\(.*\)", "", func);
-            func = re.sub(r" SDL_RELEASE\(.*\)", "", func);
-            func = re.sub(r" SDL_RELEASE_SHARED\(.*\)", "", func);
-            func = re.sub(r" SDL_RELEASE_GENERIC\(.*\)", "", func);
+            func = func.replace(" SDL_PRINTF_VARARG_FUNC(1)", "")
+            func = func.replace(" SDL_PRINTF_VARARG_FUNC(2)", "")
+            func = func.replace(" SDL_PRINTF_VARARG_FUNC(3)", "")
+            func = func.replace(" SDL_PRINTF_VARARG_FUNCV(1)", "")
+            func = func.replace(" SDL_PRINTF_VARARG_FUNCV(2)", "")
+            func = func.replace(" SDL_PRINTF_VARARG_FUNCV(3)", "")
+            func = func.replace(" SDL_WPRINTF_VARARG_FUNC(3)", "")
+            func = func.replace(" SDL_WPRINTF_VARARG_FUNCV(3)", "")
+            func = func.replace(" SDL_SCANF_VARARG_FUNC(2)", "")
+            func = func.replace(" SDL_SCANF_VARARG_FUNCV(2)", "")
+            func = func.replace(" SDL_ANALYZER_NORETURN", "")
+            func = func.replace(" SDL_MALLOC", "")
+            func = func.replace(" SDL_ALLOC_SIZE2(1, 2)", "")
+            func = func.replace(" SDL_ALLOC_SIZE(2)", "")
+            func = re.sub(r" SDL_ACQUIRE\(.*\)", "", func)
+            func = re.sub(r" SDL_ACQUIRE_SHARED\(.*\)", "", func)
+            func = re.sub(r" SDL_TRY_ACQUIRE\(.*\)", "", func)
+            func = re.sub(r" SDL_TRY_ACQUIRE_SHARED\(.*\)", "", func)
+            func = re.sub(r" SDL_RELEASE\(.*\)", "", func)
+            func = re.sub(r" SDL_RELEASE_SHARED\(.*\)", "", func)
+            func = re.sub(r" SDL_RELEASE_GENERIC\(.*\)", "", func)
+            func = re.sub(r"([ (),])(SDL_IN_BYTECAP\([^)]*\))", r"\1", func)
+            func = re.sub(r"([ (),])(SDL_OUT_BYTECAP\([^)]*\))", r"\1", func)
+            func = re.sub(r"([ (),])(SDL_INOUT_Z_CAP\([^)]*\))", r"\1", func)
+            func = re.sub(r"([ (),])(SDL_OUT_Z_CAP\([^)]*\))", r"\1", func)
 
             # Should be a valid function here
-            match = reg_parsing_function.match(func)
+            match = RE_PARSING_FUNCTION.match(func)
             if not match:
-                print("Cannot parse: "+ func)
-                exit(-1)
+                logger.error("Cannot parse: %s", func)
+                raise ValueError(func)
 
             func_ret = match.group(1)
             func_name = match.group(2)
@@ -198,11 +207,8 @@ def main():
             func_ret = func_ret.replace('extern', ' ')
             func_ret = func_ret.replace('SDLCALL', ' ')
             func_ret = func_ret.replace('SDL_DECLSPEC', ' ')
+            func_ret, _ = re.subn('([ ]{2,})', ' ', func_ret)
             # Remove trailing spaces in front of '*'
-            tmp = ""
-            while func_ret != tmp:
-                tmp = func_ret
-                func_ret = func_ret.replace('  ', ' ')
             func_ret = func_ret.replace(' *', '*')
             func_ret = func_ret.strip()
 
@@ -246,10 +252,10 @@ def main():
 
                 # parameter is a callback
                 if '(' in t:
-                    match = reg_parsing_callback.match(t)
+                    match = RE_PARSING_CALLBACK.match(t)
                     if not match:
-                        print("cannot parse callback: " + t);
-                        exit(-1)
+                        logger.error("cannot parse callback: %s", t)
+                        raise ValueError(t)
                     a = match.group(1).strip()
                     b = match.group(2).strip()
                     c = match.group(3).strip()
@@ -257,7 +263,7 @@ def main():
                     try:
                         (param_type, param_name) = b.rsplit('*', 1)
                     except:
-                        param_type = t;
+                        param_type = t
                         param_name = "param_name_not_specified"
 
                     # bug rsplit ??
@@ -281,7 +287,7 @@ def main():
                     try:
                         (param_type, param_name) = t.rsplit('*', 1)
                     except:
-                        param_type = t;
+                        param_type = t
                         param_name = "param_name_not_specified"
 
                     # bug rsplit ??
@@ -305,7 +311,7 @@ def main():
                     try:
                         (param_type, param_name) = t.rsplit(' ', 1)
                     except:
-                        param_type = t;
+                        param_type = t
                         param_name = "param_name_not_specified"
 
                     val = param_type.strip() + " REWRITE_NAME"
@@ -317,268 +323,220 @@ def main():
                 func_param_type.append(val)
                 func_param_name.append(param_name.strip())
 
-            new_proc = {}
-            # Return value type
-            new_proc['retval'] = func_ret
-            # List of parameters (type + anonymized param name 'REWRITE_NAME')
-            new_proc['parameter'] = func_param_type
-            # Real parameter name, or 'param_name_not_specified'
-            new_proc['parameter_name'] = func_param_name
-            # Function name
-            new_proc['name'] = func_name
-            # Header file
-            new_proc['header'] = os.path.basename(filename)
-            # Function comment
-            new_proc['comment'] = comment
+            new_proc = SdlProcedure(
+                retval=func_ret,                # Return value type
+                name=func_name,                 # Function name
+                comment=comment,                # Function comment
+                header=header_path.name,        # Header file
+                parameter=func_param_type,      # List of parameters (type + anonymized param name 'REWRITE_NAME')
+                parameter_name=func_param_name, # Real parameter name, or 'param_name_not_specified'
+            )
 
-            full_API.append(new_proc)
+            header_procedures.append(new_proc)
 
-            if args.debug:
-                pprint.pprint(new_proc);
-                print("\n")
+            if logger.getEffectiveLevel() <= logging.DEBUG:
+                logger.debug("%s", pprint.pformat(new_proc))
 
-            if func_name not in existing_procs:
-                print("NEW " + func)
-                add_dyn_api(new_proc)
+    return header_procedures
 
-        # For-End line in input
 
-        input.close()
-    # For-End parsing all files of sdl_list_includes
+# Dump API into a json file
+def full_API_json(path: Path, procedures: list[SdlProcedure]):
+    with path.open('w', newline='') as f:
+        json.dump([dataclasses.asdict(proc) for proc in procedures], f, indent=4, sort_keys=True)
+        logger.info("dump API to '%s'", path)
 
-    # Dump API into a json file
-    full_API_json()
 
-    # Check comment formatting
-    check_comment();
+class CallOnce:
+    def __init__(self, cb):
+        self._cb = cb
+        self._called = False
+    def __call__(self, *args, **kwargs):
+        if self._called:
+            return
+        self._called = True
+        self._cb(*args, **kwargs)
 
-# Dump API into a json file
-def full_API_json():
-    if args.dump:
-        filename = 'sdl.json'
-        with open(filename, 'w', newline='') as f:
-            json.dump(full_API, f, indent=4, sort_keys=True)
-            print("dump API to '%s'" % filename);
 
 # Check public function comments are correct
-def check_comment_header():
-    if not check_comment_header.done:
-        check_comment_header.done = True
-        print("")
-        print("Please fix following warning(s):")
-        print("-------------------------------")
+def print_check_comment_header():
+    logger.warning("")
+    logger.warning("Please fix following warning(s):")
+    logger.warning("--------------------------------")
 
 
-def check_comment():
+def check_documentations(procedures: list[SdlProcedure]) -> None:
 
-    check_comment_header.done = False
+    check_comment_header = CallOnce(print_check_comment_header)
 
-    # Check \param
-    for i in full_API:
-        comment = i['comment']
-        name = i['name']
-        retval = i['retval']
-        header = i['header']
+    warning_header_printed = False
 
-        expected = len(i['parameter'])
+    # Check \param
+    for proc in procedures:
+        expected = len(proc.parameter)
         if expected == 1:
-            if i['parameter'][0] == 'void':
-                expected = 0;
-        count = comment.count("\\param")
+            if proc.parameter[0] == 'void':
+                expected = 0
+        count = proc.comment.count("\\param")
         if count != expected:
             # skip SDL_stdinc.h
-            if header != 'SDL_stdinc.h':
+            if proc.header != 'SDL_stdinc.h':
                 # Warning mismatch \param and function prototype
                 check_comment_header()
-                print("  In file %s: function %s() has %d '\\param' but expected %d" % (header, name, count, expected));
+                logger.warning("  In file %s: function %s() has %d '\\param' but expected %d", proc.header, proc.name, count, expected)
 
         # Warning check \param uses the correct parameter name
         # skip SDL_stdinc.h
-        if header != 'SDL_stdinc.h':
-            parameter_name = i['parameter_name']
-            for n in parameter_name:
-                if n != "" and "\\param " + n not in comment and "\\param[out] " + n not in comment:
+        if proc.header != 'SDL_stdinc.h':
+            for n in proc.parameter_name:
+                if n != "" and "\\param " + n not in proc.comment and "\\param[out] " + n not in proc.comment:
                     check_comment_header()
-                    print("  In file %s: function %s() missing '\\param %s'" % (header, name, n));
-
+                    logger.warning("  In file %s: function %s() missing '\\param %s'", proc.header, proc.name, n)
 
     # Check \returns
-    for i in full_API:
-        comment = i['comment']
-        name = i['name']
-        retval = i['retval']
-        header = i['header']
-
+    for proc in procedures:
         expected = 1
-        if retval == 'void':
-            expected = 0;
+        if proc.retval == 'void':
+            expected = 0
 
-        count = comment.count("\\returns")
+        count = proc.comment.count("\\returns")
         if count != expected:
             # skip SDL_stdinc.h
-            if header != 'SDL_stdinc.h':
+            if proc.header != 'SDL_stdinc.h':
                 # Warning mismatch \param and function prototype
                 check_comment_header()
-                print("  In file %s: function %s() has %d '\\returns' but expected %d" % (header, name, count, expected));
+                logger.warning("  In file %s: function %s() has %d '\\returns' but expected %d" % (proc.header, proc.name, count, expected))
 
     # Check \since
-    for i in full_API:
-        comment = i['comment']
-        name = i['name']
-        retval = i['retval']
-        header = i['header']
-
+    for proc in procedures:
         expected = 1
-        count = comment.count("\\since")
+        count = proc.comment.count("\\since")
         if count != expected:
             # skip SDL_stdinc.h
-            if header != 'SDL_stdinc.h':
+            if proc.header != 'SDL_stdinc.h':
                 # Warning mismatch \param and function prototype
                 check_comment_header()
-                print("  In file %s: function %s() has %d '\\since' but expected %d" % (header, name, count, expected));
-
+                logger.warning("  In file %s: function %s() has %d '\\since' but expected %d" % (proc.header, proc.name, count, expected))
 
 
 # Parse 'sdl_dynapi_procs_h' file to find existing functions
-def find_existing_procs():
+def find_existing_proc_names() -> list[str]:
     reg = re.compile(r'SDL_DYNAPI_PROC\([^,]*,([^,]*),.*\)')
     ret = []
-    input = open(SDL_DYNAPI_PROCS_H)
-
-    for line in input:
-        match = reg.match(line)
-        if not match:
-            continue
-        existing_func = match.group(1)
-        ret.append(existing_func);
-        # print(existing_func)
-    input.close()
 
+    with SDL_DYNAPI_PROCS_H.open() as f:
+        for line in f:
+            match = reg.match(line)
+            if not match:
+                continue
+            existing_func = match.group(1)
+            ret.append(existing_func)
     return ret
 
 # Get list of SDL headers
-def get_header_list():
-    reg = re.compile(r'^.*\.h$')
+def get_header_list() -> list[Path]:
     ret = []
-    tmp = os.listdir(SDL_INCLUDE_DIR)
 
-    for f in tmp:
+    for f in SDL_INCLUDE_DIR.iterdir():
         # Only *.h files
-        match = reg.match(f)
-        if not match:
-            if args.debug:
-                print("Skip %s" % f)
-            continue
-        ret.append(SDL_INCLUDE_DIR / f)
+        if f.is_file() and f.suffix == ".h":
+            ret.append(f)
+        else:
+            logger.debug("Skip %s", f)
 
     return ret
 
 # Write the new API in files: _procs.h _overrivides.h and .sym
-def add_dyn_api(proc):
-    func_name = proc['name']
-    func_ret = proc['retval']
-    func_argtype = proc['parameter']
-
-
-    # File: SDL_dynapi_procs.h
-    #
-    # Add at last
-    # SDL_DYNAPI_PROC(SDL_EGLConfig,SDL_EGL_GetCurrentConfig,(void),(),return)
-    f = open(SDL_DYNAPI_PROCS_H, "a", newline="")
-    dyn_proc = "SDL_DYNAPI_PROC(" + func_ret + "," + func_name + ",("
-
-    i = ord('a')
-    remove_last = False
-    for argtype in func_argtype:
-
-        # Special case, void has no parameter name
-        if argtype == "void":
-            dyn_proc += "void"
-            continue
-
-        # Var name: a, b, c, ...
-        varname = chr(i)
-        i += 1
-
-        tmp = argtype.replace("REWRITE_NAME", varname)
-        dyn_proc += tmp + ", "
-        remove_last = True
-
-    # remove last 2 char ', '
-    if remove_last:
-        dyn_proc = dyn_proc[:-1]
-        dyn_proc = dyn_proc[:-1]
-
-    dyn_proc += "),("
-
-    i = ord('a')
-    remove_last = False
-    for argtype in func_argtype:
-
+def add_dyn_api(proc: SdlProcedure) -> None:
+    decl_args: list[str] = []
+    call_args = []
+    for i, argtype in enumerate(proc.parameter):
         # Special case, void has no parameter name
         if argtype == "void":
-            continue
-
-        # Special case, '...' has no parameter name
-        if argtype == "...":
+            assert len(decl_args) == 0
+            assert len(proc.parameter) == 1
+            decl_args.append("void")
             continue
 
         # Var name: a, b, c, ...
-        varname = chr(i)
-        i += 1
+        varname = chr(ord('a') + i)
 
-        dyn_proc += varname + ","
-        remove_last = True
+        decl_args.append(argtype.replace("REWRITE_NAME", varname))
+        if argtype != "...":
+            call_args.append(varname)
 
-    # remove last char ','
-    if remove_last:
-        dyn_proc = dyn_proc[:-1]
+    macro_args = (
+        proc.retval,
+        proc.name,
+        "({})".format(",".join(decl_args)),
+        "({})".format(",".join(call_args)),
+        "" if proc.retval == "void" else "return",
+    )
 
-    dyn_proc += "),"
-
-    if func_ret != "void":
-        dyn_proc += "return"
-    dyn_proc += ")"
-    f.write(dyn_proc + "\n")
-    f.close()
+    # File: SDL_dynapi_procs.h
+    #
+    # Add at last
+    # SDL_DYNAPI_PROC(SDL_EGLConfig,SDL_EGL_GetCurrentConfig,(void),(),return)
+    with SDL_DYNAPI_PROCS_H.open("a", newline="") as f:
+        if proc.variadic:
+            f.write("#ifndef SDL_DYNAPI_PROC_NO_VARARGS\n")
+        f.write(f"SDL_DYNAPI_PROC({','.join(macro_args)})\n")
+        if proc.variadic:
+            f.write("#endif\n")
 
     # File: SDL_dynapi_overrides.h
     #
     # Add at last
     # "#define SDL_DelayNS SDL_DelayNS_REAL
     f = open(SDL_DYNAPI_OVERRIDES_H, "a", newline="")
-    f.write("#define " + func_name + " " + func_name + "_REAL\n")
+    f.write(f"#define {proc.name} {proc.name}_REAL\n")
     f.close()
 
     # File: SDL_dynapi.sym
     #
     # Add before "extra symbols go here" line
-    input = open(SDL_DYNAPI_SYM)
-    new_input = []
-    for line in input:
-        if "extra symbols go here" in line:
-            new_input.append("    " + func_name + ";\n")
-        new_input.append(line)
-    input.close()
-    f = open(SDL_DYNAPI_SYM, 'w', newline='')
-    for line in new_input:
-        f.write(line)
-    f.close()
+    with SDL_DYNAPI_SYM.open() as f:
+        new_input = []
+        for line in f:
+            if "extra symbols go here" in line:
+                new_input.append(f"    {proc.name};\n")
+            new_input.append(line)
 
+    with SDL_DYNAPI_SYM.open('w', newline='') as f:
+        for line in new_input:
+            f.write(line)
 
-if __name__ == '__main__':
 
+def main():
     parser = argparse.ArgumentParser()
-    parser.add_argument('--dump', help='output all SDL API into a .json file', action='store_true')
-    parser.add_argument('--debug', help='add debug traces', action='store_true')
+    parser.set_defaults(loglevel=logging.INFO)
+    parser.add_argument('--dump', nargs='?', default=None, const="sdl.json", metavar="JSON", help='output all SDL API into a .json file')
+    parser.add_argument('--debug', action='store_const', const=logging.DEBUG, dest="loglevel", help='add debug traces')
     args = parser.parse_args()
 
-    try:
-        main()
-    except Exception as e:
-        print(e)
-        exit(-1)
+    logging.basicConfig(level=args.loglevel, format='[%(levelname)s] %(message)s')
 
-    print("done!")
-    exit(0)
+    # Get list of SDL headers
+    sdl_list_includes = get_header_list()
+    procedures = []
+    for filename in sdl_list_includes:
+        header_procedures = parse_header(filename)
+        procedures.extend(header_procedures)
 
+    # Parse 'sdl_dynapi_procs_h' file to find existing functions
+    existing_proc_names = find_existing_proc_names()
+    for procedure in procedures:
+        if procedure.name not in existing_proc_names:
+            logger.info("NEW %s", procedure.name)
+            add_dyn_api(procedure)
+
+    if args.dump:
+        # Dump API into a json file
+        full_API_json(path=Path(args.dump), procedures=procedures)
+
+    # Check comment formatting
+    check_documentations(procedures)
+
+
+if __name__ == '__main__':
+    raise SystemExit(main())
diff --git a/libs/SDL3/src/events/SDL_keyboard.c b/libs/SDL3/src/events/SDL_keyboard.c
index 438311ba4..ae533db8c 100644
--- a/libs/SDL3/src/events/SDL_keyboard.c
+++ b/libs/SDL3/src/events/SDL_keyboard.c
@@ -637,7 +637,12 @@ void SDL_SendKeyboardUnicodeKey(Uint64 timestamp, Uint32 ch)
 {
     SDL_Keyboard *keyboard = &SDL_keyboard;
     SDL_Keymod modstate = SDL_KMOD_NONE;
-    SDL_Scancode scancode = SDL_GetKeymapScancode(keyboard->keymap, ch, &modstate);
+    SDL_Scancode scancode;
+
+    if (ch == '\n') {
+        ch = SDLK_RETURN;
+    }
+    scancode = SDL_GetKeymapScancode(keyboard->keymap, ch, &modstate);
 
     // Make sure we have this keycode in our keymap
     if (scancode == SDL_SCANCODE_UNKNOWN && ch < SDLK_SCANCODE_MASK) {
diff --git a/libs/SDL3/src/file/SDL_iostream.c b/libs/SDL3/src/file/SDL_iostream.c
index db9f05d9a..1fa652f89 100644
--- a/libs/SDL3/src/file/SDL_iostream.c
+++ b/libs/SDL3/src/file/SDL_iostream.c
@@ -133,7 +133,13 @@ static HANDLE SDLCALL windows_file_open(const char *filename, const char *mode)
 #endif
 
     if (h == INVALID_HANDLE_VALUE) {
-        SDL_SetError("Couldn't open %s", filename);
+        char *error;
+        if (SDL_asprintf(&error, "Couldn't open %s", filename) > 0) {
+            WIN_SetError(error);
+            SDL_free(error);
+        } else {
+            SDL_SetError("Couldn't open %s", filename);
+        }
     }
     return h;
 }
@@ -370,10 +376,8 @@ static int SDL_fdatasync(int fd)
     result = fcntl(fd, F_FULLFSYNC);
 #elif defined(SDL_PLATFORM_HAIKU)
     result = fsync(fd);
-#elif defined(_POSIX_SYNCHRONIZED_IO)  // POSIX defines this if fdatasync() exists, so we don't need a CMake test.
-#ifndef SDL_PLATFORM_RISCOS  // !!! FIXME: however, RISCOS doesn't have the symbol...maybe we need to link to an extra library or something?
+#elif defined(HAVE_FDATASYNC)
     result = fdatasync(fd);
-#endif
 #endif
     return result;
 }
@@ -1204,7 +1208,14 @@ void *SDL_LoadFile_IO(SDL_IOStream *src, size_t *datasize, bool closeio)
 
 void *SDL_LoadFile(const char *file, size_t *datasize)
 {
-    return SDL_LoadFile_IO(SDL_IOFromFile(file, "rb"), datasize, true);
+    SDL_IOStream *stream = SDL_IOFromFile(file, "rb");
+    if (!stream) {
+        if (datasize) {
+            *datasize = 0;
+        }
+        return NULL;
+    }
+    return SDL_LoadFile_IO(stream, datasize, true);
 }
 
 SDL_PropertiesID SDL_GetIOProperties(SDL_IOStream *context)
diff --git a/libs/SDL3/src/gpu/SDL_gpu.c b/libs/SDL3/src/gpu/SDL_gpu.c
index a1210a0ea..1957ac5de 100644
--- a/libs/SDL3/src/gpu/SDL_gpu.c
+++ b/libs/SDL3/src/gpu/SDL_gpu.c
@@ -386,22 +386,22 @@ static const SDL_GPUBootstrap * SDL_GPUSelectBackend(SDL_PropertiesID props)
         return NULL;
     }
 
-    if (SDL_GetBooleanProperty(props, SDL_PROP_GPU_DEVICE_CREATE_SHADERS_PRIVATE_BOOL, false)) {
+    if (SDL_GetBooleanProperty(props, SDL_PROP_GPU_DEVICE_CREATE_SHADERS_PRIVATE_BOOLEAN, false)) {
         format_flags |= SDL_GPU_SHADERFORMAT_PRIVATE;
     }
-    if (SDL_GetBooleanProperty(props, SDL_PROP_GPU_DEVICE_CREATE_SHADERS_SPIRV_BOOL, false)) {
+    if (SDL_GetBooleanProperty(props, SDL_PROP_GPU_DEVICE_CREATE_SHADERS_SPIRV_BOOLEAN, false)) {
         format_flags |= SDL_GPU_SHADERFORMAT_SPIRV;
     }
-    if (SDL_GetBooleanProperty(props, SDL_PROP_GPU_DEVICE_CREATE_SHADERS_DXBC_BOOL, false)) {
+    if (SDL_GetBooleanProperty(props, SDL_PROP_GPU_DEVICE_CREATE_SHADERS_DXBC_BOOLEAN, false)) {
         format_flags |= SDL_GPU_SHADERFORMAT_DXBC;
     }
-    if (SDL_GetBooleanProperty(props, SDL_PROP_GPU_DEVICE_CREATE_SHADERS_DXIL_BOOL, false)) {
+    if (SDL_GetBooleanProperty(props, SDL_PROP_GPU_DEVICE_CREATE_SHADERS_DXIL_BOOLEAN, false)) {
         format_flags |= SDL_GPU_SHADERFORMAT_DXIL;
     }
-    if (SDL_GetBooleanProperty(props, SDL_PROP_GPU_DEVICE_CREATE_SHADERS_MSL_BOOL, false)) {
+    if (SDL_GetBooleanProperty(props, SDL_PROP_GPU_DEVICE_CREATE_SHADERS_MSL_BOOLEAN, false)) {
         format_flags |= SDL_GPU_SHADERFORMAT_MSL;
     }
-    if (SDL_GetBooleanProperty(props, SDL_PROP_GPU_DEVICE_CREATE_SHADERS_METALLIB_BOOL, false)) {
+    if (SDL_GetBooleanProperty(props, SDL_PROP_GPU_DEVICE_CREATE_SHADERS_METALLIB_BOOLEAN, false)) {
         format_flags |= SDL_GPU_SHADERFORMAT_METALLIB;
     }
 
@@ -449,24 +449,24 @@ static void SDL_GPU_FillProperties(
     const char *name)
 {
     if (format_flags & SDL_GPU_SHADERFORMAT_PRIVATE) {
-        SDL_SetBooleanProperty(props, SDL_PROP_GPU_DEVICE_CREATE_SHADERS_PRIVATE_BOOL, true);
+        SDL_SetBooleanProperty(props, SDL_PROP_GPU_DEVICE_CREATE_SHADERS_PRIVATE_BOOLEAN, true);
     }
     if (format_flags & SDL_GPU_SHADERFORMAT_SPIRV) {
-        SDL_SetBooleanProperty(props, SDL_PROP_GPU_DEVICE_CREATE_SHADERS_SPIRV_BOOL, true);
+        SDL_SetBooleanProperty(props, SDL_PROP_GPU_DEVICE_CREATE_SHADERS_SPIRV_BOOLEAN, true);
     }
     if (format_flags & SDL_GPU_SHADERFORMAT_DXBC) {
-        SDL_SetBooleanProperty(props, SDL_PROP_GPU_DEVICE_CREATE_SHADERS_DXBC_BOOL, true);
+        SDL_SetBooleanProperty(props, SDL_PROP_GPU_DEVICE_CREATE_SHADERS_DXBC_BOOLEAN, true);
     }
     if (format_flags & SDL_GPU_SHADERFORMAT_DXIL) {
-        SDL_SetBooleanProperty(props, SDL_PROP_GPU_DEVICE_CREATE_SHADERS_DXIL_BOOL, true);
+        SDL_SetBooleanProperty(props, SDL_PROP_GPU_DEVICE_CREATE_SHADERS_DXIL_BOOLEAN, true);
     }
     if (format_flags & SDL_GPU_SHADERFORMAT_MSL) {
-        SDL_SetBooleanProperty(props, SDL_PROP_GPU_DEVICE_CREATE_SHADERS_MSL_BOOL, true);
+        SDL_SetBooleanProperty(props, SDL_PROP_GPU_DEVICE_CREATE_SHADERS_MSL_BOOLEAN, true);
     }
     if (format_flags & SDL_GPU_SHADERFORMAT_METALLIB) {
-        SDL_SetBooleanProperty(props, SDL_PROP_GPU_DEVICE_CREATE_SHADERS_METALLIB_BOOL, true);
+        SDL_SetBooleanProperty(props, SDL_PROP_GPU_DEVICE_CREATE_SHADERS_METALLIB_BOOLEAN, true);
     }
-    SDL_SetBooleanProperty(props, SDL_PROP_GPU_DEVICE_CREATE_DEBUGMODE_BOOL, debug_mode);
+    SDL_SetBooleanProperty(props, SDL_PROP_GPU_DEVICE_CREATE_DEBUGMODE_BOOLEAN, debug_mode);
     SDL_SetStringProperty(props, SDL_PROP_GPU_DEVICE_CREATE_NAME_STRING, name);
 }
 #endif // SDL_GPU_DISABLED
@@ -526,8 +526,8 @@ SDL_GPUDevice *SDL_CreateGPUDeviceWithProperties(SDL_PropertiesID props)
 
     selectedBackend = SDL_GPUSelectBackend(props);
     if (selectedBackend != NULL) {
-        debug_mode = SDL_GetBooleanProperty(props, SDL_PROP_GPU_DEVICE_CREATE_DEBUGMODE_BOOL, true);
-        preferLowPower = SDL_GetBooleanProperty(props, SDL_PROP_GPU_DEVICE_CREATE_PREFERLOWPOWER_BOOL, false);
+        debug_mode = SDL_GetBooleanProperty(props, SDL_PROP_GPU_DEVICE_CREATE_DEBUGMODE_BOOLEAN, true);
+        preferLowPower = SDL_GetBooleanProperty(props, SDL_PROP_GPU_DEVICE_CREATE_PREFERLOWPOWER_BOOLEAN, false);
 
         result = selectedBackend->CreateDevice(debug_mode, preferLowPower, props);
         if (result != NULL) {
@@ -619,6 +619,7 @@ Uint32 SDL_GPUTextureFormatTexelBlockSize(
     case SDL_GPU_TEXTUREFORMAT_R16_UNORM:
     case SDL_GPU_TEXTUREFORMAT_R16_SNORM:
     case SDL_GPU_TEXTUREFORMAT_R16_UINT:
+    case SDL_GPU_TEXTUREFORMAT_D16_UNORM:
         return 2;
     case SDL_GPU_TEXTUREFORMAT_R8G8B8A8_UNORM:
     case SDL_GPU_TEXTUREFORMAT_B8G8R8A8_UNORM:
@@ -633,7 +634,12 @@ Uint32 SDL_GPUTextureFormatTexelBlockSize(
     case SDL_GPU_TEXTUREFORMAT_R16G16_UINT:
     case SDL_GPU_TEXTUREFORMAT_R16G16_UNORM:
     case SDL_GPU_TEXTUREFORMAT_R16G16_SNORM:
+    case SDL_GPU_TEXTUREFORMAT_D24_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_D32_FLOAT:
+    case SDL_GPU_TEXTUREFORMAT_D24_UNORM_S8_UINT:
         return 4;
+    case SDL_GPU_TEXTUREFORMAT_D32_FLOAT_S8_UINT:
+        return 5;
     case SDL_GPU_TEXTUREFORMAT_R16G16B16A16_FLOAT:
     case SDL_GPU_TEXTUREFORMAT_R16G16B16A16_UNORM:
     case SDL_GPU_TEXTUREFORMAT_R16G16B16A16_SNORM:
@@ -642,6 +648,49 @@ Uint32 SDL_GPUTextureFormatTexelBlockSize(
         return 8;
     case SDL_GPU_TEXTUREFORMAT_R32G32B32A32_FLOAT:
         return 16;
+    case SDL_GPU_TEXTUREFORMAT_ASTC_4x4_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_5x4_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_5x5_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_6x5_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_6x6_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_8x5_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_8x6_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_8x8_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_10x5_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_10x6_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_10x8_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_10x10_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_12x10_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_12x12_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_4x4_UNORM_SRGB:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_5x4_UNORM_SRGB:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_5x5_UNORM_SRGB:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_6x5_UNORM_SRGB:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_6x6_UNORM_SRGB:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_8x5_UNORM_SRGB:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_8x6_UNORM_SRGB:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_8x8_UNORM_SRGB:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_10x5_UNORM_SRGB:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_10x6_UNORM_SRGB:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_10x8_UNORM_SRGB:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_10x10_UNORM_SRGB:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_12x10_UNORM_SRGB:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_12x12_UNORM_SRGB:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_4x4_FLOAT:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_5x4_FLOAT:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_5x5_FLOAT:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_6x5_FLOAT:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_6x6_FLOAT:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_8x5_FLOAT:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_8x6_FLOAT:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_8x8_FLOAT:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_10x5_FLOAT:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_10x6_FLOAT:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_10x8_FLOAT:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_10x10_FLOAT:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_12x10_FLOAT:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_12x12_FLOAT:
+        return 16;
     default:
         SDL_assert_release(!"Unrecognized TextureFormat!");
         return 0;
@@ -2753,3 +2802,16 @@ void SDL_ReleaseGPUFence(
         device->driverData,
         fence);
 }
+
+Uint32 SDL_CalculateGPUTextureFormatSize(
+    SDL_GPUTextureFormat format,
+    Uint32 width,
+    Uint32 height,
+    Uint32 depth_or_layer_count)
+{
+    Uint32 blockWidth = SDL_max(Texture_GetBlockWidth(format), 1);
+    Uint32 blockHeight = SDL_max(Texture_GetBlockHeight(format), 1);
+    Uint32 blocksPerRow = (width + blockWidth - 1) / blockWidth;
+    Uint32 blocksPerColumn = (height + blockHeight - 1) / blockHeight;
+    return depth_or_layer_count * blocksPerRow * blocksPerColumn * SDL_GPUTextureFormatTexelBlockSize(format);
+}
diff --git a/libs/SDL3/src/gpu/SDL_sysgpu.h b/libs/SDL3/src/gpu/SDL_sysgpu.h
index ce48a5eb2..7f9ef6ca4 100644
--- a/libs/SDL3/src/gpu/SDL_sysgpu.h
+++ b/libs/SDL3/src/gpu/SDL_sysgpu.h
@@ -69,7 +69,7 @@ typedef struct BlitPipelineCacheEntry
 
 // Internal Helper Utilities
 
-#define SDL_GPU_TEXTUREFORMAT_MAX_ENUM_VALUE        (SDL_GPU_TEXTUREFORMAT_D32_FLOAT_S8_UINT + 1)
+#define SDL_GPU_TEXTUREFORMAT_MAX_ENUM_VALUE        (SDL_GPU_TEXTUREFORMAT_ASTC_12x12_FLOAT + 1)
 #define SDL_GPU_VERTEXELEMENTFORMAT_MAX_ENUM_VALUE  (SDL_GPU_VERTEXELEMENTFORMAT_HALF4 + 1)
 #define SDL_GPU_COMPAREOP_MAX_ENUM_VALUE            (SDL_GPU_COMPAREOP_ALWAYS + 1)
 #define SDL_GPU_STENCILOP_MAX_ENUM_VALUE            (SDL_GPU_STENCILOP_DECREMENT_AND_WRAP + 1)
@@ -78,10 +78,54 @@ typedef struct BlitPipelineCacheEntry
 #define SDL_GPU_SWAPCHAINCOMPOSITION_MAX_ENUM_VALUE (SDL_GPU_SWAPCHAINCOMPOSITION_HDR10_ST2048 + 1)
 #define SDL_GPU_PRESENTMODE_MAX_ENUM_VALUE          (SDL_GPU_PRESENTMODE_MAILBOX + 1)
 
-static inline Sint32 Texture_GetBlockSize(
+static inline Sint32 Texture_GetBlockWidth(
     SDL_GPUTextureFormat format)
 {
     switch (format) {
+    case SDL_GPU_TEXTUREFORMAT_ASTC_12x10_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_12x12_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_12x10_UNORM_SRGB:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_12x12_UNORM_SRGB:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_12x10_FLOAT:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_12x12_FLOAT:
+        return 12;
+    case SDL_GPU_TEXTUREFORMAT_ASTC_10x5_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_10x6_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_10x8_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_10x10_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_10x5_UNORM_SRGB:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_10x6_UNORM_SRGB:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_10x8_UNORM_SRGB:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_10x10_UNORM_SRGB:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_10x5_FLOAT:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_10x6_FLOAT:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_10x8_FLOAT:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_10x10_FLOAT:
+        return 10;
+    case SDL_GPU_TEXTUREFORMAT_ASTC_8x5_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_8x6_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_8x8_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_8x5_UNORM_SRGB:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_8x6_UNORM_SRGB:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_8x8_UNORM_SRGB:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_8x5_FLOAT:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_8x6_FLOAT:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_8x8_FLOAT:
+        return 8;
+    case SDL_GPU_TEXTUREFORMAT_ASTC_6x5_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_6x6_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_6x5_UNORM_SRGB:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_6x6_UNORM_SRGB:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_6x5_FLOAT:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_6x6_FLOAT:
+        return 6;
+    case SDL_GPU_TEXTUREFORMAT_ASTC_5x4_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_5x5_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_5x4_UNORM_SRGB:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_5x5_UNORM_SRGB:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_5x4_FLOAT:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_5x5_FLOAT:
+        return 5;
     case SDL_GPU_TEXTUREFORMAT_BC1_RGBA_UNORM:
     case SDL_GPU_TEXTUREFORMAT_BC2_RGBA_UNORM:
     case SDL_GPU_TEXTUREFORMAT_BC3_RGBA_UNORM:
@@ -93,6 +137,9 @@ static inline Sint32 Texture_GetBlockSize(
     case SDL_GPU_TEXTUREFORMAT_BC1_RGBA_UNORM_SRGB:
     case SDL_GPU_TEXTUREFORMAT_BC3_RGBA_UNORM_SRGB:
     case SDL_GPU_TEXTUREFORMAT_BC7_RGBA_UNORM_SRGB:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_4x4_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_4x4_UNORM_SRGB:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_4x4_FLOAT:
         return 4;
     case SDL_GPU_TEXTUREFORMAT_R8G8B8A8_UNORM:
     case SDL_GPU_TEXTUREFORMAT_B8G8R8A8_UNORM:
@@ -133,6 +180,125 @@ static inline Sint32 Texture_GetBlockSize(
     case SDL_GPU_TEXTUREFORMAT_R16G16B16A16_INT:
     case SDL_GPU_TEXTUREFORMAT_R8G8B8A8_UNORM_SRGB:
     case SDL_GPU_TEXTUREFORMAT_B8G8R8A8_UNORM_SRGB:
+    case SDL_GPU_TEXTUREFORMAT_D16_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_D24_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_D32_FLOAT:
+    case SDL_GPU_TEXTUREFORMAT_D24_UNORM_S8_UINT:
+    case SDL_GPU_TEXTUREFORMAT_D32_FLOAT_S8_UINT:
+        return 1;
+    default:
+        SDL_assert_release(!"Unrecognized TextureFormat!");
+        return 0;
+    }
+}
+
+static inline Sint32 Texture_GetBlockHeight(
+    SDL_GPUTextureFormat format)
+{
+    switch (format) {
+    case SDL_GPU_TEXTUREFORMAT_ASTC_12x12_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_12x12_UNORM_SRGB:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_12x12_FLOAT:
+        return 12;
+    case SDL_GPU_TEXTUREFORMAT_ASTC_12x10_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_12x10_UNORM_SRGB:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_12x10_FLOAT:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_10x10_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_10x10_UNORM_SRGB:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_10x10_FLOAT:
+        return 10;
+    case SDL_GPU_TEXTUREFORMAT_ASTC_10x8_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_10x8_UNORM_SRGB:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_10x8_FLOAT:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_8x8_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_8x8_UNORM_SRGB:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_8x8_FLOAT:
+        return 8;
+    case SDL_GPU_TEXTUREFORMAT_ASTC_10x6_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_10x6_UNORM_SRGB:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_10x6_FLOAT:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_8x6_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_8x6_UNORM_SRGB:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_8x6_FLOAT:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_6x6_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_6x6_UNORM_SRGB:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_6x6_FLOAT:
+        return 6;
+    case SDL_GPU_TEXTUREFORMAT_ASTC_10x5_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_10x5_UNORM_SRGB:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_10x5_FLOAT:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_8x5_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_8x5_UNORM_SRGB:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_8x5_FLOAT:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_6x5_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_6x5_UNORM_SRGB:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_6x5_FLOAT:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_5x5_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_5x5_UNORM_SRGB:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_5x5_FLOAT:
+        return 5;
+    case SDL_GPU_TEXTUREFORMAT_BC1_RGBA_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_BC2_RGBA_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_BC3_RGBA_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_BC4_R_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_BC5_RG_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_BC7_RGBA_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_BC6H_RGB_FLOAT:
+    case SDL_GPU_TEXTUREFORMAT_BC6H_RGB_UFLOAT:
+    case SDL_GPU_TEXTUREFORMAT_BC1_RGBA_UNORM_SRGB:
+    case SDL_GPU_TEXTUREFORMAT_BC3_RGBA_UNORM_SRGB:
+    case SDL_GPU_TEXTUREFORMAT_BC7_RGBA_UNORM_SRGB:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_5x4_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_5x4_UNORM_SRGB:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_5x4_FLOAT:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_4x4_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_4x4_UNORM_SRGB:
+    case SDL_GPU_TEXTUREFORMAT_ASTC_4x4_FLOAT:
+        return 4;
+    case SDL_GPU_TEXTUREFORMAT_R8G8B8A8_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_B8G8R8A8_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_B5G6R5_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_B5G5R5A1_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_B4G4R4A4_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_R10G10B10A2_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_R8G8_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_R16G16_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_R16G16B16A16_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_R8_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_R16_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_A8_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_R8_SNORM:
+    case SDL_GPU_TEXTUREFORMAT_R8G8_SNORM:
+    case SDL_GPU_TEXTUREFORMAT_R8G8B8A8_SNORM:
+    case SDL_GPU_TEXTUREFORMAT_R16_SNORM:
+    case SDL_GPU_TEXTUREFORMAT_R16G16_SNORM:
+    case SDL_GPU_TEXTUREFORMAT_R16G16B16A16_SNORM:
+    case SDL_GPU_TEXTUREFORMAT_R16_FLOAT:
+    case SDL_GPU_TEXTUREFORMAT_R16G16_FLOAT:
+    case SDL_GPU_TEXTUREFORMAT_R16G16B16A16_FLOAT:
+    case SDL_GPU_TEXTUREFORMAT_R32_FLOAT:
+    case SDL_GPU_TEXTUREFORMAT_R32G32_FLOAT:
+    case SDL_GPU_TEXTUREFORMAT_R32G32B32A32_FLOAT:
+    case SDL_GPU_TEXTUREFORMAT_R11G11B10_UFLOAT:
+    case SDL_GPU_TEXTUREFORMAT_R8_UINT:
+    case SDL_GPU_TEXTUREFORMAT_R8G8_UINT:
+    case SDL_GPU_TEXTUREFORMAT_R8G8B8A8_UINT:
+    case SDL_GPU_TEXTUREFORMAT_R16_UINT:
+    case SDL_GPU_TEXTUREFORMAT_R16G16_UINT:
+    case SDL_GPU_TEXTUREFORMAT_R16G16B16A16_UINT:
+    case SDL_GPU_TEXTUREFORMAT_R8_INT:
+    case SDL_GPU_TEXTUREFORMAT_R8G8_INT:
+    case SDL_GPU_TEXTUREFORMAT_R8G8B8A8_INT:
+    case SDL_GPU_TEXTUREFORMAT_R16_INT:
+    case SDL_GPU_TEXTUREFORMAT_R16G16_INT:
+    case SDL_GPU_TEXTUREFORMAT_R16G16B16A16_INT:
+    case SDL_GPU_TEXTUREFORMAT_R8G8B8A8_UNORM_SRGB:
+    case SDL_GPU_TEXTUREFORMAT_B8G8R8A8_UNORM_SRGB:
+    case SDL_GPU_TEXTUREFORMAT_D16_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_D24_UNORM:
+    case SDL_GPU_TEXTUREFORMAT_D32_FLOAT:
+    case SDL_GPU_TEXTUREFORMAT_D24_UNORM_S8_UINT:
+    case SDL_GPU_TEXTUREFORMAT_D32_FLOAT_S8_UINT:
         return 1;
     default:
         SDL_assert_release(!"Unrecognized TextureFormat!");
@@ -201,28 +367,11 @@ static inline Uint32 BytesPerRow(
     Sint32 width,
     SDL_GPUTextureFormat format)
 {
-    Uint32 blocksPerRow = width;
-    Uint32 pixelRowsPerBlock = Texture_GetBlockSize(format);
-
-    blocksPerRow = (width + pixelRowsPerBlock - 1) / pixelRowsPerBlock;
+    Uint32 blockWidth = Texture_GetBlockWidth(format);
+    Uint32 blocksPerRow = (width + blockWidth - 1) / blockWidth;
     return blocksPerRow * SDL_GPUTextureFormatTexelBlockSize(format);
 }
 
-static inline Sint32 BytesPerImage(
-    Uint32 width,
-    Uint32 height,
-    SDL_GPUTextureFormat format)
-{
-    Uint32 blocksPerRow = width;
-    Uint32 blocksPerColumn = height;
-    Uint32 pixelRowsPerBlock = Texture_GetBlockSize(format);
-    Uint32 pixelColumnsPerBlock = pixelRowsPerBlock;
-
-    blocksPerRow = (width + pixelRowsPerBlock - 1) / pixelRowsPerBlock;
-    blocksPerColumn = (height + pixelColumnsPerBlock - 1) / pixelColumnsPerBlock;
-    return blocksPerRow * blocksPerColumn * SDL_GPUTextureFormatTexelBlockSize(format);
-}
-
 // GraphicsDevice Limits
 
 #define MAX_TEXTURE_SAMPLERS_PER_STAGE 16
diff --git a/libs/SDL3/src/gpu/d3d11/SDL_gpu_d3d11.c b/libs/SDL3/src/gpu/d3d11/SDL_gpu_d3d11.c
index ff3b9370b..d667efddf 100644
--- a/libs/SDL3/src/gpu/d3d11/SDL_gpu_d3d11.c
+++ b/libs/SDL3/src/gpu/d3d11/SDL_gpu_d3d11.c
@@ -237,6 +237,48 @@ static DXGI_FORMAT SDLToD3D11_TextureFormat[] = {
     DXGI_FORMAT_D32_FLOAT,            // D32_FLOAT
     DXGI_FORMAT_D24_UNORM_S8_UINT,    // D24_UNORM_S8_UINT
     DXGI_FORMAT_D32_FLOAT_S8X24_UINT, // D32_FLOAT_S8_UINT
+    DXGI_FORMAT_UNKNOWN,              // ASTC_4x4_UNORM
+    DXGI_FORMAT_UNKNOWN,              // ASTC_5x4_UNORM
+    DXGI_FORMAT_UNKNOWN,              // ASTC_5x5_UNORM
+    DXGI_FORMAT_UNKNOWN,              // ASTC_6x5_UNORM
+    DXGI_FORMAT_UNKNOWN,              // ASTC_6x6_UNORM
+    DXGI_FORMAT_UNKNOWN,              // ASTC_8x5_UNORM
+    DXGI_FORMAT_UNKNOWN,              // ASTC_8x6_UNORM
+    DXGI_FORMAT_UNKNOWN,              // ASTC_8x8_UNORM
+    DXGI_FORMAT_UNKNOWN,              // ASTC_10x5_UNORM
+    DXGI_FORMAT_UNKNOWN,              // ASTC_10x6_UNORM
+    DXGI_FORMAT_UNKNOWN,              // ASTC_10x8_UNORM
+    DXGI_FORMAT_UNKNOWN,              // ASTC_10x10_UNORM
+    DXGI_FORMAT_UNKNOWN,              // ASTC_12x10_UNORM
+    DXGI_FORMAT_UNKNOWN,              // ASTC_12x12_UNORM
+    DXGI_FORMAT_UNKNOWN,              // ASTC_4x4_UNORM_SRGB
+    DXGI_FORMAT_UNKNOWN,              // ASTC_5x4_UNORM_SRGB
+    DXGI_FORMAT_UNKNOWN,              // ASTC_5x5_UNORM_SRGB
+    DXGI_FORMAT_UNKNOWN,              // ASTC_6x5_UNORM_SRGB
+    DXGI_FORMAT_UNKNOWN,              // ASTC_6x6_UNORM_SRGB
+    DXGI_FORMAT_UNKNOWN,              // ASTC_8x5_UNORM_SRGB
+    DXGI_FORMAT_UNKNOWN,              // ASTC_8x6_UNORM_SRGB
+    DXGI_FORMAT_UNKNOWN,              // ASTC_8x8_UNORM_SRGB
+    DXGI_FORMAT_UNKNOWN,              // ASTC_10x5_UNORM_SRGB
+    DXGI_FORMAT_UNKNOWN,              // ASTC_10x6_UNORM_SRGB
+    DXGI_FORMAT_UNKNOWN,              // ASTC_10x8_UNORM_SRGB
+    DXGI_FORMAT_UNKNOWN,              // ASTC_10x10_UNORM_SRGB
+    DXGI_FORMAT_UNKNOWN,              // ASTC_12x10_UNORM_SRGB
+    DXGI_FORMAT_UNKNOWN,              // ASTC_12x12_UNORM_SRGB
+    DXGI_FORMAT_UNKNOWN,              // ASTC_4x4_FLOAT
+    DXGI_FORMAT_UNKNOWN,              // ASTC_5x4_FLOAT
+    DXGI_FORMAT_UNKNOWN,              // ASTC_5x5_FLOAT
+    DXGI_FORMAT_UNKNOWN,              // ASTC_6x5_FLOAT
+    DXGI_FORMAT_UNKNOWN,              // ASTC_6x6_FLOAT
+    DXGI_FORMAT_UNKNOWN,              // ASTC_8x5_FLOAT
+    DXGI_FORMAT_UNKNOWN,              // ASTC_8x6_FLOAT
+    DXGI_FORMAT_UNKNOWN,              // ASTC_8x8_FLOAT
+    DXGI_FORMAT_UNKNOWN,              // ASTC_10x5_FLOAT
+    DXGI_FORMAT_UNKNOWN,              // ASTC_10x6_FLOAT
+    DXGI_FORMAT_UNKNOWN,              // ASTC_10x8_FLOAT
+    DXGI_FORMAT_UNKNOWN,              // ASTC_10x10_FLOAT
+    DXGI_FORMAT_UNKNOWN,              // ASTC_12x10_FLOAT
+    DXGI_FORMAT_UNKNOWN,              // ASTC_12x12_FLOAT
 };
 SDL_COMPILE_TIME_ASSERT(SDLToD3D11_TextureFormat, SDL_arraysize(SDLToD3D11_TextureFormat) == SDL_GPU_TEXTUREFORMAT_MAX_ENUM_VALUE);
 
@@ -2656,10 +2698,11 @@ static void D3D11_UploadToTexture(
         destination->mip_level,
         cycle);
 
-    Sint32 blockSize = Texture_GetBlockSize(dstFormat);
-    if (blockSize > 1) {
-        w = (w + blockSize - 1) & ~(blockSize - 1);
-        h = (h + blockSize - 1) & ~(blockSize - 1);
+    Sint32 blockWidth = Texture_GetBlockWidth(dstFormat);
+    Sint32 blockHeight = Texture_GetBlockHeight(dstFormat);
+    if (blockWidth > 1 && blockHeight > 1) {
+        w = (w + blockWidth - 1) & ~(blockWidth - 1);
+        h = (h + blockHeight - 1) & ~(blockHeight - 1);
     }
 
     if (bufferStride == 0) {
@@ -5227,9 +5270,8 @@ static bool D3D11_INTERNAL_CreateSwapchain(
         return false;
     }
 
-    int w, h;
-    SDL_SyncWindow(windowData->window);
-    SDL_GetWindowSizeInPixels(windowData->window, &w, &h);
+    res = IDXGISwapChain_GetDesc(swapchain, &swapchainDesc);
+    CHECK_D3D11_ERROR_AND_RETURN("Failed to get swapchain descriptor!", false);
 
     // Initialize dummy container, width/height will be filled out in AcquireSwapchainTexture
     SDL_zerop(&windowData->textureContainer);
@@ -5246,14 +5288,14 @@ static bool D3D11_INTERNAL_CreateSwapchain(
     windowData->textureContainer.header.info.num_levels = 1;
     windowData->textureContainer.header.info.sample_count = SDL_GPU_SAMPLECOUNT_1;
     windowData->textureContainer.header.info.usage = SDL_GPU_TEXTUREUSAGE_COLOR_TARGET;
-    windowData->textureContainer.header.info.width = w;
-    windowData->textureContainer.header.info.height = h;
+    windowData->textureContainer.header.info.width = swapchainDesc.BufferDesc.Width;
+    windowData->textureContainer.header.info.height = swapchainDesc.BufferDesc.Height;
 
     windowData->texture.container = &windowData->textureContainer;
     windowData->texture.containerIndex = 0;
 
-    windowData->width = w;
-    windowData->height = h;
+    windowData->width = swapchainDesc.BufferDesc.Width;
+    windowData->height = swapchainDesc.BufferDesc.Height;
     return true;
 }
 
@@ -5268,16 +5310,12 @@ static bool D3D11_INTERNAL_ResizeSwapchain(
     SDL_free(windowData->texture.subresources[0].colorTargetViews);
     SDL_free(windowData->texture.subresources);
 
-    int w, h;
-    SDL_SyncWindow(windowData->window);
-    SDL_GetWindowSizeInPixels(windowData->window, &w, &h);
-
     // Resize the swapchain
     HRESULT res = IDXGISwapChain_ResizeBuffers(
         windowData->swapchain,
         0, // Keep buffer count the same
-        w,
-        h,
+        0, // Use client window width
+        0, // Use client window height
         DXGI_FORMAT_UNKNOWN, // Keep the old format
         renderer->supportsTearing ? DXGI_SWAP_CHAIN_FLAG_ALLOW_TEARING : 0);
     CHECK_D3D11_ERROR_AND_RETURN("Could not resize swapchain buffers", false);
@@ -5290,10 +5328,14 @@ static bool D3D11_INTERNAL_ResizeSwapchain(
         (windowData->swapchainComposition == SDL_GPU_SWAPCHAINCOMPOSITION_SDR_LINEAR) ? DXGI_FORMAT_B8G8R8A8_UNORM_SRGB : windowData->swapchainFormat,
         &windowData->texture);
 
-    windowData->textureContainer.header.info.width = w;
-    windowData->textureContainer.header.info.height = h;
-    windowData->width = w;
-    windowData->height = h;
+    DXGI_SWAP_CHAIN_DESC swapchainDesc;
+    res = IDXGISwapChain_GetDesc(windowData->swapchain, &swapchainDesc);
+    CHECK_D3D11_ERROR_AND_RETURN("Failed to get swapchain descriptor!", false);
+
+    windowData->textureContainer.header.info.width = swapchainDesc.BufferDesc.Width;
+    windowData->textureContainer.header.info.height = swapchainDesc.BufferDesc.Height;
+    windowData->width = swapchainDesc.BufferDesc.Width;
+    windowData->height = swapchainDesc.BufferDesc.Height;
     windowData->needsSwapchainRecreate = !result;
     return result;
 }
diff --git a/libs/SDL3/src/gpu/d3d12/SDL_gpu_d3d12.c b/libs/SDL3/src/gpu/d3d12/SDL_gpu_d3d12.c
index 9e76930e8..86d8dcc6c 100644
--- a/libs/SDL3/src/gpu/d3d12/SDL_gpu_d3d12.c
+++ b/libs/SDL3/src/gpu/d3d12/SDL_gpu_d3d12.c
@@ -312,6 +312,48 @@ static DXGI_FORMAT SDLToD3D12_TextureFormat[] = {
     DXGI_FORMAT_D32_FLOAT,            // D32_FLOAT
     DXGI_FORMAT_D24_UNORM_S8_UINT,    // D24_UNORM_S8_UINT
     DXGI_FORMAT_D32_FLOAT_S8X24_UINT, // D32_FLOAT_S8_UINT
+    DXGI_FORMAT_UNKNOWN,              // ASTC_4x4_UNORM
+    DXGI_FORMAT_UNKNOWN,              // ASTC_5x4_UNORM
+    DXGI_FORMAT_UNKNOWN,              // ASTC_5x5_UNORM
+    DXGI_FORMAT_UNKNOWN,              // ASTC_6x5_UNORM
+    DXGI_FORMAT_UNKNOWN,              // ASTC_6x6_UNORM
+    DXGI_FORMAT_UNKNOWN,              // ASTC_8x5_UNORM
+    DXGI_FORMAT_UNKNOWN,              // ASTC_8x6_UNORM
+    DXGI_FORMAT_UNKNOWN,              // ASTC_8x8_UNORM
+    DXGI_FORMAT_UNKNOWN,              // ASTC_10x5_UNORM
+    DXGI_FORMAT_UNKNOWN,              // ASTC_10x6_UNORM
+    DXGI_FORMAT_UNKNOWN,              // ASTC_10x8_UNORM
+    DXGI_FORMAT_UNKNOWN,              // ASTC_10x10_UNORM
+    DXGI_FORMAT_UNKNOWN,              // ASTC_12x10_UNORM
+    DXGI_FORMAT_UNKNOWN,              // ASTC_12x12_UNORM
+    DXGI_FORMAT_UNKNOWN,              // ASTC_4x4_UNORM_SRGB
+    DXGI_FORMAT_UNKNOWN,              // ASTC_5x4_UNORM_SRGB
+    DXGI_FORMAT_UNKNOWN,              // ASTC_5x5_UNORM_SRGB
+    DXGI_FORMAT_UNKNOWN,              // ASTC_6x5_UNORM_SRGB
+    DXGI_FORMAT_UNKNOWN,              // ASTC_6x6_UNORM_SRGB
+    DXGI_FORMAT_UNKNOWN,              // ASTC_8x5_UNORM_SRGB
+    DXGI_FORMAT_UNKNOWN,              // ASTC_8x6_UNORM_SRGB
+    DXGI_FORMAT_UNKNOWN,              // ASTC_8x8_UNORM_SRGB
+    DXGI_FORMAT_UNKNOWN,              // ASTC_10x5_UNORM_SRGB
+    DXGI_FORMAT_UNKNOWN,              // ASTC_10x6_UNORM_SRGB
+    DXGI_FORMAT_UNKNOWN,              // ASTC_10x8_UNORM_SRGB
+    DXGI_FORMAT_UNKNOWN,              // ASTC_10x10_UNORM_SRGB
+    DXGI_FORMAT_UNKNOWN,              // ASTC_12x10_UNORM_SRGB
+    DXGI_FORMAT_UNKNOWN,              // ASTC_12x12_UNORM_SRGB
+    DXGI_FORMAT_UNKNOWN,              // ASTC_4x4_FLOAT
+    DXGI_FORMAT_UNKNOWN,              // ASTC_5x4_FLOAT
+    DXGI_FORMAT_UNKNOWN,              // ASTC_5x5_FLOAT
+    DXGI_FORMAT_UNKNOWN,              // ASTC_6x5_FLOAT
+    DXGI_FORMAT_UNKNOWN,              // ASTC_6x6_FLOAT
+    DXGI_FORMAT_UNKNOWN,              // ASTC_8x5_FLOAT
+    DXGI_FORMAT_UNKNOWN,              // ASTC_8x6_FLOAT
+    DXGI_FORMAT_UNKNOWN,              // ASTC_8x8_FLOAT
+    DXGI_FORMAT_UNKNOWN,              // ASTC_10x5_FLOAT
+    DXGI_FORMAT_UNKNOWN,              // ASTC_10x6_FLOAT
+    DXGI_FORMAT_UNKNOWN,              // ASTC_10x8_FLOAT
+    DXGI_FORMAT_UNKNOWN,              // ASTC_10x10_FLOAT
+    DXGI_FORMAT_UNKNOWN,              // ASTC_12x10_FLOAT
+    DXGI_FORMAT_UNKNOWN,              // ASTC_12x12_FLOAT
 };
 SDL_COMPILE_TIME_ASSERT(SDLToD3D12_TextureFormat, SDL_arraysize(SDLToD3D12_TextureFormat) == SDL_GPU_TEXTUREFORMAT_MAX_ENUM_VALUE);
 
@@ -6105,6 +6147,8 @@ static bool D3D12_INTERNAL_CreateSwapchain(
     windowData->swapchainComposition = swapchain_composition;
     windowData->swapchainColorSpace = DXGI_COLOR_SPACE_RGB_FULL_G22_NONE_P709;
     windowData->frameCounter = 0;
+    windowData->width = width;
+    windowData->height = height;
 
     // Precache blit pipelines for the swapchain format
     for (Uint32 i = 0; i < 5; i += 1) {
@@ -6303,19 +6347,12 @@ static bool D3D12_INTERNAL_ResizeSwapchain(
         SDL_free(windowData->textureContainers[i].textures);
     }
 
-    int w, h;
-    SDL_SyncWindow(windowData->window);
-    SDL_GetWindowSizeInPixels(
-        windowData->window,
-        &w,
-        &h);
-
     // Resize the swapchain
     HRESULT res = IDXGISwapChain_ResizeBuffers(
         windowData->swapchain,
         0, // Keep buffer count the same
-        w,
-        h,
+        0, // use client window width
+        0, // use client window height
         DXGI_FORMAT_UNKNOWN, // Keep the old format
         renderer->supportsTearing ? DXGI_SWAP_CHAIN_FLAG_ALLOW_TEARING : 0);
     CHECK_D3D12_ERROR_AND_RETURN("Could not resize swapchain buffers", false)
@@ -6332,8 +6369,12 @@ static bool D3D12_INTERNAL_ResizeSwapchain(
         }
     }
 
-    windowData->width = w;
-    windowData->height = h;
+    DXGI_SWAP_CHAIN_DESC1 swapchainDesc;
+    IDXGISwapChain3_GetDesc1(windowData->swapchain, &swapchainDesc);
+    CHECK_D3D12_ERROR_AND_RETURN("Failed to retrieve swapchain descriptor!", false)
+
+    windowData->width = swapchainDesc.Width;
+    windowData->height = swapchainDesc.Height;
     windowData->needsSwapchainRecreate = false;
     return true;
 }
@@ -6385,12 +6426,9 @@ static bool D3D12_INTERNAL_CreateSwapchain(
 
     swapchainFormat = SwapchainCompositionToTextureFormat[swapchainComposition];
 
-    int w, h;
-    SDL_GetWindowSizeInPixels(windowData->window, &w, &h);
-
     // Initialize the swapchain buffer descriptor
-    swapchainDesc.Width = 0;
-    swapchainDesc.Height = 0;
+    swapchainDesc.Width = 0;  // use client window width
+    swapchainDesc.Height = 0; // use client window height
     swapchainDesc.Format = swapchainFormat;
     swapchainDesc.SampleDesc.Count = 1;
     swapchainDesc.SampleDesc.Quality = 0;
@@ -6477,14 +6515,17 @@ static bool D3D12_INTERNAL_CreateSwapchain(
         IDXGIFactory1_Release(pParent);
     }
 
+    IDXGISwapChain3_GetDesc1(swapchain3, &swapchainDesc);
+    CHECK_D3D12_ERROR_AND_RETURN("Failed to retrieve swapchain descriptor!", false)
+
     // Initialize the swapchain data
     windowData->swapchain = swapchain3;
     windowData->present_mode = presentMode;
     windowData->swapchainComposition = swapchainComposition;
     windowData->swapchainColorSpace = SwapchainCompositionToColorSpace[swapchainComposition];
     windowData->frameCounter = 0;
-    windowData->width = w;
-    windowData->height = h;
+    windowData->width = swapchainDesc.Width;
+    windowData->height = swapchainDesc.Height;
 
     // Precache blit pipelines for the swapchain format
     for (Uint32 i = 0; i < 5; i += 1) {
diff --git a/libs/SDL3/src/gpu/metal/SDL_gpu_metal.m b/libs/SDL3/src/gpu/metal/SDL_gpu_metal.m
index fd118bc69..c8230aeeb 100644
--- a/libs/SDL3/src/gpu/metal/SDL_gpu_metal.m
+++ b/libs/SDL3/src/gpu/metal/SDL_gpu_metal.m
@@ -166,6 +166,48 @@ static void METAL_ReleaseWindow(
     MTLPixelFormatInvalid, // D24_UNORM_S8_UINT
 #endif
     MTLPixelFormatDepth32Float_Stencil8, // D32_FLOAT_S8_UINT
+    MTLPixelFormatASTC_4x4_LDR,    // ASTC_4x4_UNORM
+    MTLPixelFormatASTC_5x4_LDR,    // ASTC_5x4_UNORM
+    MTLPixelFormatASTC_5x5_LDR,    // ASTC_5x5_UNORM
+    MTLPixelFormatASTC_6x5_LDR,    // ASTC_6x5_UNORM
+    MTLPixelFormatASTC_6x6_LDR,    // ASTC_6x6_UNORM
+    MTLPixelFormatASTC_8x5_LDR,    // ASTC_8x5_UNORM
+    MTLPixelFormatASTC_8x6_LDR,    // ASTC_8x6_UNORM
+    MTLPixelFormatASTC_8x8_LDR,    // ASTC_8x8_UNORM
+    MTLPixelFormatASTC_10x5_LDR,   // ASTC_10x5_UNORM
+    MTLPixelFormatASTC_10x6_LDR,   // ASTC_10x6_UNORM
+    MTLPixelFormatASTC_10x8_LDR,   // ASTC_10x8_UNORM
+    MTLPixelFormatASTC_10x10_LDR,  // ASTC_10x10_UNORM
+    MTLPixelFormatASTC_12x10_LDR,  // ASTC_12x10_UNORM
+    MTLPixelFormatASTC_12x12_LDR,  // ASTC_12x12_UNORM
+    MTLPixelFormatASTC_4x4_sRGB,   // ASTC_4x4_UNORM_SRGB
+    MTLPixelFormatASTC_5x4_sRGB,   // ASTC_5x4_UNORM_SRGB
+    MTLPixelFormatASTC_5x5_sRGB,   // ASTC_5x5_UNORM_SRGB
+    MTLPixelFormatASTC_6x5_sRGB,   // ASTC_6x5_UNORM_SRGB
+    MTLPixelFormatASTC_6x6_sRGB,   // ASTC_6x6_UNORM_SRGB
+    MTLPixelFormatASTC_8x5_sRGB,   // ASTC_8x5_UNORM_SRGB
+    MTLPixelFormatASTC_8x6_sRGB,   // ASTC_8x6_UNORM_SRGB
+    MTLPixelFormatASTC_8x8_sRGB,   // ASTC_8x8_UNORM_SRGB
+    MTLPixelFormatASTC_10x5_sRGB,  // ASTC_10x5_UNORM_SRGB
+    MTLPixelFormatASTC_10x6_sRGB,  // ASTC_10x6_UNORM_SRGB
+    MTLPixelFormatASTC_10x8_sRGB,  // ASTC_10x8_UNORM_SRGB
+    MTLPixelFormatASTC_10x10_sRGB, // ASTC_10x10_UNORM_SRGB
+    MTLPixelFormatASTC_12x10_sRGB, // ASTC_12x10_UNORM_SRGB
+    MTLPixelFormatASTC_12x12_sRGB, // ASTC_12x12_UNORM_SRGB
+    MTLPixelFormatASTC_4x4_HDR,    // ASTC_4x4_FLOAT
+    MTLPixelFormatASTC_5x4_HDR,    // ASTC_5x4_FLOAT
+    MTLPixelFormatASTC_5x5_HDR,    // ASTC_5x5_FLOAT
+    MTLPixelFormatASTC_6x5_HDR,    // ASTC_6x5_FLOAT
+    MTLPixelFormatASTC_6x6_HDR,    // ASTC_6x6_FLOAT
+    MTLPixelFormatASTC_8x5_HDR,    // ASTC_8x5_FLOAT
+    MTLPixelFormatASTC_8x6_HDR,    // ASTC_8x6_FLOAT
+    MTLPixelFormatASTC_8x8_HDR,    // ASTC_8x8_FLOAT
+    MTLPixelFormatASTC_10x5_HDR,   // ASTC_10x5_FLOAT
+    MTLPixelFormatASTC_10x6_HDR,   // ASTC_10x6_FLOAT
+    MTLPixelFormatASTC_10x8_HDR,   // ASTC_10x8_FLOAT
+    MTLPixelFormatASTC_10x10_HDR,  // ASTC_10x10_FLOAT
+    MTLPixelFormatASTC_12x10_HDR,  // ASTC_12x10_FLOAT
+    MTLPixelFormatASTC_12x12_HDR   // ASTC_12x12_FLOAT
 };
 SDL_COMPILE_TIME_ASSERT(SDLToMetal_SurfaceFormat, SDL_arraysize(SDLToMetal_SurfaceFormat) == SDL_GPU_TEXTUREFORMAT_MAX_ENUM_VALUE);
 
@@ -1289,9 +1331,9 @@ static void METAL_PopDebugGroup(
         id<MTLSamplerState> sampler;
         MetalSampler *metalSampler;
 
-        samplerDesc.rAddressMode = SDLToMetal_SamplerAddressMode[createinfo->address_mode_u];
-        samplerDesc.sAddressMode = SDLToMetal_SamplerAddressMode[createinfo->address_mode_v];
-        samplerDesc.tAddressMode = SDLToMetal_SamplerAddressMode[createinfo->address_mode_w];
+        samplerDesc.sAddressMode = SDLToMetal_SamplerAddressMode[createinfo->address_mode_u];
+        samplerDesc.tAddressMode = SDLToMetal_SamplerAddressMode[createinfo->address_mode_v];
+        samplerDesc.rAddressMode = SDLToMetal_SamplerAddressMode[createinfo->address_mode_w];
         samplerDesc.minFilter = SDLToMetal_MinMagFilter[createinfo->min_filter];
         samplerDesc.magFilter = SDLToMetal_MinMagFilter[createinfo->mag_filter];
         samplerDesc.mipFilter = SDLToMetal_MipFilter[createinfo->mipmap_mode]; // FIXME: Is this right with non-mipmapped samplers?
@@ -1710,7 +1752,7 @@ static void METAL_UploadToTexture(
                  copyFromBuffer:bufferContainer->activeBuffer->handle
                    sourceOffset:source->offset
               sourceBytesPerRow:BytesPerRow(destination->w, textureContainer->header.info.format)
-            sourceBytesPerImage:BytesPerImage(destination->w, destination->h, textureContainer->header.info.format)
+            sourceBytesPerImage:SDL_CalculateGPUTextureFormatSize(textureContainer->header.info.format, destination->w, destination->h, destination->d)
                      sourceSize:MTLSizeMake(destination->w, destination->h, destination->d)
                       toTexture:metalTexture->handle
                destinationSlice:destination->layer
@@ -3877,7 +3919,58 @@ static bool METAL_SupportsTextureFormat(
 #else
             return false;
 #endif
-
+        case SDL_GPU_TEXTUREFORMAT_ASTC_4x4_UNORM:
+        case SDL_GPU_TEXTUREFORMAT_ASTC_5x4_UNORM:
+        case SDL_GPU_TEXTUREFORMAT_ASTC_5x5_UNORM:
+        case SDL_GPU_TEXTUREFORMAT_ASTC_6x5_UNORM:
+        case SDL_GPU_TEXTUREFORMAT_ASTC_6x6_UNORM:
+        case SDL_GPU_TEXTUREFORMAT_ASTC_8x5_UNORM:
+        case SDL_GPU_TEXTUREFORMAT_ASTC_8x6_UNORM:
+        case SDL_GPU_TEXTUREFORMAT_ASTC_8x8_UNORM:
+        case SDL_GPU_TEXTUREFORMAT_ASTC_10x5_UNORM:
+        case SDL_GPU_TEXTUREFORMAT_ASTC_10x6_UNORM:
+        case SDL_GPU_TEXTUREFORMAT_ASTC_10x8_UNORM:
+        case SDL_GPU_TEXTUREFORMAT_ASTC_10x10_UNORM:
+        case SDL_GPU_TEXTUREFORMAT_ASTC_12x10_UNORM:
+        case SDL_GPU_TEXTUREFORMAT_ASTC_12x12_UNORM:
+        case SDL_GPU_TEXTUREFORMAT_ASTC_4x4_UNORM_SRGB:
+        case SDL_GPU_TEXTUREFORMAT_ASTC_5x4_UNORM_SRGB:
+        case SDL_GPU_TEXTUREFORMAT_ASTC_5x5_UNORM_SRGB:
+        case SDL_GPU_TEXTUREFORMAT_ASTC_6x5_UNORM_SRGB:
+        case SDL_GPU_TEXTUREFORMAT_ASTC_6x6_UNORM_SRGB:
+        case SDL_GPU_TEXTUREFORMAT_ASTC_8x5_UNORM_SRGB:
+        case SDL_GPU_TEXTUREFORMAT_ASTC_8x6_UNORM_SRGB:
+        case SDL_GPU_TEXTUREFORMAT_ASTC_8x8_UNORM_SRGB:
+        case SDL_GPU_TEXTUREFORMAT_ASTC_10x5_UNORM_SRGB:
+        case SDL_GPU_TEXTUREFORMAT_ASTC_10x6_UNORM_SRGB:
+        case SDL_GPU_TEXTUREFORMAT_ASTC_10x8_UNORM_SRGB:
+        case SDL_GPU_TEXTUREFORMAT_ASTC_10x10_UNORM_SRGB:
+        case SDL_GPU_TEXTUREFORMAT_ASTC_12x10_UNORM_SRGB:
+        case SDL_GPU_TEXTUREFORMAT_ASTC_12x12_UNORM_SRGB:
+#ifdef SDL_PLATFORM_MACOS
+            return [renderer->device supportsFamily:MTLGPUFamilyApple7];
+#else
+            return true;
+#endif
+        case SDL_GPU_TEXTUREFORMAT_ASTC_4x4_FLOAT:
+        case SDL_GPU_TEXTUREFORMAT_ASTC_5x4_FLOAT:
+        case SDL_GPU_TEXTUREFORMAT_ASTC_5x5_FLOAT:
+        case SDL_GPU_TEXTUREFORMAT_ASTC_6x5_FLOAT:
+        case SDL_GPU_TEXTUREFORMAT_ASTC_6x6_FLOAT:
+        case SDL_GPU_TEXTUREFORMAT_ASTC_8x5_FLOAT:
+        case SDL_GPU_TEXTUREFORMAT_ASTC_8x6_FLOAT:
+        case SDL_GPU_TEXTUREFORMAT_ASTC_8x8_FLOAT:
+        case SDL_GPU_TEXTUREFORMAT_ASTC_10x5_FLOAT:
+        case SDL_GPU_TEXTUREFORMAT_ASTC_10x6_FLOAT:
+        case SDL_GPU_TEXTUREFORMAT_ASTC_10x8_FLOAT:
+        case SDL_GPU_TEXTUREFORMAT_ASTC_10x10_FLOAT:
+        case SDL_GPU_TEXTUREFORMAT_ASTC_12x10_FLOAT:
+        case SDL_GPU_TEXTUREFORMAT_ASTC_12x12_FLOAT:
+#ifdef SDL_PLATFORM_MACOS
+            return [renderer->device supportsFamily:MTLGPUFamilyApple7];
+#else
+            return [renderer->device supportsFamily:MTLGPUFamilyApple6];
+#endif
         default:
             return true;
         }
diff --git a/libs/SDL3/src/gpu/vulkan/SDL_gpu_vulkan.c b/libs/SDL3/src/gpu/vulkan/SDL_gpu_vulkan.c
index d7a6145ff..3d7ead0a3 100644
--- a/libs/SDL3/src/gpu/vulkan/SDL_gpu_vulkan.c
+++ b/libs/SDL3/src/gpu/vulkan/SDL_gpu_vulkan.c
@@ -60,6 +60,8 @@ typedef struct VulkanExtensions
     Uint8 EXT_vertex_attribute_divisor;
     // Only required for special implementations (i.e. MoltenVK)
     Uint8 KHR_portability_subset;
+    // Only required for decoding HDR ASTC textures
+    Uint8 EXT_texture_compression_astc_hdr;
 } VulkanExtensions;
 
 // Defines
@@ -135,69 +137,111 @@ static VkPresentModeKHR SDLToVK_PresentMode[] = {
 };
 
 static VkFormat SDLToVK_TextureFormat[] = {
-    VK_FORMAT_UNDEFINED,                // INVALID
-    VK_FORMAT_R8_UNORM,                 // A8_UNORM
-    VK_FORMAT_R8_UNORM,                 // R8_UNORM
-    VK_FORMAT_R8G8_UNORM,               // R8G8_UNORM
-    VK_FORMAT_R8G8B8A8_UNORM,           // R8G8B8A8_UNORM
-    VK_FORMAT_R16_UNORM,                // R16_UNORM
-    VK_FORMAT_R16G16_UNORM,             // R16G16_UNORM
-    VK_FORMAT_R16G16B16A16_UNORM,       // R16G16B16A16_UNORM
-    VK_FORMAT_A2B10G10R10_UNORM_PACK32, // R10G10B10A2_UNORM
-    VK_FORMAT_R5G6B5_UNORM_PACK16,      // B5G6R5_UNORM
-    VK_FORMAT_A1R5G5B5_UNORM_PACK16,    // B5G5R5A1_UNORM
-    VK_FORMAT_B4G4R4A4_UNORM_PACK16,    // B4G4R4A4_UNORM
-    VK_FORMAT_B8G8R8A8_UNORM,           // B8G8R8A8_UNORM
-    VK_FORMAT_BC1_RGBA_UNORM_BLOCK,     // BC1_UNORM
-    VK_FORMAT_BC2_UNORM_BLOCK,          // BC2_UNORM
-    VK_FORMAT_BC3_UNORM_BLOCK,          // BC3_UNORM
-    VK_FORMAT_BC4_UNORM_BLOCK,          // BC4_UNORM
-    VK_FORMAT_BC5_UNORM_BLOCK,          // BC5_UNORM
-    VK_FORMAT_BC7_UNORM_BLOCK,          // BC7_UNORM
-    VK_FORMAT_BC6H_SFLOAT_BLOCK,        // BC6H_FLOAT
-    VK_FORMAT_BC6H_UFLOAT_BLOCK,        // BC6H_UFLOAT
-    VK_FORMAT_R8_SNORM,                 // R8_SNORM
-    VK_FORMAT_R8G8_SNORM,               // R8G8_SNORM
-    VK_FORMAT_R8G8B8A8_SNORM,           // R8G8B8A8_SNORM
-    VK_FORMAT_R16_SNORM,                // R16_SNORM
-    VK_FORMAT_R16G16_SNORM,             // R16G16_SNORM
-    VK_FORMAT_R16G16B16A16_SNORM,       // R16G16B16A16_SNORM
-    VK_FORMAT_R16_SFLOAT,               // R16_FLOAT
-    VK_FORMAT_R16G16_SFLOAT,            // R16G16_FLOAT
-    VK_FORMAT_R16G16B16A16_SFLOAT,      // R16G16B16A16_FLOAT
-    VK_FORMAT_R32_SFLOAT,               // R32_FLOAT
-    VK_FORMAT_R32G32_SFLOAT,            // R32G32_FLOAT
-    VK_FORMAT_R32G32B32A32_SFLOAT,      // R32G32B32A32_FLOAT
-    VK_FORMAT_B10G11R11_UFLOAT_PACK32,  // R11G11B10_UFLOAT
-    VK_FORMAT_R8_UINT,                  // R8_UINT
-    VK_FORMAT_R8G8_UINT,                // R8G8_UINT
-    VK_FORMAT_R8G8B8A8_UINT,            // R8G8B8A8_UINT
-    VK_FORMAT_R16_UINT,                 // R16_UINT
-    VK_FORMAT_R16G16_UINT,              // R16G16_UINT
-    VK_FORMAT_R16G16B16A16_UINT,        // R16G16B16A16_UINT
-    VK_FORMAT_R32_UINT,                 // R32_UINT
-    VK_FORMAT_R32G32_UINT,              // R32G32_UINT
-    VK_FORMAT_R32G32B32A32_UINT,        // R32G32B32A32_UINT
-    VK_FORMAT_R8_SINT,                  // R8_INT
-    VK_FORMAT_R8G8_SINT,                // R8G8_INT
-    VK_FORMAT_R8G8B8A8_SINT,            // R8G8B8A8_INT
-    VK_FORMAT_R16_SINT,                 // R16_INT
-    VK_FORMAT_R16G16_SINT,              // R16G16_INT
-    VK_FORMAT_R16G16B16A16_SINT,        // R16G16B16A16_INT
-    VK_FORMAT_R32_SINT,                 // R32_INT
-    VK_FORMAT_R32G32_SINT,              // R32G32_INT
-    VK_FORMAT_R32G32B32A32_SINT,        // R32G32B32A32_INT
-    VK_FORMAT_R8G8B8A8_SRGB,            // R8G8B8A8_UNORM_SRGB
-    VK_FORMAT_B8G8R8A8_SRGB,            // B8G8R8A8_UNORM_SRGB
-    VK_FORMAT_BC1_RGBA_SRGB_BLOCK,      // BC1_UNORM_SRGB
-    VK_FORMAT_BC2_SRGB_BLOCK,           // BC3_UNORM_SRGB
-    VK_FORMAT_BC3_SRGB_BLOCK,           // BC3_UNORM_SRGB
-    VK_FORMAT_BC7_SRGB_BLOCK,           // BC7_UNORM_SRGB
-    VK_FORMAT_D16_UNORM,                // D16_UNORM
-    VK_FORMAT_X8_D24_UNORM_PACK32,      // D24_UNORM
-    VK_FORMAT_D32_SFLOAT,               // D32_FLOAT
-    VK_FORMAT_D24_UNORM_S8_UINT,        // D24_UNORM_S8_UINT
-    VK_FORMAT_D32_SFLOAT_S8_UINT,       // D32_FLOAT_S8_UINT
+    VK_FORMAT_UNDEFINED,                   // INVALID
+    VK_FORMAT_R8_UNORM,                    // A8_UNORM
+    VK_FORMAT_R8_UNORM,                    // R8_UNORM
+    VK_FORMAT_R8G8_UNORM,                  // R8G8_UNORM
+    VK_FORMAT_R8G8B8A8_UNORM,              // R8G8B8A8_UNORM
+    VK_FORMAT_R16_UNORM,                   // R16_UNORM
+    VK_FORMAT_R16G16_UNORM,                // R16G16_UNORM
+    VK_FORMAT_R16G16B16A16_UNORM,          // R16G16B16A16_UNORM
+    VK_FORMAT_A2B10G10R10_UNORM_PACK32,    // R10G10B10A2_UNORM
+    VK_FORMAT_R5G6B5_UNORM_PACK16,         // B5G6R5_UNORM
+    VK_FORMAT_A1R5G5B5_UNORM_PACK16,       // B5G5R5A1_UNORM
+    VK_FORMAT_B4G4R4A4_UNORM_PACK16,       // B4G4R4A4_UNORM
+    VK_FORMAT_B8G8R8A8_UNORM,              // B8G8R8A8_UNORM
+    VK_FORMAT_BC1_RGBA_UNORM_BLOCK,        // BC1_UNORM
+    VK_FORMAT_BC2_UNORM_BLOCK,             // BC2_UNORM
+    VK_FORMAT_BC3_UNORM_BLOCK,             // BC3_UNORM
+    VK_FORMAT_BC4_UNORM_BLOCK,             // BC4_UNORM
+    VK_FORMAT_BC5_UNORM_BLOCK,             // BC5_UNORM
+    VK_FORMAT_BC7_UNORM_BLOCK,             // BC7_UNORM
+    VK_FORMAT_BC6H_SFLOAT_BLOCK,           // BC6H_FLOAT
+    VK_FORMAT_BC6H_UFLOAT_BLOCK,           // BC6H_UFLOAT
+    VK_FORMAT_R8_SNORM,                    // R8_SNORM
+    VK_FORMAT_R8G8_SNORM,                  // R8G8_SNORM
+    VK_FORMAT_R8G8B8A8_SNORM,              // R8G8B8A8_SNORM
+    VK_FORMAT_R16_SNORM,                   // R16_SNORM
+    VK_FORMAT_R16G16_SNORM,                // R16G16_SNORM
+    VK_FORMAT_R16G16B16A16_SNORM,          // R16G16B16A16_SNORM
+    VK_FORMAT_R16_SFLOAT,                  // R16_FLOAT
+    VK_FORMAT_R16G16_SFLOAT,               // R16G16_FLOAT
+    VK_FORMAT_R16G16B16A16_SFLOAT,         // R16G16B16A16_FLOAT
+    VK_FORMAT_R32_SFLOAT,                  // R32_FLOAT
+    VK_FORMAT_R32G32_SFLOAT,               // R32G32_FLOAT
+    VK_FORMAT_R32G32B32A32_SFLOAT,         // R32G32B32A32_FLOAT
+    VK_FORMAT_B10G11R11_UFLOAT_PACK32,     // R11G11B10_UFLOAT
+    VK_FORMAT_R8_UINT,                     // R8_UINT
+    VK_FORMAT_R8G8_UINT,                   // R8G8_UINT
+    VK_FORMAT_R8G8B8A8_UINT,               // R8G8B8A8_UINT
+    VK_FORMAT_R16_UINT,                    // R16_UINT
+    VK_FORMAT_R16G16_UINT,                 // R16G16_UINT
+    VK_FORMAT_R16G16B16A16_UINT,           // R16G16B16A16_UINT
+    VK_FORMAT_R32_UINT,                    // R32_UINT
+    VK_FORMAT_R32G32_UINT,                 // R32G32_UINT
+    VK_FORMAT_R32G32B32A32_UINT,           // R32G32B32A32_UINT
+    VK_FORMAT_R8_SINT,                     // R8_INT
+    VK_FORMAT_R8G8_SINT,                   // R8G8_INT
+    VK_FORMAT_R8G8B8A8_SINT,               // R8G8B8A8_INT
+    VK_FORMAT_R16_SINT,                    // R16_INT
+    VK_FORMAT_R16G16_SINT,                 // R16G16_INT
+    VK_FORMAT_R16G16B16A16_SINT,           // R16G16B16A16_INT
+    VK_FORMAT_R32_SINT,                    // R32_INT
+    VK_FORMAT_R32G32_SINT,                 // R32G32_INT
+    VK_FORMAT_R32G32B32A32_SINT,           // R32G32B32A32_INT
+    VK_FORMAT_R8G8B8A8_SRGB,               // R8G8B8A8_UNORM_SRGB
+    VK_FORMAT_B8G8R8A8_SRGB,               // B8G8R8A8_UNORM_SRGB
+    VK_FORMAT_BC1_RGBA_SRGB_BLOCK,         // BC1_UNORM_SRGB
+    VK_FORMAT_BC2_SRGB_BLOCK,              // BC3_UNORM_SRGB
+    VK_FORMAT_BC3_SRGB_BLOCK,              // BC3_UNORM_SRGB
+    VK_FORMAT_BC7_SRGB_BLOCK,              // BC7_UNORM_SRGB
+    VK_FORMAT_D16_UNORM,                   // D16_UNORM
+    VK_FORMAT_X8_D24_UNORM_PACK32,         // D24_UNORM
+    VK_FORMAT_D32_SFLOAT,                  // D32_FLOAT
+    VK_FORMAT_D24_UNORM_S8_UINT,           // D24_UNORM_S8_UINT
+    VK_FORMAT_D32_SFLOAT_S8_UINT,          // D32_FLOAT_S8_UINT
+    VK_FORMAT_ASTC_4x4_UNORM_BLOCK,        // ASTC_4x4_UNORM
+    VK_FORMAT_ASTC_5x4_UNORM_BLOCK,        // ASTC_5x4_UNORM
+    VK_FORMAT_ASTC_5x5_UNORM_BLOCK,        // ASTC_5x5_UNORM
+    VK_FORMAT_ASTC_6x5_UNORM_BLOCK,        // ASTC_6x5_UNORM
+    VK_FORMAT_ASTC_6x6_UNORM_BLOCK,        // ASTC_6x6_UNORM
+    VK_FORMAT_ASTC_8x5_UNORM_BLOCK,        // ASTC_8x5_UNORM
+    VK_FORMAT_ASTC_8x6_UNORM_BLOCK,        // ASTC_8x6_UNORM
+    VK_FORMAT_ASTC_8x8_UNORM_BLOCK,        // ASTC_8x8_UNORM
+    VK_FORMAT_ASTC_10x5_UNORM_BLOCK,       // ASTC_10x5_UNORM
+    VK_FORMAT_ASTC_10x6_UNORM_BLOCK,       // ASTC_10x6_UNORM
+    VK_FORMAT_ASTC_10x8_UNORM_BLOCK,       // ASTC_10x8_UNORM
+    VK_FORMAT_ASTC_10x10_UNORM_BLOCK,      // ASTC_10x10_UNORM
+    VK_FORMAT_ASTC_12x10_UNORM_BLOCK,      // ASTC_12x10_UNORM
+    VK_FORMAT_ASTC_12x12_UNORM_BLOCK,      // ASTC_12x12_UNORM
+    VK_FORMAT_ASTC_4x4_SRGB_BLOCK,         // ASTC_4x4_UNORM_SRGB
+    VK_FORMAT_ASTC_5x4_SRGB_BLOCK,         // ASTC_5x4_UNORM_SRGB
+    VK_FORMAT_ASTC_5x5_SRGB_BLOCK,         // ASTC_5x5_UNORM_SRGB
+    VK_FORMAT_ASTC_6x5_SRGB_BLOCK,         // ASTC_6x5_UNORM_SRGB
+    VK_FORMAT_ASTC_6x6_SRGB_BLOCK,         // ASTC_6x6_UNORM_SRGB
+    VK_FORMAT_ASTC_8x5_SRGB_BLOCK,         // ASTC_8x5_UNORM_SRGB
+    VK_FORMAT_ASTC_8x6_SRGB_BLOCK,         // ASTC_8x6_UNORM_SRGB
+    VK_FORMAT_ASTC_8x8_SRGB_BLOCK,         // ASTC_8x8_UNORM_SRGB
+    VK_FORMAT_ASTC_10x5_SRGB_BLOCK,        // ASTC_10x5_UNORM_SRGB
+    VK_FORMAT_ASTC_10x6_SRGB_BLOCK,        // ASTC_10x6_UNORM_SRGB
+    VK_FORMAT_ASTC_10x8_SRGB_BLOCK,        // ASTC_10x8_UNORM_SRGB
+    VK_FORMAT_ASTC_10x10_SRGB_BLOCK,       // ASTC_10x10_UNORM_SRGB
+    VK_FORMAT_ASTC_12x10_SRGB_BLOCK,       // ASTC_12x10_UNORM_SRGB
+    VK_FORMAT_ASTC_12x12_SRGB_BLOCK,       // ASTC_12x12_UNORM_SRGB
+    VK_FORMAT_ASTC_4x4_SFLOAT_BLOCK_EXT,   // ASTC_4x4_FLOAT
+    VK_FORMAT_ASTC_5x4_SFLOAT_BLOCK_EXT,   // ASTC_5x4_FLOAT
+    VK_FORMAT_ASTC_5x5_SFLOAT_BLOCK_EXT,   // ASTC_5x5_FLOAT
+    VK_FORMAT_ASTC_6x5_SFLOAT_BLOCK_EXT,   // ASTC_6x5_FLOAT
+    VK_FORMAT_ASTC_6x6_SFLOAT_BLOCK_EXT,   // ASTC_6x6_FLOAT
+    VK_FORMAT_ASTC_8x5_SFLOAT_BLOCK_EXT,   // ASTC_8x5_FLOAT
+    VK_FORMAT_ASTC_8x6_SFLOAT_BLOCK_EXT,   // ASTC_8x6_FLOAT
+    VK_FORMAT_ASTC_8x8_SFLOAT_BLOCK_EXT,   // ASTC_8x8_FLOAT
+    VK_FORMAT_ASTC_10x5_SFLOAT_BLOCK_EXT,  // ASTC_10x5_FLOAT
+    VK_FORMAT_ASTC_10x6_SFLOAT_BLOCK_EXT,  // ASTC_10x6_FLOAT
+    VK_FORMAT_ASTC_10x8_SFLOAT_BLOCK_EXT,  // ASTC_10x8_FLOAT
+    VK_FORMAT_ASTC_10x10_SFLOAT_BLOCK_EXT, // ASTC_10x10_FLOAT
+    VK_FORMAT_ASTC_12x10_SFLOAT_BLOCK_EXT, // ASTC_12x10_FLOAT
+    VK_FORMAT_ASTC_12x12_SFLOAT_BLOCK      // ASTC_12x12_FLOAT
 };
 SDL_COMPILE_TIME_ASSERT(SDLToVK_TextureFormat, SDL_arraysize(SDLToVK_TextureFormat) == SDL_GPU_TEXTUREFORMAT_MAX_ENUM_VALUE);
 
@@ -670,6 +714,8 @@ typedef struct WindowData
     SDL_GPUSwapchainComposition swapchainComposition;
     SDL_GPUPresentMode presentMode;
     bool needsSwapchainRecreate;
+    Uint32 swapchainCreateWidth;
+    Uint32 swapchainCreateHeight;
 
     // Window surface
     VkSurfaceKHR surface;
@@ -2941,6 +2987,9 @@ static void VULKAN_INTERNAL_DestroyTexture(
         }
 
         if (texture->subresources[subresourceIndex].depthStencilView != VK_NULL_HANDLE) {
+            VULKAN_INTERNAL_RemoveFramebuffersContainingView(
+                renderer,
+                texture->subresources[subresourceIndex].depthStencilView);
             renderer->vkDestroyImageView(
                 renderer->logicalDevice,
                 texture->subresources[subresourceIndex].depthStencilView,
@@ -4381,14 +4430,13 @@ static Uint32 VULKAN_INTERNAL_CreateSwapchain(
     VkSemaphoreCreateInfo semaphoreCreateInfo;
     SwapchainSupportDetails swapchainSupportDetails;
     bool hasValidSwapchainComposition, hasValidPresentMode;
-    Sint32 drawableWidth, drawableHeight;
     Uint32 i;
-    SDL_VideoDevice *_this = SDL_GetVideoDevice();
-
-    SDL_assert(_this && _this->Vulkan_CreateSurface);
 
     windowData->frameCounter = 0;
 
+    SDL_VideoDevice *_this = SDL_GetVideoDevice();
+    SDL_assert(_this && _this->Vulkan_CreateSurface);
+
     // Each swapchain must have its own surface.
     if (!_this->Vulkan_CreateSurface(
             _this,
@@ -4491,16 +4539,20 @@ static Uint32 VULKAN_INTERNAL_CreateSwapchain(
         return VULKAN_INTERNAL_TRY_AGAIN;
     }
 
-    // Sync now to be sure that our swapchain size is correct
-    SDL_SyncWindow(windowData->window);
-    SDL_GetWindowSizeInPixels(
-        windowData->window,
-        &drawableWidth,
-        &drawableHeight);
-
     windowData->imageCount = MAX_FRAMES_IN_FLIGHT;
-    windowData->width = drawableWidth;
-    windowData->height = drawableHeight;
+
+#ifdef SDL_PLATFORM_APPLE
+    windowData->width = swapchainSupportDetails.capabilities.currentExtent.width;
+    windowData->height = swapchainSupportDetails.capabilities.currentExtent.height;
+#else
+    windowData->width = SDL_clamp(
+        windowData->swapchainCreateWidth,
+        swapchainSupportDetails.capabilities.minImageExtent.width,
+        swapchainSupportDetails.capabilities.maxImageExtent.width);
+    windowData->height = SDL_clamp(windowData->swapchainCreateHeight,
+        swapchainSupportDetails.capabilities.minImageExtent.height,
+        swapchainSupportDetails.capabilities.maxImageExtent.height);
+#endif
 
     if (swapchainSupportDetails.capabilities.maxImageCount > 0 &&
         windowData->imageCount > swapchainSupportDetails.capabilities.maxImageCount) {
@@ -4528,8 +4580,8 @@ static Uint32 VULKAN_INTERNAL_CreateSwapchain(
     swapchainCreateInfo.minImageCount = windowData->imageCount;
     swapchainCreateInfo.imageFormat = windowData->format;
     swapchainCreateInfo.imageColorSpace = windowData->colorSpace;
-    swapchainCreateInfo.imageExtent.width = drawableWidth;
-    swapchainCreateInfo.imageExtent.height = drawableHeight;
+    swapchainCreateInfo.imageExtent.width = windowData->width;
+    swapchainCreateInfo.imageExtent.height = windowData->height;
     swapchainCreateInfo.imageArrayLayers = 1;
     swapchainCreateInfo.imageUsage =
         VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT |
@@ -4603,8 +4655,8 @@ static Uint32 VULKAN_INTERNAL_CreateSwapchain(
         // Initialize dummy container
         SDL_zero(windowData->textureContainers[i]);
         windowData->textureContainers[i].canBeCycled = false;
-        windowData->textureContainers[i].header.info.width = drawableWidth;
-        windowData->textureContainers[i].header.info.height = drawableHeight;
+        windowData->textureContainers[i].header.info.width = windowData->width;
+        windowData->textureContainers[i].header.info.height = windowData->height;
         windowData->textureContainers[i].header.info.layer_count_or_depth = 1;
         windowData->textureContainers[i].header.info.format = SwapchainCompositionToSDLFormat(
             windowData->swapchainComposition,
@@ -8900,6 +8952,7 @@ static void VULKAN_Blit(
     // Using BeginRenderPass to clear because vkCmdClearColorImage requires barriers anyway
     if (info->load_op == SDL_GPU_LOADOP_CLEAR) {
         SDL_GPUColorTargetInfo targetInfo;
+        SDL_zero(targetInfo);
         targetInfo.texture = info->destination.texture;
         targetInfo.mip_level = info->destination.mip_level;
         targetInfo.layer_or_depth_plane = info->destination.layer_or_depth_plane;
@@ -9367,6 +9420,8 @@ static bool VULKAN_INTERNAL_OnWindowResize(void *userdata, SDL_Event *e)
     if (e->type == SDL_EVENT_WINDOW_PIXEL_SIZE_CHANGED && e->window.windowID == SDL_GetWindowID(w)) {
         data = VULKAN_INTERNAL_FetchWindowData(w);
         data->needsSwapchainRecreate = true;
+        data->swapchainCreateWidth = e->window.data1;
+        data->swapchainCreateHeight = e->window.data2;
     }
 
     return true;
@@ -9465,6 +9520,16 @@ static bool VULKAN_ClaimWindow(
         windowData->presentMode = SDL_GPU_PRESENTMODE_VSYNC;
         windowData->swapchainComposition = SDL_GPU_SWAPCHAINCOMPOSITION_SDR;
 
+        // On non-Apple platforms the swapchain capability currentExtent can be different from the window,
+        // so we have to query the window size.
+#ifndef SDL_PLATFORM_APPLE
+        int w, h;
+        SDL_SyncWindow(window);
+        SDL_GetWindowSizeInPixels(window, &w, &h);
+        windowData->swapchainCreateWidth = w;
+        windowData->swapchainCreateHeight = h;
+#endif
+
         Uint32 createSwapchainResult = VULKAN_INTERNAL_CreateSwapchain(renderer, windowData);
         if (createSwapchainResult == 1) {
             SDL_SetPointerProperty(SDL_GetWindowProperties(window), WINDOW_PROPERTY_DATA, windowData);
@@ -10232,20 +10297,21 @@ static bool VULKAN_Submit(
             renderer->unifiedQueue,
             &presentInfo);
 
-        presentData->windowData->frameCounter =
-            (presentData->windowData->frameCounter + 1) % MAX_FRAMES_IN_FLIGHT;
-
-        if (presentResult == VK_SUCCESS || presentResult == VK_ERROR_OUT_OF_DATE_KHR) {
+        if (presentResult == VK_SUCCESS || presentResult == VK_SUBOPTIMAL_KHR || presentResult == VK_ERROR_OUT_OF_DATE_KHR) {
             // If presenting, the swapchain is using the in-flight fence
             presentData->windowData->inFlightFences[presentData->windowData->frameCounter] = (SDL_GPUFence*)vulkanCommandBuffer->inFlightFence;
             (void)SDL_AtomicIncRef(&vulkanCommandBuffer->inFlightFence->referenceCount);
 
-            if (presentResult == VK_ERROR_OUT_OF_DATE_KHR) {
+            if (presentResult == VK_SUBOPTIMAL_KHR || presentResult == VK_ERROR_OUT_OF_DATE_KHR) {
                 presentData->windowData->needsSwapchainRecreate = true;
             }
         } else {
             CHECK_VULKAN_ERROR_AND_RETURN(presentResult, vkQueuePresentKHR, false)
         }
+
+        presentData->windowData->frameCounter =
+            (presentData->windowData->frameCounter + 1) % MAX_FRAMES_IN_FLIGHT;
+
     }
 
     // Check if we can perform any cleanups
@@ -10568,7 +10634,7 @@ static inline Uint8 CheckDeviceExtensions(
         supports->ext = 1;                   \
     }
         CHECK(KHR_swapchain)
-        else CHECK(KHR_maintenance1) else CHECK(KHR_driver_properties) else CHECK(EXT_vertex_attribute_divisor) else CHECK(KHR_portability_subset)
+        else CHECK(KHR_maintenance1) else CHECK(KHR_driver_properties) else CHECK(EXT_vertex_attribute_divisor) else CHECK(KHR_portability_subset) else CHECK(EXT_texture_compression_astc_hdr)
 #undef CHECK
     }
 
@@ -10583,7 +10649,8 @@ static inline Uint32 GetDeviceExtensionCount(VulkanExtensions *supports)
         supports->KHR_maintenance1 +
         supports->KHR_driver_properties +
         supports->EXT_vertex_attribute_divisor +
-        supports->KHR_portability_subset);
+        supports->KHR_portability_subset +
+        supports->EXT_texture_compression_astc_hdr);
 }
 
 static inline void CreateDeviceExtensionArray(
@@ -10600,6 +10667,7 @@ static inline void CreateDeviceExtensionArray(
     CHECK(KHR_driver_properties)
     CHECK(EXT_vertex_attribute_divisor)
     CHECK(KHR_portability_subset)
+    CHECK(EXT_texture_compression_astc_hdr)
 #undef CHECK
 }
 
diff --git a/libs/SDL3/src/hidapi/SDL_hidapi.c b/libs/SDL3/src/hidapi/SDL_hidapi.c
index 890bc2347..81bebf0c3 100644
--- a/libs/SDL3/src/hidapi/SDL_hidapi.c
+++ b/libs/SDL3/src/hidapi/SDL_hidapi.c
@@ -60,7 +60,6 @@
 #include "../core/linux/SDL_udev.h"
 #ifdef SDL_USE_LIBUDEV
 #include <poll.h>
-#include "../core/linux/SDL_sandbox.h"
 #endif
 
 #ifdef HAVE_INOTIFY
@@ -1144,7 +1143,7 @@ int SDL_hid_init(void)
         SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
                      "udev disabled by SDL_HINT_HIDAPI_UDEV");
         linux_enumeration_method = ENUMERATION_FALLBACK;
-    } else if (SDL_DetectSandbox() != SDL_SANDBOX_NONE) {
+    } else if (SDL_GetSandbox() != SDL_SANDBOX_NONE) {
         SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
                      "Container detected, disabling HIDAPI udev integration");
         linux_enumeration_method = ENUMERATION_FALLBACK;
diff --git a/libs/SDL3/src/hidapi/android/hid.cpp b/libs/SDL3/src/hidapi/android/hid.cpp
index 3b4c9d265..86040d655 100644
--- a/libs/SDL3/src/hidapi/android/hid.cpp
+++ b/libs/SDL3/src/hidapi/android/hid.cpp
@@ -98,9 +98,6 @@ struct hid_device_
 	int m_nDeviceRefCount;
 };
 
-static JavaVM *g_JVM;
-static pthread_key_t g_ThreadKey;
-
 template<class T>
 class hid_device_ref
 {
@@ -495,10 +492,7 @@ class CHIDDevice
 
 	bool BOpen()
 	{
-		// Make sure thread is attached to JVM/env
-		JNIEnv *env;
-		g_JVM->AttachCurrentThread( &env, NULL );
-		pthread_setspecific( g_ThreadKey, (void*)env );
+		JNIEnv *env = SDL_GetAndroidJNIEnv();
 
 		if ( !g_HIDDeviceManagerCallbackHandler )
 		{
@@ -506,46 +500,38 @@ class CHIDDevice
 			return false;
 		}
 
-		m_bIsWaitingForOpen = false;
-		m_bOpenResult = env->CallBooleanMethod( g_HIDDeviceManagerCallbackHandler, g_midHIDDeviceManagerOpen, m_nId );
-		ExceptionCheck( env, "BOpen" );
-
 		if ( m_bIsWaitingForOpen )
 		{
-			hid_mutex_guard cvl( &m_cvLock );
-
-			const int OPEN_TIMEOUT_SECONDS = 60;
-			struct timespec ts, endtime;
-			clock_gettime( CLOCK_REALTIME, &ts );
-			endtime = ts;
-			endtime.tv_sec += OPEN_TIMEOUT_SECONDS;
-			do
-			{
-				if ( pthread_cond_timedwait( &m_cv, &m_cvLock, &endtime ) != 0 )
-				{
-					break;
-				}
-			}
-			while ( m_bIsWaitingForOpen && get_timespec_ms( ts ) < get_timespec_ms( endtime ) );
+			SDL_SetError( "Waiting for permission" );
+			return false;
 		}
 
 		if ( !m_bOpenResult )
 		{
+			m_bOpenResult = env->CallBooleanMethod( g_HIDDeviceManagerCallbackHandler, g_midHIDDeviceManagerOpen, m_nId );
+			ExceptionCheck( env, "BOpen" );
+
 			if ( m_bIsWaitingForOpen )
 			{
-				LOGV( "Device open failed - timed out waiting for device permission" );
+				LOGV( "Device open waiting for permission" );
+				SDL_SetError( "Waiting for permission" );
+				m_bWasOpenPending = true;
+				return false;
 			}
-			else
+
+			if ( !m_bOpenResult )
 			{
 				LOGV( "Device open failed" );
+				SDL_SetError( "Device open failed" );
+				return false;
 			}
-			return false;
 		}
 
 		m_pDevice = new hid_device;
 		m_pDevice->m_nId = m_nId;
 		m_pDevice->m_nDeviceRefCount = 1;
 		LOGD("Creating device %d (%p), refCount = 1\n", m_pDevice->m_nId, m_pDevice);
+
 		return true;
 	}
 
@@ -554,16 +540,44 @@ class CHIDDevice
 		m_bIsWaitingForOpen = true;
 	}
 
+	bool BOpenPending() const
+	{
+		return m_bIsWaitingForOpen;
+	}
+
+	void SetWasOpenPending( bool bState )
+	{
+		m_bWasOpenPending = bState;
+	}
+
+	bool BWasOpenPending() const
+	{
+		return m_bWasOpenPending;
+	}
+
 	void SetOpenResult( bool bResult )
 	{
 		if ( m_bIsWaitingForOpen )
 		{
 			m_bOpenResult = bResult;
 			m_bIsWaitingForOpen = false;
-			pthread_cond_signal( &m_cv );
+
+			if ( m_bOpenResult )
+			{
+				LOGV( "Device open succeeded" );
+			}
+			else
+			{
+				LOGV( "Device open failed" );
+			}
 		}
 	}
 
+	bool BOpenResult() const
+	{
+		return m_bOpenResult;
+	}
+
 	void ProcessInput( const uint8_t *pBuf, size_t nBufSize )
 	{
 		hid_mutex_guard l( &m_dataLock );
@@ -610,23 +624,18 @@ class CHIDDevice
 
 	int WriteReport( const unsigned char *pData, size_t nDataLen, bool bFeature )
 	{
-		// Make sure thread is attached to JVM/env
-		JNIEnv *env;
-		g_JVM->AttachCurrentThread( &env, NULL );
-		pthread_setspecific( g_ThreadKey, (void*)env );
+		JNIEnv *env = SDL_GetAndroidJNIEnv();
 
-		int nRet = -1;
-		if ( g_HIDDeviceManagerCallbackHandler )
-		{
-			jbyteArray pBuf = NewByteArray( env, pData, nDataLen );
-			nRet = env->CallIntMethod( g_HIDDeviceManagerCallbackHandler, g_midHIDDeviceManagerWriteReport, m_nId, pBuf, bFeature );
-			ExceptionCheck( env, "WriteReport" );
-			env->DeleteLocalRef( pBuf );
-		}
-		else
+		if ( !g_HIDDeviceManagerCallbackHandler )
 		{
 			LOGV( "WriteReport without callback handler" );
+			return -1;
 		}
+
+		jbyteArray pBuf = NewByteArray( env, pData, nDataLen );
+		int nRet = env->CallIntMethod( g_HIDDeviceManagerCallbackHandler, g_midHIDDeviceManagerWriteReport, m_nId, pBuf, bFeature );
+		ExceptionCheck( env, "WriteReport" );
+		env->DeleteLocalRef( pBuf );
 		return nRet;
 	}
 
@@ -645,10 +654,7 @@ class CHIDDevice
 
 	int ReadReport( unsigned char *pData, size_t nDataLen, bool bFeature )
 	{
-		// Make sure thread is attached to JVM/env
-		JNIEnv *env;
-		g_JVM->AttachCurrentThread( &env, NULL );
-		pthread_setspecific( g_ThreadKey, (void*)env );
+		JNIEnv *env = SDL_GetAndroidJNIEnv();
 
 		if ( !g_HIDDeviceManagerCallbackHandler )
 		{
@@ -721,15 +727,15 @@ class CHIDDevice
 
 	void Close( bool bDeleteDevice )
 	{
-		// Make sure thread is attached to JVM/env
-		JNIEnv *env;
-		g_JVM->AttachCurrentThread( &env, NULL );
-		pthread_setspecific( g_ThreadKey, (void*)env );
+		JNIEnv *env = SDL_GetAndroidJNIEnv();
 
 		if ( g_HIDDeviceManagerCallbackHandler )
 		{
-			env->CallVoidMethod( g_HIDDeviceManagerCallbackHandler, g_midHIDDeviceManagerClose, m_nId );
-			ExceptionCheck( env, "Close" );
+			if ( !m_bIsWaitingForOpen && m_bOpenResult )
+			{
+				env->CallVoidMethod( g_HIDDeviceManagerCallbackHandler, g_midHIDDeviceManagerClose, m_nId );
+				ExceptionCheck( env, "Close" );
+			}
 		}
 
 		hid_mutex_guard dataLock( &m_dataLock );
@@ -764,6 +770,7 @@ class CHIDDevice
 	pthread_mutex_t m_cvLock = PTHREAD_MUTEX_INITIALIZER; // This lock has to be held to access any variables below
 	pthread_cond_t m_cv = PTHREAD_COND_INITIALIZER;
 	bool m_bIsWaitingForOpen = false;
+	bool m_bWasOpenPending = false;
 	bool m_bOpenResult = false;
 	bool m_bIsWaitingForReportResponse = false;
 	int m_nReportResponseError = 0;
@@ -793,16 +800,6 @@ static hid_device_ref<CHIDDevice> FindDevice( int nDeviceId )
 	return pDevice;
 }
 
-static void ThreadDestroyed(void* value)
-{
-	/* The thread is being destroyed, detach it from the Java VM and set the g_ThreadKey value to NULL as required */
-	JNIEnv *env = (JNIEnv*) value;
-	if (env != NULL) {
-		g_JVM->DetachCurrentThread();
-		pthread_setspecific(g_ThreadKey, NULL);
-	}
-}
-
 
 extern "C"
 JNIEXPORT void JNICALL HID_DEVICE_MANAGER_JAVA_INTERFACE(HIDDeviceRegisterCallback)(JNIEnv *env, jobject thiz);
@@ -834,16 +831,6 @@ JNIEXPORT void JNICALL HID_DEVICE_MANAGER_JAVA_INTERFACE(HIDDeviceRegisterCallba
 {
 	LOGV( "HIDDeviceRegisterCallback()");
 
-	env->GetJavaVM( &g_JVM );
-
-	/*
-	 * Create mThreadKey so we can keep track of the JNIEnv assigned to each thread
-	 * Refer to http://developer.android.com/guide/practices/design/jni.html for the rationale behind this
-	 */
-	if (pthread_key_create(&g_ThreadKey, ThreadDestroyed) != 0) {
-		__android_log_print(ANDROID_LOG_ERROR, TAG, "Error initializing pthread key");
-	}
-
 	if ( g_HIDDeviceManagerCallbackHandler != NULL )
 	{
 		env->DeleteGlobalRef( g_HIDDeviceManagerCallbackClass );
@@ -1029,51 +1016,43 @@ JNIEXPORT void JNICALL HID_DEVICE_MANAGER_JAVA_INTERFACE(HIDDeviceReportResponse
 extern "C"
 {
 
-// !!! FIXME: make this non-blocking!
-static void SDLCALL RequestAndroidPermissionBlockingCallback(void *userdata, const char *permission, bool granted)
+static void SDLCALL RequestBluetoothPermissionCallback( void *userdata, const char *permission, bool granted )
 {
-    SDL_SetAtomicInt((SDL_AtomicInt *) userdata, granted ? 1 : -1);
-}
+	SDL_Log( "Bluetooth permission %s\n", granted ? "granted" : "denied" );
 
-static bool RequestBluetoothPermissions(const char *permission)
-{
-    // !!! FIXME: make this non-blocking!
-    SDL_AtomicInt permission_response;
-    SDL_SetAtomicInt(&permission_response, 0);
-    if (!SDL_RequestAndroidPermission(permission, RequestAndroidPermissionBlockingCallback, &permission_response)) {
-        return false;
-    }
-
-    while (SDL_GetAtomicInt(&permission_response) == 0) {
-        SDL_Delay(10);
-    }
-
-    return SDL_GetAtomicInt(&permission_response) > 0;
-}
+	if ( granted && g_HIDDeviceManagerCallbackHandler )
+	{
+		JNIEnv *env = SDL_GetAndroidJNIEnv();
 
+		env->CallBooleanMethod( g_HIDDeviceManagerCallbackHandler, g_midHIDDeviceManagerInitialize, false, true );
+	}
+}
 
 int hid_init(void)
 {
 	if ( !g_initialized && g_HIDDeviceManagerCallbackHandler )
 	{
 		// HIDAPI doesn't work well with Android < 4.3
-		if (SDL_GetAndroidSDKVersion() >= 18) {
-			// Make sure thread is attached to JVM/env
-			JNIEnv *env;
-			g_JVM->AttachCurrentThread( &env, NULL );
-			pthread_setspecific( g_ThreadKey, (void*)env );
+		if ( SDL_GetAndroidSDKVersion() >= 18 )
+		{
+			JNIEnv *env = SDL_GetAndroidJNIEnv();
+
+			env->CallBooleanMethod( g_HIDDeviceManagerCallbackHandler, g_midHIDDeviceManagerInitialize, true, false );
 
 			// Bluetooth is currently only used for Steam Controllers, so check that hint
 			// before initializing Bluetooth, which will prompt the user for permission.
-			bool init_usb = true;
-			bool init_bluetooth = false;
-			if (SDL_GetHintBoolean(SDL_HINT_JOYSTICK_HIDAPI_STEAM, false)) {
-				if (SDL_GetAndroidSDKVersion() < 31 ||
-					RequestBluetoothPermissions("android.permission.BLUETOOTH_CONNECT")) {
-					init_bluetooth = true;
+			if ( SDL_GetHintBoolean( SDL_HINT_JOYSTICK_HIDAPI_STEAM, false ) )
+			{
+				if ( SDL_GetAndroidSDKVersion() < 31 )
+				{
+					env->CallBooleanMethod( g_HIDDeviceManagerCallbackHandler, g_midHIDDeviceManagerInitialize, false, true );
+				}
+				else
+				{
+					SDL_Log( "Requesting Bluetooth permission" );
+					SDL_RequestAndroidPermission( "android.permission.BLUETOOTH_CONNECT", RequestBluetoothPermissionCallback, NULL );
 				}
 			}
-			env->CallBooleanMethod( g_HIDDeviceManagerCallbackHandler, g_midHIDDeviceManagerInitialize, init_usb, init_bluetooth );
 			ExceptionCheck( env, NULL, "hid_init" );
 		}
 		g_initialized = true;	// Regardless of result, so it's only called once
@@ -1088,6 +1067,18 @@ struct hid_device_info HID_API_EXPORT * HID_API_CALL hid_enumerate(unsigned shor
 	hid_mutex_guard l( &g_DevicesMutex );
 	for ( hid_device_ref<CHIDDevice> pDevice = g_Devices; pDevice; pDevice = pDevice->next )
 	{
+		// Don't enumerate devices that are currently being opened, we'll re-enumerate them when we're done
+		// Make sure we skip them at least once, so they get removed and then re-added to the caller's device list
+		if ( pDevice->BWasOpenPending() )
+		{
+			// Don't enumerate devices that failed to open, otherwise the application might try to keep prompting for access
+			if ( !pDevice->BOpenPending() && pDevice->BOpenResult() )
+			{
+				pDevice->SetWasOpenPending( false );
+			}
+			continue;
+		}
+
 		const hid_device_info *info = pDevice->GetDeviceInfo();
 
 		/* See if there are any devices we should skip in enumeration */
@@ -1148,7 +1139,12 @@ HID_API_EXPORT hid_device * HID_API_CALL hid_open_path(const char *path)
 			}
 		}
 	}
-	if ( pDevice && pDevice->BOpen() )
+	if ( !pDevice )
+	{
+		SDL_SetError( "Couldn't find device with path %s", path );
+		return NULL;
+	}
+	if ( pDevice->BOpen() )
 	{
 		return pDevice->GetDevice();
 	}
@@ -1159,7 +1155,7 @@ int  HID_API_EXPORT HID_API_CALL hid_write(hid_device *device, const unsigned ch
 {
 	if ( device )
 	{
-		LOGV( "hid_write id=%d length=%zu", device->m_nId, length );
+//		LOGV( "hid_write id=%d length=%zu", device->m_nId, length );
 		hid_device_ref<CHIDDevice> pDevice = FindDevice( device->m_nId );
 		if ( pDevice )
 		{
@@ -1223,7 +1219,7 @@ int HID_API_EXPORT HID_API_CALL hid_read_timeout(hid_device *device, unsigned ch
 // TODO: Implement blocking
 int  HID_API_EXPORT HID_API_CALL hid_read(hid_device *device, unsigned char *data, size_t length)
 {
-	LOGV( "hid_read id=%d length=%zu", device->m_nId, length );
+//	LOGV( "hid_read id=%d length=%zu", device->m_nId, length );
 	return hid_read_timeout( device, data, length, 0 );
 }
 
diff --git a/libs/SDL3/src/joystick/SDL_gamepad.c b/libs/SDL3/src/joystick/SDL_gamepad.c
index bb7904c86..3c5e7edd9 100644
--- a/libs/SDL3/src/joystick/SDL_gamepad.c
+++ b/libs/SDL3/src/joystick/SDL_gamepad.c
@@ -2595,12 +2595,8 @@ bool SDL_IsGamepad(SDL_JoystickID instance_id)
 /*
  * Return 1 if the gamepad should be ignored by SDL
  */
-bool SDL_ShouldIgnoreGamepad(const char *name, SDL_GUID guid)
+bool SDL_ShouldIgnoreGamepad(Uint16 vendor_id, Uint16 product_id, Uint16 version, const char *name)
 {
-    Uint16 vendor;
-    Uint16 product;
-    Uint16 version;
-
 #ifdef SDL_PLATFORM_LINUX
     if (SDL_endswith(name, " Motion Sensors")) {
         // Don't treat the PS3 and PS4 motion controls as a separate gamepad
@@ -2624,37 +2620,17 @@ bool SDL_ShouldIgnoreGamepad(const char *name, SDL_GUID guid)
         return true;
     }
 
-    if (SDL_allowed_gamepads.num_included_entries == 0 &&
-        SDL_ignored_gamepads.num_included_entries == 0) {
-        return false;
-    }
-
-    SDL_GetJoystickGUIDInfo(guid, &vendor, &product, &version, NULL);
-
-    if (SDL_GetHintBoolean("SDL_GAMECONTROLLER_ALLOW_STEAM_VIRTUAL_GAMEPAD", false)) {
-        // We shouldn't ignore Steam's virtual gamepad since it's using the hints to filter out the real gamepads so it can remap input for the virtual gamepad
-        // https://partner.steamgames.com/doc/features/steam_gamepad/steam_input_gamepad_emulation_bestpractices
-        bool bSteamVirtualGamepad = false;
-#ifdef SDL_PLATFORM_LINUX
-        bSteamVirtualGamepad = (vendor == USB_VENDOR_VALVE && product == USB_PRODUCT_STEAM_VIRTUAL_GAMEPAD);
-#elif defined(SDL_PLATFORM_MACOS)
-        bSteamVirtualGamepad = (vendor == USB_VENDOR_MICROSOFT && product == USB_PRODUCT_XBOX360_WIRED_CONTROLLER && version == 0);
-#elif defined(SDL_PLATFORM_WIN32)
-        // We can't tell on Windows, but Steam will block others in input hooks
-        bSteamVirtualGamepad = true;
-#endif
-        if (bSteamVirtualGamepad) {
-            return false;
-        }
+    if (SDL_IsJoystickSteamVirtualGamepad(vendor_id, product_id, version)) {
+        return !SDL_GetHintBoolean("SDL_GAMECONTROLLER_ALLOW_STEAM_VIRTUAL_GAMEPAD", false);
     }
 
     if (SDL_allowed_gamepads.num_included_entries > 0) {
-        if (SDL_VIDPIDInList(vendor, product, &SDL_allowed_gamepads)) {
+        if (SDL_VIDPIDInList(vendor_id, product_id, &SDL_allowed_gamepads)) {
             return false;
         }
         return true;
     } else {
-        if (SDL_VIDPIDInList(vendor, product, &SDL_ignored_gamepads)) {
+        if (SDL_VIDPIDInList(vendor_id, product_id, &SDL_ignored_gamepads)) {
             return true;
         }
         return false;
diff --git a/libs/SDL3/src/joystick/SDL_gamepad_c.h b/libs/SDL3/src/joystick/SDL_gamepad_c.h
index 6fffe8a37..b58dd31a4 100644
--- a/libs/SDL3/src/joystick/SDL_gamepad_c.h
+++ b/libs/SDL3/src/joystick/SDL_gamepad_c.h
@@ -39,7 +39,7 @@ extern void SDL_PrivateGamepadRemoved(SDL_JoystickID instance_id);
 extern bool SDL_IsGamepadNameAndGUID(const char *name, SDL_GUID guid);
 
 // Function to return whether a gamepad should be ignored
-extern bool SDL_ShouldIgnoreGamepad(const char *name, SDL_GUID guid);
+extern bool SDL_ShouldIgnoreGamepad(Uint16 vendor_id, Uint16 product_id, Uint16 version, const char *name);
 
 // Handle delayed guide button on a gamepad
 extern void SDL_GamepadHandleDelayedGuideButton(SDL_Joystick *joystick);
diff --git a/libs/SDL3/src/joystick/SDL_gamepad_db.h b/libs/SDL3/src/joystick/SDL_gamepad_db.h
index 60914af3b..a12796df9 100644
--- a/libs/SDL3/src/joystick/SDL_gamepad_db.h
+++ b/libs/SDL3/src/joystick/SDL_gamepad_db.h
@@ -29,6 +29,9 @@
    Alternatively, you can use the app located in test/controllermap
  */
 static const char *s_GamepadMappings[] = {
+#ifdef SDL_JOYSTICK_PRIVATE
+    SDL_PRIVATE_GAMEPAD_DEFINITIONS
+#endif
 #ifdef SDL_JOYSTICK_XINPUT
     "xinput,*,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,",
 #endif
@@ -732,7 +735,7 @@ static const char *s_GamepadMappings[] = {
     "05000000de2800000212000001000000,Steam Controller,a:b0,b:b1,back:b6,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,paddle1:b11,paddle2:b10,rightshoulder:b5,righttrigger:a3,start:b7,x:b2,y:b3,",
     "05000000de2800000511000001000000,Steam Controller,a:b0,b:b1,back:b6,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,paddle1:b11,paddle2:b10,rightshoulder:b5,righttrigger:a3,start:b7,x:b2,y:b3,",
     "05000000de2800000611000001000000,Steam Controller,a:b0,b:b1,back:b6,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,paddle1:b11,paddle2:b10,rightshoulder:b5,righttrigger:a3,start:b7,x:b2,y:b3,",
-    "03000000de2800000512000000016800,Steam Deck,a:b0,b:b1,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,misc1:b11,paddle1:b12,paddle2:b13,paddle3:b14,paddle4:b15,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,",
+    "03000000de2800000512000000016800,Steam Deck Controller,a:b0,b:b1,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,misc1:b11,paddle1:b12,paddle2:b13,paddle3:b14,paddle4:b15,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,",
     "03000000de2800000512000011010000,Steam Deck,a:b3,b:b4,back:b11,dpdown:b17,dpleft:b18,dpright:b19,dpup:b16,guide:b13,leftshoulder:b7,leftstick:b14,lefttrigger:a9,leftx:a0,lefty:a1,misc1:b2,paddle1:b21,paddle2:b20,paddle3:b23,paddle4:b22,rightshoulder:b8,rightstick:b15,righttrigger:a8,rightx:a2,righty:a3,start:b12,x:b5,y:b6,",
     "03000000de280000ff11000001000000,Steam Virtual Gamepad,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,",
     "0500000011010000311400001b010000,SteelSeries Stratus Duo,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b32,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,",
diff --git a/libs/SDL3/src/joystick/SDL_joystick.c b/libs/SDL3/src/joystick/SDL_joystick.c
index fcc6565ec..8e27bc4d1 100644
--- a/libs/SDL3/src/joystick/SDL_joystick.c
+++ b/libs/SDL3/src/joystick/SDL_joystick.c
@@ -52,6 +52,9 @@ static SDL_JoystickDriver *SDL_joystick_drivers[] = {
 #ifdef SDL_JOYSTICK_HIDAPI // Highest priority driver for supported devices
     &SDL_HIDAPI_JoystickDriver,
 #endif
+#ifdef SDL_JOYSTICK_PRIVATE
+    &SDL_PRIVATE_JoystickDriver,
+#endif
 #ifdef SDL_JOYSTICK_GAMEINPUT // Higher priority than other Windows drivers
     &SDL_GAMEINPUT_JoystickDriver,
 #endif
@@ -888,9 +891,6 @@ static bool IsROGAlly(SDL_Joystick *joystick)
 
 static bool ShouldAttemptSensorFusion(SDL_Joystick *joystick, bool *invert_sensors)
 {
-    const char *hint;
-    int hint_value;
-
     SDL_AssertJoysticksLocked();
 
     *invert_sensors = false;
@@ -905,30 +905,26 @@ static bool ShouldAttemptSensorFusion(SDL_Joystick *joystick, bool *invert_senso
         return false;
     }
 
-    hint = SDL_GetHint(SDL_HINT_GAMECONTROLLER_SENSOR_FUSION);
-    hint_value = SDL_GetStringInteger(hint, -1);
-    if (hint_value > 0) {
-        return true;
-    }
-    if (hint_value == 0) {
-        return false;
-    }
-
-    if (hint) {
-        SDL_vidpid_list gamepads;
-        SDL_GUID guid;
-        Uint16 vendor, product;
-        bool enabled;
-        SDL_zero(gamepads);
-
-        // See if the gamepad is in our list of devices to enable
-        guid = SDL_GetJoystickGUID(joystick);
-        SDL_GetJoystickGUIDInfo(guid, &vendor, &product, NULL, NULL);
-        SDL_LoadVIDPIDListFromHints(&gamepads, hint, NULL);
-        enabled = SDL_VIDPIDInList(vendor, product, &gamepads);
-        SDL_FreeVIDPIDList(&gamepads);
-        if (enabled) {
-            return true;
+    const char *hint = SDL_GetHint(SDL_HINT_GAMECONTROLLER_SENSOR_FUSION);
+    if (hint && *hint) {
+        if (*hint == '@' || SDL_strncmp(hint, "0x", 2) == 0) {
+            SDL_vidpid_list gamepads;
+            SDL_GUID guid;
+            Uint16 vendor, product;
+            bool enabled;
+            SDL_zero(gamepads);
+
+            // See if the gamepad is in our list of devices to enable
+            guid = SDL_GetJoystickGUID(joystick);
+            SDL_GetJoystickGUIDInfo(guid, &vendor, &product, NULL, NULL);
+            SDL_LoadVIDPIDListFromHints(&gamepads, hint, NULL);
+            enabled = SDL_VIDPIDInList(vendor, product, &gamepads);
+            SDL_FreeVIDPIDList(&gamepads);
+            if (enabled) {
+                return true;
+            }
+        } else {
+            return SDL_GetStringBoolean(hint, false);
         }
     }
 
@@ -3094,6 +3090,15 @@ bool SDL_IsJoystickNVIDIASHIELDController(Uint16 vendor_id, Uint16 product_id)
              product_id == USB_PRODUCT_NVIDIA_SHIELD_CONTROLLER_V104));
 }
 
+bool SDL_IsJoystickSteamVirtualGamepad(Uint16 vendor_id, Uint16 product_id, Uint16 version)
+{
+#ifdef SDL_PLATFORM_MACOS
+    return (vendor_id == USB_VENDOR_MICROSOFT && product_id == USB_PRODUCT_XBOX360_WIRED_CONTROLLER && version == 0);
+#else
+    return (vendor_id == USB_VENDOR_VALVE && product_id == USB_PRODUCT_STEAM_VIRTUAL_GAMEPAD);
+#endif
+}
+
 bool SDL_IsJoystickSteamController(Uint16 vendor_id, Uint16 product_id)
 {
     EControllerType eType = GuessControllerType(vendor_id, product_id);
@@ -3231,24 +3236,19 @@ static SDL_JoystickType SDL_GetJoystickGUIDType(SDL_GUID guid)
     return SDL_JOYSTICK_TYPE_UNKNOWN;
 }
 
-bool SDL_ShouldIgnoreJoystick(const char *name, SDL_GUID guid)
+bool SDL_ShouldIgnoreJoystick(Uint16 vendor_id, Uint16 product_id, Uint16 version, const char *name)
 {
-    Uint16 vendor;
-    Uint16 product;
-
-    SDL_GetJoystickGUIDInfo(guid, &vendor, &product, NULL, NULL);
-
     // Check the joystick blacklist
-    if (SDL_VIDPIDInList(vendor, product, &blacklist_devices)) {
+    if (SDL_VIDPIDInList(vendor_id, product_id, &blacklist_devices)) {
         return true;
     }
     if (!SDL_GetHintBoolean(SDL_HINT_JOYSTICK_ROG_CHAKRAM, false)) {
-        if (SDL_VIDPIDInList(vendor, product, &rog_gamepad_mice)) {
+        if (SDL_VIDPIDInList(vendor_id, product_id, &rog_gamepad_mice)) {
             return true;
         }
     }
 
-    if (SDL_ShouldIgnoreGamepad(name, guid)) {
+    if (SDL_ShouldIgnoreGamepad(vendor_id, product_id, version, name)) {
         return true;
     }
 
diff --git a/libs/SDL3/src/joystick/SDL_joystick_c.h b/libs/SDL3/src/joystick/SDL_joystick_c.h
index b31dcb18b..d8b84c0cb 100644
--- a/libs/SDL3/src/joystick/SDL_joystick_c.h
+++ b/libs/SDL3/src/joystick/SDL_joystick_c.h
@@ -126,6 +126,9 @@ extern bool SDL_IsJoystickGoogleStadiaController(Uint16 vendor_id, Uint16 produc
 // Function to return whether a joystick is an NVIDIA SHIELD controller
 extern bool SDL_IsJoystickNVIDIASHIELDController(Uint16 vendor_id, Uint16 product_id);
 
+// Function to return whether a joystick is a Steam Virtual Gamepad
+extern bool SDL_IsJoystickSteamVirtualGamepad(Uint16 vendor_id, Uint16 product_id, Uint16 version);
+
 // Function to return whether a joystick is a Steam Controller
 extern bool SDL_IsJoystickSteamController(Uint16 vendor_id, Uint16 product_id);
 
@@ -154,7 +157,7 @@ extern bool SDL_IsJoystickRAWINPUT(SDL_GUID guid);
 extern bool SDL_IsJoystickVIRTUAL(SDL_GUID guid);
 
 // Function to return whether a joystick should be ignored
-extern bool SDL_ShouldIgnoreJoystick(const char *name, SDL_GUID guid);
+extern bool SDL_ShouldIgnoreJoystick(Uint16 vendor_id, Uint16 product_id, Uint16 version, const char *name);
 
 // Internal event queueing functions
 extern void SDL_PrivateJoystickAddTouchpad(SDL_Joystick *joystick, int nfingers);
diff --git a/libs/SDL3/src/joystick/SDL_steam_virtual_gamepad.c b/libs/SDL3/src/joystick/SDL_steam_virtual_gamepad.c
index 1250dd697..4b446b20f 100644
--- a/libs/SDL3/src/joystick/SDL_steam_virtual_gamepad.c
+++ b/libs/SDL3/src/joystick/SDL_steam_virtual_gamepad.c
@@ -127,6 +127,11 @@ void SDL_InitSteamVirtualGamepadInfo(void)
 
     SDL_AssertJoysticksLocked();
 
+    // The file isn't available inside the macOS sandbox
+    if (SDL_GetSandbox() == SDL_SANDBOX_MACOS) {
+        return;
+    }
+
     file = SDL_GetHint(SDL_HINT_STEAM_VIRTUAL_GAMEPAD_INFO_FILE);
     if (file && *file) {
         SDL_steam_virtual_gamepad_info_file = SDL_strdup(file);
diff --git a/libs/SDL3/src/joystick/SDL_sysjoystick.h b/libs/SDL3/src/joystick/SDL_sysjoystick.h
index 30934fb4a..49e784d01 100644
--- a/libs/SDL3/src/joystick/SDL_sysjoystick.h
+++ b/libs/SDL3/src/joystick/SDL_sysjoystick.h
@@ -240,6 +240,7 @@ typedef struct SDL_JoystickDriver
 #define SDL_LED_MIN_REPEAT_MS 5000
 
 // The available joystick drivers
+extern SDL_JoystickDriver SDL_PRIVATE_JoystickDriver;
 extern SDL_JoystickDriver SDL_ANDROID_JoystickDriver;
 extern SDL_JoystickDriver SDL_BSD_JoystickDriver;
 extern SDL_JoystickDriver SDL_DARWIN_JoystickDriver;
diff --git a/libs/SDL3/src/joystick/apple/SDL_mfijoystick.m b/libs/SDL3/src/joystick/apple/SDL_mfijoystick.m
index a11176803..0e62494fe 100644
--- a/libs/SDL3/src/joystick/apple/SDL_mfijoystick.m
+++ b/libs/SDL3/src/joystick/apple/SDL_mfijoystick.m
@@ -392,7 +392,8 @@ static bool IOS_AddMFIJoystickDevice(SDL_JoystickDeviceItem *device, GCControlle
     device->is_switch_joyconL = IsControllerSwitchJoyConL(controller);
     device->is_switch_joyconR = IsControllerSwitchJoyConR(controller);
 #ifdef SDL_JOYSTICK_HIDAPI
-    if ((device->is_xbox && HIDAPI_IsDeviceTypePresent(SDL_GAMEPAD_TYPE_XBOXONE)) ||
+    if ((device->is_xbox && (HIDAPI_IsDeviceTypePresent(SDL_GAMEPAD_TYPE_XBOXONE) ||
+                             HIDAPI_IsDeviceTypePresent(SDL_GAMEPAD_TYPE_XBOX360))) ||
         (device->is_ps4 && HIDAPI_IsDeviceTypePresent(SDL_GAMEPAD_TYPE_PS4)) ||
         (device->is_ps5 && HIDAPI_IsDeviceTypePresent(SDL_GAMEPAD_TYPE_PS5)) ||
         (device->is_switch_pro && HIDAPI_IsDeviceTypePresent(SDL_GAMEPAD_TYPE_NINTENDO_SWITCH_PRO)) ||
@@ -404,6 +405,10 @@ static bool IOS_AddMFIJoystickDevice(SDL_JoystickDeviceItem *device, GCControlle
         return false;
     }
 #endif
+    if (device->is_xbox && SDL_strncmp(name, "GamePad-", 8) == 0) {
+        // This is a Steam Virtual Gamepad, which isn't supported by GCController
+        return false;
+    }
     CheckControllerSiriRemote(controller, &device->is_siri_remote);
 
     if (device->is_siri_remote && !SDL_GetHintBoolean(SDL_HINT_TV_REMOTE_AS_JOYSTICK, true)) {
@@ -493,6 +498,10 @@ static bool IOS_AddMFIJoystickDevice(SDL_JoystickDeviceItem *device, GCControlle
         return false;
     }
 
+    if (SDL_ShouldIgnoreJoystick(vendor, product, 0, name)) {
+        return false;
+    }
+
 #ifdef ENABLE_PHYSICAL_INPUT_PROFILE
     if (@available(macOS 10.16, iOS 14.0, tvOS 14.0, *)) {
         NSDictionary<NSString *, GCControllerElement *> *elements = controller.physicalInputProfile.elements;
@@ -661,10 +670,6 @@ static bool IOS_AddMFIJoystickDevice(SDL_JoystickDeviceItem *device, GCControlle
     }
     device->guid = SDL_CreateJoystickGUID(SDL_HARDWARE_BUS_BLUETOOTH, vendor, product, signature, NULL, name, 'm', subtype);
 
-    if (SDL_ShouldIgnoreJoystick(name, device->guid)) {
-        return false;
-    }
-
     /* This will be set when the first button press of the controller is
      * detected. */
     controller.playerIndex = -1;
diff --git a/libs/SDL3/src/joystick/bsd/SDL_bsdjoystick.c b/libs/SDL3/src/joystick/bsd/SDL_bsdjoystick.c
index 195c69286..4b34116c3 100644
--- a/libs/SDL3/src/joystick/bsd/SDL_bsdjoystick.c
+++ b/libs/SDL3/src/joystick/bsd/SDL_bsdjoystick.c
@@ -426,7 +426,7 @@ static bool MaybeAddDevice(const char *path)
             name = SDL_CreateJoystickName(di.udi_vendorNo, di.udi_productNo, di.udi_vendor, di.udi_product);
             guid = SDL_CreateJoystickGUID(SDL_HARDWARE_BUS_USB, di.udi_vendorNo, di.udi_productNo, di.udi_releaseNo, di.udi_vendor, di.udi_product, 0, 0);
 
-            if (SDL_ShouldIgnoreJoystick(name, guid) ||
+            if (SDL_ShouldIgnoreJoystick(di.udi_vendorNo, di.udi_productNo, di.udi_releaseNo, name) ||
                 SDL_JoystickHandledByAnotherDriver(&SDL_BSD_JoystickDriver, di.udi_vendorNo, di.udi_productNo, di.udi_releaseNo, name)) {
                 SDL_free(name);
                 FreeHwData(hw);
diff --git a/libs/SDL3/src/joystick/darwin/SDL_iokitjoystick.c b/libs/SDL3/src/joystick/darwin/SDL_iokitjoystick.c
index c558aa7e8..19e503aee 100644
--- a/libs/SDL3/src/joystick/darwin/SDL_iokitjoystick.c
+++ b/libs/SDL3/src/joystick/darwin/SDL_iokitjoystick.c
@@ -475,6 +475,11 @@ static bool GetDeviceInfo(IOHIDDeviceRef hidDevice, recDevice *pDevice)
         CFNumberGetValue(refCF, kCFNumberSInt32Type, &version);
     }
 
+    if (SDL_IsJoystickXboxOne(vendor, product)) {
+        // We can't actually use this API for Xbox controllers
+        return false;
+    }
+
     // get device name
     refCF = IOHIDDeviceGetProperty(hidDevice, CFSTR(kIOHIDManufacturerKey));
     if ((!refCF) || (!CFStringGetCString(refCF, manufacturer_string, sizeof(manufacturer_string), kCFStringEncodingUTF8))) {
@@ -490,6 +495,10 @@ static bool GetDeviceInfo(IOHIDDeviceRef hidDevice, recDevice *pDevice)
         SDL_free(name);
     }
 
+    if (SDL_ShouldIgnoreJoystick(vendor, product, version, pDevice->product)) {
+        return false;
+    }
+
     if (SDL_JoystickHandledByAnotherDriver(&SDL_DARWIN_JoystickDriver, vendor, product, version, pDevice->product)) {
         return false;
     }
@@ -548,11 +557,6 @@ static void JoystickDeviceWasAddedCallback(void *ctx, IOReturn res, void *sender
         return; // not a device we care about, probably.
     }
 
-    if (SDL_ShouldIgnoreJoystick(device->product, device->guid)) {
-        FreeDevice(device);
-        return;
-    }
-
     // Get notified when this device is disconnected.
     IOHIDDeviceRegisterRemovalCallback(ioHIDDeviceObject, JoystickDeviceWasRemovedCallback, device);
     IOHIDDeviceScheduleWithRunLoop(ioHIDDeviceObject, CFRunLoopGetCurrent(), SDL_JOYSTICK_RUNLOOP_MODE);
diff --git a/libs/SDL3/src/joystick/gdk/SDL_gameinputjoystick.c b/libs/SDL3/src/joystick/gdk/SDL_gameinputjoystick.c
index 8b53f8d60..1a510de59 100644
--- a/libs/SDL3/src/joystick/gdk/SDL_gameinputjoystick.c
+++ b/libs/SDL3/src/joystick/gdk/SDL_gameinputjoystick.c
@@ -28,6 +28,13 @@
 #define COBJMACROS
 #include <gameinput.h>
 
+// Default value for SDL_HINT_JOYSTICK_GAMEINPUT
+#if defined(SDL_PLATFORM_GDK)
+#define SDL_GAMEINPUT_DEFAULT true
+#else
+#define SDL_GAMEINPUT_DEFAULT false
+#endif
+
 enum
 {
     SDL_GAMEPAD_BUTTON_GAMEINPUT_SHARE = 11
@@ -234,7 +241,7 @@ static bool GAMEINPUT_JoystickInit(void)
 {
     HRESULT hR;
 
-    if (!SDL_GetHintBoolean(SDL_HINT_JOYSTICK_GAMEINPUT, false)) {
+    if (!SDL_GetHintBoolean(SDL_HINT_JOYSTICK_GAMEINPUT, SDL_GAMEINPUT_DEFAULT)) {
         return true;
     }
 
diff --git a/libs/SDL3/src/joystick/hidapi/SDL_hidapi_steam.c b/libs/SDL3/src/joystick/hidapi/SDL_hidapi_steam.c
index 5116e84fb..f08586c08 100644
--- a/libs/SDL3/src/joystick/hidapi/SDL_hidapi_steam.c
+++ b/libs/SDL3/src/joystick/hidapi/SDL_hidapi_steam.c
@@ -1154,6 +1154,9 @@ static bool HIDAPI_DriverSteam_UpdateDevice(SDL_HIDAPI_Device *device)
                 SDL_SendJoystickButton(timestamp, joystick, SDL_GAMEPAD_BUTTON_STEAM_RIGHT_PADDLE,
                                           ((ctx->m_state.ulButtons & STEAM_BUTTON_BACK_RIGHT_MASK) != 0));
 
+                SDL_SendJoystickButton(timestamp, joystick, SDL_GAMEPAD_BUTTON_RIGHT_STICK,
+                                          ((ctx->m_state.ulButtons & STEAM_BUTTON_RIGHTPAD_CLICKED_MASK) != 0));
+
                 if (ctx->m_state.ulButtons & STEAM_DPAD_UP_MASK) {
                     hat |= SDL_HAT_UP;
                 }
diff --git a/libs/SDL3/src/joystick/hidapi/SDL_hidapi_xbox360.c b/libs/SDL3/src/joystick/hidapi/SDL_hidapi_xbox360.c
index f7217233a..838ed145d 100644
--- a/libs/SDL3/src/joystick/hidapi/SDL_hidapi_xbox360.c
+++ b/libs/SDL3/src/joystick/hidapi/SDL_hidapi_xbox360.c
@@ -80,21 +80,15 @@ static bool HIDAPI_DriverXbox360_IsSupportedDevice(SDL_HIDAPI_Device *device, co
         // This is the chatpad or other input interface, not the Xbox 360 interface
         return false;
     }
-#ifdef SDL_PLATFORM_MACOS
-    if (vendor_id == USB_VENDOR_MICROSOFT && product_id == USB_PRODUCT_XBOX360_WIRED_CONTROLLER && version == 0) {
-        // This is the Steam Virtual Gamepad, which isn't supported by this driver
-        return false;
-    }
-    /* Wired Xbox One controllers are handled by this driver, interfacing with
-       the 360Controller driver available from:
-       https://github.com/360Controller/360Controller/releases
-
-       Bluetooth Xbox One controllers are handled by the SDL Xbox One driver
-    */
-    if (SDL_IsJoystickBluetoothXboxOne(vendor_id, product_id)) {
+#if defined(SDL_PLATFORM_MACOS) && defined(SDL_JOYSTICK_MFI)
+    if (SDL_IsJoystickSteamVirtualGamepad(vendor_id, product_id, version)) {
+        // GCController support doesn't work with the Steam Virtual Gamepad
+        return true;
+    } else {
+        // On macOS you can't write output reports to wired XBox controllers,
+        // so we'll just use the GCController support instead.
         return false;
     }
-    return (type == SDL_GAMEPAD_TYPE_XBOX360 || type == SDL_GAMEPAD_TYPE_XBOXONE);
 #else
     return (type == SDL_GAMEPAD_TYPE_XBOX360);
 #endif
@@ -149,6 +143,13 @@ static bool HIDAPI_DriverXbox360_InitDevice(SDL_HIDAPI_Device *device)
 
     device->type = SDL_GAMEPAD_TYPE_XBOX360;
 
+    if (SDL_IsJoystickSteamVirtualGamepad(device->vendor_id, device->product_id, device->version) &&
+        device->product_string && SDL_strncmp(device->product_string, "GamePad-", 8) == 0) {
+        int slot = 0;
+        SDL_sscanf(device->product_string, "GamePad-%d", &slot);
+        device->steam_virtual_gamepad_slot = (slot - 1);
+    }
+
     return HIDAPI_JoystickConnected(device, NULL);
 }
 
@@ -197,30 +198,6 @@ static bool HIDAPI_DriverXbox360_OpenJoystick(SDL_HIDAPI_Device *device, SDL_Joy
 
 static bool HIDAPI_DriverXbox360_RumbleJoystick(SDL_HIDAPI_Device *device, SDL_Joystick *joystick, Uint16 low_frequency_rumble, Uint16 high_frequency_rumble)
 {
-#ifdef SDL_PLATFORM_MACOS
-    if (SDL_IsJoystickBluetoothXboxOne(device->vendor_id, device->product_id)) {
-        Uint8 rumble_packet[] = { 0x03, 0x0F, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00 };
-
-        rumble_packet[4] = (low_frequency_rumble >> 8);
-        rumble_packet[5] = (high_frequency_rumble >> 8);
-
-        if (SDL_HIDAPI_SendRumble(device, rumble_packet, sizeof(rumble_packet)) != sizeof(rumble_packet)) {
-            return SDL_SetError("Couldn't send rumble packet");
-        }
-    } else {
-        /* On macOS the 360Controller driver uses this short report,
-           and we need to prefix it with a magic token so hidapi passes it through untouched
-         */
-        Uint8 rumble_packet[] = { 'M', 'A', 'G', 'I', 'C', '0', 0x00, 0x04, 0x00, 0x00 };
-
-        rumble_packet[6 + 2] = (low_frequency_rumble >> 8);
-        rumble_packet[6 + 3] = (high_frequency_rumble >> 8);
-
-        if (SDL_HIDAPI_SendRumble(device, rumble_packet, sizeof(rumble_packet)) != sizeof(rumble_packet)) {
-            return SDL_SetError("Couldn't send rumble packet");
-        }
-    }
-#else
     Uint8 rumble_packet[] = { 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
 
     rumble_packet[3] = (low_frequency_rumble >> 8);
@@ -229,7 +206,6 @@ static bool HIDAPI_DriverXbox360_RumbleJoystick(SDL_HIDAPI_Device *device, SDL_J
     if (SDL_HIDAPI_SendRumble(device, rumble_packet, sizeof(rumble_packet)) != sizeof(rumble_packet)) {
         return SDL_SetError("Couldn't send rumble packet");
     }
-#endif
     return true;
 }
 
diff --git a/libs/SDL3/src/joystick/hidapi/SDL_hidapi_xboxone.c b/libs/SDL3/src/joystick/hidapi/SDL_hidapi_xboxone.c
index 0ae820ddc..6f5c47532 100644
--- a/libs/SDL3/src/joystick/hidapi/SDL_hidapi_xboxone.c
+++ b/libs/SDL3/src/joystick/hidapi/SDL_hidapi_xboxone.c
@@ -350,9 +350,11 @@ static bool HIDAPI_DriverXboxOne_IsEnabled(void)
 
 static bool HIDAPI_DriverXboxOne_IsSupportedDevice(SDL_HIDAPI_Device *device, const char *name, SDL_GamepadType type, Uint16 vendor_id, Uint16 product_id, Uint16 version, int interface_number, int interface_class, int interface_subclass, int interface_protocol)
 {
-#ifdef SDL_PLATFORM_MACOS
-    // Wired Xbox One controllers are handled by the 360Controller driver
+#if defined(SDL_PLATFORM_MACOS) && defined(SDL_JOYSTICK_MFI)
     if (!SDL_IsJoystickBluetoothXboxOne(vendor_id, product_id)) {
+        // On macOS we get a shortened version of the real report and
+        // you can't write output reports for wired controllers, so
+        // we'll just use the GCController support instead.
         return false;
     }
 #endif
@@ -1552,8 +1554,9 @@ static bool HIDAPI_GIP_ProcessData(SDL_Joystick *joystick, SDL_DriverXboxOne_Con
 
     while (size > GIP_HEADER_MIN_LENGTH) {
         hdr_len = HIDAPI_GIP_DecodeHeader(&hdr, data, size);
-        if ((hdr_len + hdr.packet_length) > (size_t)size) {
-            return false;
+        if ((hdr_len + hdr.packet_length) > (Uint32)size) {
+            // On macOS we get a shortened version of the real report
+            hdr.packet_length = (Uint32)(size - hdr_len);
         }
 
         if (!HIDAPI_GIP_ProcessPacket(joystick, ctx, &hdr, data + hdr_len)) {
diff --git a/libs/SDL3/src/joystick/hidapi/SDL_hidapijoystick.c b/libs/SDL3/src/joystick/hidapi/SDL_hidapijoystick.c
index 634d91e7e..3a0f8169c 100644
--- a/libs/SDL3/src/joystick/hidapi/SDL_hidapijoystick.c
+++ b/libs/SDL3/src/joystick/hidapi/SDL_hidapijoystick.c
@@ -31,9 +31,6 @@
 #include "../windows/SDL_rawinputjoystick_c.h"
 #endif
 
-#ifdef SDL_USE_LIBUDEV
-#include "../../core/linux/SDL_sandbox.h"
-#endif
 
 struct joystick_hwdata
 {
@@ -331,7 +328,7 @@ static SDL_HIDAPI_DeviceDriver *HIDAPI_GetDeviceDriver(SDL_HIDAPI_Device *device
         return &SDL_HIDAPI_DriverCombined;
     }
 
-    if (SDL_ShouldIgnoreJoystick(device->name, device->guid)) {
+    if (SDL_ShouldIgnoreJoystick(device->vendor_id, device->product_id, device->version, device->name)) {
         return NULL;
     }
 
@@ -457,57 +454,7 @@ static void HIDAPI_SetupDeviceDriver(SDL_HIDAPI_Device *device, bool *removed) S
             // Wait a little bit for the device to initialize
             SDL_Delay(10);
 
-#ifdef SDL_PLATFORM_ANDROID
-            /* On Android we need to leave joysticks unlocked because it calls
-             * out to the main thread for permissions and the main thread can
-             * be in the process of handling controller input.
-             *
-             * See https://github.com/libsdl-org/SDL/issues/6347 for details
-             */
-            {
-                SDL_HIDAPI_Device *curr;
-                int lock_count = 0;
-                char *path = SDL_strdup(device->path);
-
-                SDL_AssertJoysticksLocked();
-                while (SDL_JoysticksLocked()) {
-                    ++lock_count;
-                    SDL_UnlockJoysticks();
-                }
-
-                dev = SDL_hid_open_path(path);
-
-                while (lock_count > 0) {
-                    --lock_count;
-                    SDL_LockJoysticks();
-                }
-                SDL_free(path);
-
-                // Make sure the device didn't get removed while opening the HID path
-                for (curr = SDL_HIDAPI_devices; curr && curr != device; curr = curr->next) {
-                    continue;
-                }
-                if (curr == NULL) {
-                    *removed = true;
-                    if (dev) {
-                        SDL_hid_close(dev);
-                    }
-                    return;
-                }
-            }
-#else
-            /* On other platforms we want to keep the lock so other threads wait for
-             * us to finish opening the controller before checking to see whether the
-             * HIDAPI driver is handling the device.
-             *
-             * On Windows, for example, the main thread can be enumerating DirectInput
-             * devices while the Windows.Gaming.Input thread is calling back with a new
-             * controller available.
-             *
-             * See https://github.com/libsdl-org/SDL/issues/7304 for details.
-             */
             dev = SDL_hid_open_path(device->path);
-#endif
 
             if (dev == NULL) {
                 SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
@@ -586,7 +533,7 @@ static bool HIDAPI_JoystickInit(void)
             SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
                          "udev disabled by SDL_HINT_HIDAPI_UDEV");
             linux_enumeration_method = ENUMERATION_FALLBACK;
-        } else if (SDL_DetectSandbox() != SDL_SANDBOX_NONE) {
+        } else if (SDL_GetSandbox() != SDL_SANDBOX_NONE) {
             SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
                          "Container detected, disabling HIDAPI udev integration");
             linux_enumeration_method = ENUMERATION_FALLBACK;
@@ -983,6 +930,7 @@ static SDL_HIDAPI_Device *HIDAPI_AddDevice(const struct SDL_hid_device_info *inf
     device->guid = SDL_CreateJoystickGUID(bus, device->vendor_id, device->product_id, device->version, device->manufacturer_string, device->product_string, 'h', 0);
     device->joystick_type = SDL_JOYSTICK_TYPE_GAMEPAD;
     device->type = SDL_GetJoystickGameControllerProtocol(device->name, device->vendor_id, device->product_id, device->interface_number, device->interface_class, device->interface_subclass, device->interface_protocol);
+    device->steam_virtual_gamepad_slot = -1;
 
     if (num_children > 0) {
         int i;
@@ -1440,6 +1388,12 @@ static const char *HIDAPI_JoystickGetDevicePath(int device_index)
 
 static int HIDAPI_JoystickGetDeviceSteamVirtualGamepadSlot(int device_index)
 {
+    SDL_HIDAPI_Device *device;
+
+    device = HIDAPI_GetDeviceByIndex(device_index, NULL);
+    if (device) {
+        return device->steam_virtual_gamepad_slot;
+    }
     return -1;
 }
 
diff --git a/libs/SDL3/src/joystick/hidapi/SDL_hidapijoystick_c.h b/libs/SDL3/src/joystick/hidapi/SDL_hidapijoystick_c.h
index 8b97f762a..5ec0a3931 100644
--- a/libs/SDL3/src/joystick/hidapi/SDL_hidapijoystick_c.h
+++ b/libs/SDL3/src/joystick/hidapi/SDL_hidapijoystick_c.h
@@ -85,6 +85,7 @@ typedef struct SDL_HIDAPI_Device
     bool is_bluetooth;
     SDL_JoystickType joystick_type;
     SDL_GamepadType type;
+    int steam_virtual_gamepad_slot;
 
     struct SDL_HIDAPI_DeviceDriver *driver;
     void *context;
diff --git a/libs/SDL3/src/joystick/linux/SDL_sysjoystick.c b/libs/SDL3/src/joystick/linux/SDL_sysjoystick.c
index 1e85eac2f..d4a1cedd6 100644
--- a/libs/SDL3/src/joystick/linux/SDL_sysjoystick.c
+++ b/libs/SDL3/src/joystick/linux/SDL_sysjoystick.c
@@ -124,7 +124,6 @@
 
 #include "../../core/linux/SDL_evdev_capabilities.h"
 #include "../../core/linux/SDL_udev.h"
-#include "../../core/linux/SDL_sandbox.h"
 
 #if 0
 #define DEBUG_INPUT_EVENTS 1
@@ -330,15 +329,14 @@ static bool IsJoystick(const char *path, int *fd, char **name_return, Uint16 *ve
     SDL_Log("Joystick: %s, bustype = %d, vendor = 0x%.4x, product = 0x%.4x, version = %d\n", name, inpid.bustype, inpid.vendor, inpid.product, inpid.version);
 #endif
 
-    *guid = SDL_CreateJoystickGUID(inpid.bustype, inpid.vendor, inpid.product, inpid.version, NULL, product_string, 0, 0);
-
-    if (SDL_ShouldIgnoreJoystick(name, *guid)) {
+    if (SDL_ShouldIgnoreJoystick(inpid.vendor, inpid.product, inpid.version, name)) {
         SDL_free(name);
         return false;
     }
     *name_return = name;
     *vendor_return = inpid.vendor;
     *product_return = inpid.product;
+    *guid = SDL_CreateJoystickGUID(inpid.bustype, inpid.vendor, inpid.product, inpid.version, NULL, product_string, 0, 0);
     return true;
 }
 
@@ -1069,7 +1067,7 @@ static bool LINUX_JoystickInit(void)
             SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
                          "udev disabled by SDL_JOYSTICK_DISABLE_UDEV");
             enumeration_method = ENUMERATION_FALLBACK;
-        } else if (SDL_DetectSandbox() != SDL_SANDBOX_NONE) {
+        } else if (SDL_GetSandbox() != SDL_SANDBOX_NONE) {
             SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
                          "Container detected, disabling udev integration");
             enumeration_method = ENUMERATION_FALLBACK;
diff --git a/libs/SDL3/src/joystick/windows/SDL_dinputjoystick.c b/libs/SDL3/src/joystick/windows/SDL_dinputjoystick.c
index c463ce5fc..03f2704fa 100644
--- a/libs/SDL3/src/joystick/windows/SDL_dinputjoystick.c
+++ b/libs/SDL3/src/joystick/windows/SDL_dinputjoystick.c
@@ -472,6 +472,8 @@ static BOOL CALLBACK EnumJoystickDetectCallback(LPCDIDEVICEINSTANCE pDeviceInsta
     CHECK(QueryDeviceInfo(device, &vendor, &product));
 
     CHECK(!SDL_IsXInputDevice(vendor, product, hidPath));
+    CHECK(!SDL_ShouldIgnoreJoystick(vendor, product, version, name));
+    CHECK(!SDL_JoystickHandledByAnotherDriver(&SDL_WINDOWS_JoystickDriver, vendor, product, version, name));
 
     pNewJoystick = *(JoyStick_DeviceData **)pContext;
     while (pNewJoystick) {
@@ -514,10 +516,6 @@ static BOOL CALLBACK EnumJoystickDetectCallback(LPCDIDEVICEINSTANCE pDeviceInsta
         pNewJoystick->guid = SDL_CreateJoystickGUID(SDL_HARDWARE_BUS_BLUETOOTH, vendor, product, version, NULL, name, 0, 0);
     }
 
-    CHECK(!SDL_ShouldIgnoreJoystick(pNewJoystick->joystickname, pNewJoystick->guid));
-
-    CHECK(!SDL_JoystickHandledByAnotherDriver(&SDL_WINDOWS_JoystickDriver, vendor, product, version, pNewJoystick->joystickname));
-
     WINDOWS_AddJoystickDevice(pNewJoystick);
     pNewJoystick = NULL;
 
diff --git a/libs/SDL3/src/joystick/windows/SDL_rawinputjoystick.c b/libs/SDL3/src/joystick/windows/SDL_rawinputjoystick.c
index b49a703de..a32dd7a58 100644
--- a/libs/SDL3/src/joystick/windows/SDL_rawinputjoystick.c
+++ b/libs/SDL3/src/joystick/windows/SDL_rawinputjoystick.c
@@ -881,7 +881,9 @@ static void RAWINPUT_AddDevice(HANDLE hDevice)
     CHECK(GetRawInputDeviceInfoA(hDevice, RIDI_DEVICENAME, dev_name, &size) != (UINT)-1);
     // Only take XInput-capable devices
     CHECK(SDL_strstr(dev_name, "IG_") != NULL);
+    CHECK(!SDL_ShouldIgnoreJoystick((Uint16)rdi.hid.dwVendorId, (Uint16)rdi.hid.dwProductId, (Uint16)rdi.hid.dwVersionNumber, ""));
     CHECK(!SDL_JoystickHandledByAnotherDriver(&SDL_RAWINPUT_JoystickDriver, (Uint16)rdi.hid.dwVendorId, (Uint16)rdi.hid.dwProductId, (Uint16)rdi.hid.dwVersionNumber, ""));
+
     device = (SDL_RAWINPUT_Device *)SDL_calloc(1, sizeof(SDL_RAWINPUT_Device));
     CHECK(device);
     device->hDevice = hDevice;
diff --git a/libs/SDL3/src/joystick/windows/SDL_windows_gaming_input.c b/libs/SDL3/src/joystick/windows/SDL_windows_gaming_input.c
index e17933d17..72bb2d747 100644
--- a/libs/SDL3/src/joystick/windows/SDL_windows_gaming_input.c
+++ b/libs/SDL3/src/joystick/windows/SDL_windows_gaming_input.c
@@ -399,7 +399,6 @@ static HRESULT STDMETHODCALLTYPE IEventHandler_CRawGameControllerVtbl_InvokeAdde
     hr = __x_ABI_CWindows_CGaming_CInput_CIRawGameController_QueryInterface(e, &IID___x_ABI_CWindows_CGaming_CInput_CIRawGameController, (void **)&controller);
     if (SUCCEEDED(hr)) {
         char *name = NULL;
-        SDL_GUID guid = { 0 };
         Uint16 bus = SDL_HARDWARE_BUS_USB;
         Uint16 vendor = 0;
         Uint16 product = 0;
@@ -446,6 +445,10 @@ static HRESULT STDMETHODCALLTYPE IEventHandler_CRawGameControllerVtbl_InvokeAdde
             name = SDL_strdup("");
         }
 
+        if (!ignore_joystick && SDL_ShouldIgnoreJoystick(vendor, product, version, name)) {
+            ignore_joystick = true;
+        }
+
         if (!ignore_joystick && SDL_JoystickHandledByAnotherDriver(&SDL_WGI_JoystickDriver, vendor, product, version, name)) {
             ignore_joystick = true;
         }
@@ -455,18 +458,6 @@ static HRESULT STDMETHODCALLTYPE IEventHandler_CRawGameControllerVtbl_InvokeAdde
             ignore_joystick = true;
         }
 
-        if (!ignore_joystick) {
-            if (game_controller) {
-                type = GetGameControllerType(game_controller);
-            }
-
-            guid = SDL_CreateJoystickGUID(bus, vendor, product, version, NULL, name, 'w', (Uint8)type);
-
-            if (SDL_ShouldIgnoreJoystick(name, guid)) {
-                ignore_joystick = true;
-            }
-        }
-
         if (!ignore_joystick) {
             // New device, add it
             WindowsGamingInputControllerState *controllers = SDL_realloc(wgi.controllers, sizeof(wgi.controllers[0]) * (wgi.controller_count + 1));
@@ -474,11 +465,15 @@ static HRESULT STDMETHODCALLTYPE IEventHandler_CRawGameControllerVtbl_InvokeAdde
                 WindowsGamingInputControllerState *state = &controllers[wgi.controller_count];
                 SDL_JoystickID joystickID = SDL_GetNextObjectID();
 
+                if (game_controller) {
+                    type = GetGameControllerType(game_controller);
+                }
+
                 SDL_zerop(state);
                 state->instance_id = joystickID;
                 state->controller = controller;
                 state->name = name;
-                state->guid = guid;
+                state->guid = SDL_CreateJoystickGUID(bus, vendor, product, version, NULL, name, 'w', (Uint8)type);
                 state->type = type;
                 state->steam_virtual_gamepad_slot = GetSteamVirtualGamepadSlot(controller, vendor, product);
 
diff --git a/libs/SDL3/src/joystick/windows/SDL_xinputjoystick.c b/libs/SDL3/src/joystick/windows/SDL_xinputjoystick.c
index 9c36e677d..d1328ce56 100644
--- a/libs/SDL3/src/joystick/windows/SDL_xinputjoystick.c
+++ b/libs/SDL3/src/joystick/windows/SDL_xinputjoystick.c
@@ -185,13 +185,18 @@ static void AddXInputDevice(Uint8 userid, BYTE SubType, JoyStick_DeviceData **pC
         pNewJoystick = pNewJoystick->pNext;
     }
 
+    name = GetXInputName(userid, SubType);
+    GetXInputDeviceInfo(userid, &vendor, &product, &version);
+    if (SDL_ShouldIgnoreJoystick(vendor, product, version, name) ||
+        SDL_JoystickHandledByAnotherDriver(&SDL_WINDOWS_JoystickDriver, vendor, product, version, name)) {
+        return;
+    }
+
     pNewJoystick = (JoyStick_DeviceData *)SDL_calloc(1, sizeof(JoyStick_DeviceData));
     if (!pNewJoystick) {
         return; // better luck next time?
     }
 
-    name = GetXInputName(userid, SubType);
-    GetXInputDeviceInfo(userid, &vendor, &product, &version);
     pNewJoystick->bXInputDevice = true;
     pNewJoystick->joystickname = SDL_CreateJoystickName(vendor, product, NULL, name);
     if (!pNewJoystick->joystickname) {
@@ -203,16 +208,6 @@ static void AddXInputDevice(Uint8 userid, BYTE SubType, JoyStick_DeviceData **pC
     pNewJoystick->SubType = SubType;
     pNewJoystick->XInputUserId = userid;
 
-    if (SDL_ShouldIgnoreJoystick(pNewJoystick->joystickname, pNewJoystick->guid)) {
-        SDL_free(pNewJoystick);
-        return;
-    }
-
-    if (SDL_JoystickHandledByAnotherDriver(&SDL_WINDOWS_JoystickDriver, vendor, product, version, pNewJoystick->joystickname)) {
-        SDL_free(pNewJoystick);
-        return;
-    }
-
     WINDOWS_AddJoystickDevice(pNewJoystick);
 }
 
diff --git a/libs/SDL3/src/libm/e_exp.c b/libs/SDL3/src/libm/e_exp.c
index a4c8cc89a..f39bb5c53 100644
--- a/libs/SDL3/src/libm/e_exp.c
+++ b/libs/SDL3/src/libm/e_exp.c
@@ -102,7 +102,7 @@ union {
 	Uint64 u64;
 	double d;
 } inf_union = {
-	0x7ff0000000000000  /* Binary representation of a 64-bit infinite double (sign=0, exponent=2047, mantissa=0) */
+	SDL_UINT64_C(0x7ff0000000000000)  /* Binary representation of a 64-bit infinite double (sign=0, exponent=2047, mantissa=0) */
 };
 
 double __ieee754_exp(double x)	/* default IEEE double exp */
diff --git a/libs/SDL3/src/main/SDL_main_callbacks.c b/libs/SDL3/src/main/SDL_main_callbacks.c
index 60316c094..0a6e6854f 100644
--- a/libs/SDL3/src/main/SDL_main_callbacks.c
+++ b/libs/SDL3/src/main/SDL_main_callbacks.c
@@ -75,6 +75,11 @@ static bool SDLCALL SDL_MainCallbackEventWatcher(void *userdata, SDL_Event *even
         // Make sure any currently queued events are processed then dispatch this before continuing
         SDL_DispatchMainCallbackEvents();
         SDL_DispatchMainCallbackEvent(event);
+
+        // Make sure that we quit if we get a terminating event
+        if (event->type == SDL_EVENT_TERMINATING) {
+            SDL_CompareAndSwapAtomicInt(&apprc, SDL_APP_CONTINUE, SDL_APP_SUCCESS);
+        }
     } else {
         // We'll process this event later from the main event queue
     }
diff --git a/libs/SDL3/src/main/generic/SDL_sysmain_callbacks.c b/libs/SDL3/src/main/generic/SDL_sysmain_callbacks.c
index aa59d3245..fb311fbd5 100644
--- a/libs/SDL3/src/main/generic/SDL_sysmain_callbacks.c
+++ b/libs/SDL3/src/main/generic/SDL_sysmain_callbacks.c
@@ -65,7 +65,7 @@ int SDL_EnterAppMainCallbacks(int argc, char* argv[], SDL_AppInit_func appinit,
             } else {
                 const Uint64 now = SDL_GetTicksNS();
                 if (next_iteration > now) { // Running faster than the limit, sleep a little.
-                    SDL_DelayNS(next_iteration - now);
+                    SDL_DelayPrecise(next_iteration - now);
                 } else {
                     next_iteration = now; // running behind (or just lost the window)...reset the timer.
                 }
diff --git a/libs/SDL3/src/process/windows/SDL_windowsprocess.c b/libs/SDL3/src/process/windows/SDL_windowsprocess.c
index abfacc21b..dc2001439 100644
--- a/libs/SDL3/src/process/windows/SDL_windowsprocess.c
+++ b/libs/SDL3/src/process/windows/SDL_windowsprocess.c
@@ -73,6 +73,14 @@ static bool SetupRedirect(SDL_PropertiesID props, const char *property, HANDLE *
         WIN_SetError("DuplicateHandle()");
         return false;
     }
+
+    if (GetFileType(*result) == FILE_TYPE_PIPE) {
+        DWORD wait_mode = PIPE_WAIT;
+        if (!SetNamedPipeHandleState(*result, &wait_mode, NULL, NULL)) {
+            WIN_SetError("SetNamedPipeHandleState()");
+            return false;
+        }
+    }
     return true;
 }
 
diff --git a/libs/SDL3/src/render/SDL_render.c b/libs/SDL3/src/render/SDL_render.c
index 4d3ad5189..7f2a35486 100644
--- a/libs/SDL3/src/render/SDL_render.c
+++ b/libs/SDL3/src/render/SDL_render.c
@@ -23,6 +23,7 @@
 // The SDL 2D rendering system
 
 #include "SDL_sysrender.h"
+#include "SDL_render_debug_font.h"
 #include "software/SDL_render_sw_c.h"
 #include "../video/SDL_pixels_c.h"
 #include "../video/SDL_video_c.h"
@@ -3578,8 +3579,7 @@ bool SDL_RenderLines(SDL_Renderer *renderer, const SDL_FPoint *points, int count
         bool isstack1;
         bool isstack2;
         float *xy = SDL_small_alloc(float, 4 * 2 * count, &isstack1);
-        int *indices = SDL_small_alloc(int,
-                                       (4) * 3 * (count - 1) + (2) * 3 * (count), &isstack2);
+        int *indices = SDL_small_alloc(int, (4) * 3 * (count - 1) + (2) * 3 * (count), &isstack2);
 
         if (xy && indices) {
             int i;
@@ -4389,7 +4389,7 @@ bool SDL_RenderGeometry(SDL_Renderer *renderer,
 }
 
 #ifdef SDL_VIDEO_RENDER_SW
-static bool remap_one_indice(
+static int remap_one_indice(
     int prev,
     int k,
     SDL_Texture *texture,
@@ -4427,7 +4427,7 @@ static bool remap_one_indice(
     return prev;
 }
 
-static bool remap_indices(
+static int remap_indices(
     int prev[3],
     int k,
     SDL_Texture *texture,
@@ -4948,7 +4948,7 @@ static void SDL_SimulateRenderVSync(SDL_Renderer *renderer)
     elapsed = (now - renderer->last_present);
     if (elapsed < interval) {
         Uint64 duration = (interval - elapsed);
-        SDL_DelayNS(duration);
+        SDL_DelayPrecise(duration);
         now = SDL_GetTicksNS();
     }
 
@@ -5098,6 +5098,11 @@ void SDL_DestroyRendererWithoutFreeing(SDL_Renderer *renderer)
 
     SDL_DiscardAllCommands(renderer);
 
+    if (renderer->debug_char_texture_atlas) {
+        SDL_DestroyTexture(renderer->debug_char_texture_atlas);
+        renderer->debug_char_texture_atlas = NULL;
+    }
+
     // Free existing textures for this renderer
     while (renderer->textures) {
         SDL_Texture *tex = renderer->textures;
@@ -5347,3 +5352,119 @@ bool SDL_GetRenderVSync(SDL_Renderer *renderer, int *vsync)
     }
     return true;
 }
+
+
+#define SDL_DEBUG_FONT_GLYPHS_PER_ROW 14
+
+static bool CreateDebugTextAtlas(SDL_Renderer *renderer)
+{
+    SDL_assert(renderer->debug_char_texture_atlas == NULL);  // don't double-create it!
+
+    const int charWidth = SDL_DEBUG_TEXT_FONT_CHARACTER_SIZE;
+    const int charHeight = SDL_DEBUG_TEXT_FONT_CHARACTER_SIZE;
+
+    // actually make each glyph two pixels taller/wider, to prevent scaling artifacts.
+    const int rows = (SDL_DEBUG_FONT_NUM_GLYPHS / SDL_DEBUG_FONT_GLYPHS_PER_ROW) + 1;
+    SDL_Surface *atlas = SDL_CreateSurface((charWidth + 2) * SDL_DEBUG_FONT_GLYPHS_PER_ROW, rows * (charHeight + 2), SDL_PIXELFORMAT_RGBA8888);
+    if (!atlas) {
+        return false;
+    }
+
+    const int pitch = atlas->pitch;
+    SDL_memset(atlas->pixels, '\0', atlas->h * atlas->pitch);
+
+    int column = 0;
+    int row = 0;
+    for (int glyph = 0; glyph < SDL_DEBUG_FONT_NUM_GLYPHS; glyph++) {
+        // find top-left of this glyph in destination surface. The +2's account for glyph padding.
+        Uint8 *linepos = (((Uint8 *)atlas->pixels) + ((row * (charHeight + 2) + 1) * pitch)) + ((column * (charWidth + 2) + 1) * sizeof (Uint32));
+        const Uint8 *charpos = SDL_RenderDebugTextFontData + (glyph * 8);
+
+        // Draw the glyph to the surface...
+        for (int iy = 0; iy < charHeight; iy++) {
+            Uint32 *curpos = (Uint32 *)linepos;
+            for (int ix = 0; ix < charWidth; ix++) {
+                if ((*charpos) & (1 << ix)) {
+                    *curpos = 0xffffffff;
+                } else {
+                    *curpos = 0;
+                }
+                ++curpos;
+            }
+            linepos += pitch;
+            ++charpos;
+        }
+
+        // move to next position (and if too far, start the next row).
+        column++;
+        if (column >= SDL_DEBUG_FONT_GLYPHS_PER_ROW) {
+            row++;
+            column = 0;
+        }
+    }
+
+    SDL_assert((row < rows) || ((row == rows) && (column == 0)));  // make sure we didn't overflow the surface.
+
+    // Convert temp surface into texture
+    renderer->debug_char_texture_atlas = SDL_CreateTextureFromSurface(renderer, atlas);
+    SDL_DestroySurface(atlas);
+
+    return (renderer->debug_char_texture_atlas != NULL);
+}
+
+static bool DrawDebugCharacter(SDL_Renderer *renderer, float x, float y, Uint32 c)
+{
+    SDL_assert(renderer->debug_char_texture_atlas != NULL);   // should have been created by now!
+
+    const int charWidth = SDL_DEBUG_TEXT_FONT_CHARACTER_SIZE;
+    const int charHeight = SDL_DEBUG_TEXT_FONT_CHARACTER_SIZE;
+
+    // Character index in cache
+    Uint32 ci = c;
+    if ((ci <= 32) || ((ci >= 127) && (ci <= 160))) {
+        return true;  // these are just completely blank chars, don't bother doing anything.
+    } else if (ci >= SDL_DEBUG_FONT_NUM_GLYPHS) {
+        ci = SDL_DEBUG_FONT_NUM_GLYPHS - 1;  // use our "not a valid/supported character" glyph.
+    } else if (ci < 127) {
+        ci -= 33;     // adjust for the 33 blank glyphs at the start
+    } else {
+        ci -= 67;     // adjust for the 33 blank glyphs at the start AND the 34 gap in the middle.
+    }
+
+    const float src_x = (float) (((ci % SDL_DEBUG_FONT_GLYPHS_PER_ROW) * (charWidth + 2)) + 1);
+    const float src_y = (float) (((ci / SDL_DEBUG_FONT_GLYPHS_PER_ROW) * (charHeight + 2)) + 1);
+
+    // Draw texture onto destination
+    const SDL_FRect srect = { src_x, src_y, (float) charWidth, (float) charHeight };
+    const SDL_FRect drect = { x, y, (float) charWidth, (float) charHeight };
+    return SDL_RenderTexture(renderer, renderer->debug_char_texture_atlas, &srect, &drect);
+}
+
+bool SDL_RenderDebugText(SDL_Renderer *renderer, float x, float y, const char *s)
+{
+    CHECK_RENDERER_MAGIC(renderer, false);
+
+    // Allocate a texture atlas for this renderer if needed.
+    if (!renderer->debug_char_texture_atlas) {
+        if (!CreateDebugTextAtlas(renderer)) {
+            return false;
+        }
+    }
+
+    bool result = true;
+
+    Uint8 r, g, b, a;
+    result &= SDL_GetRenderDrawColor(renderer, &r, &g, &b, &a);
+    result &= SDL_SetTextureColorMod(renderer->debug_char_texture_atlas, r, g, b);
+    result &= SDL_SetTextureAlphaMod(renderer->debug_char_texture_atlas, a);
+
+    float curx = x;
+    Uint32 ch;
+
+    while (result && ((ch = SDL_StepUTF8(&s, NULL)) != 0)) {
+        result &= DrawDebugCharacter(renderer, curx, y, ch);
+        curx += SDL_DEBUG_TEXT_FONT_CHARACTER_SIZE;
+    }
+
+    return result;
+}
diff --git a/libs/SDL3/src/render/SDL_render_debug_font.h b/libs/SDL3/src/render/SDL_render_debug_font.h
new file mode 100644
index 000000000..7da057383
--- /dev/null
+++ b/libs/SDL3/src/render/SDL_render_debug_font.h
@@ -0,0 +1,2331 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2024 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef SDL_render_debug_font_h_
+#define SDL_render_debug_font_h_
+
+/* ---- 8x8 font definition ---- */
+
+/*
+; Summary: font8_8.asm
+; 8x8 monochrome bitmap fonts for rendering
+;
+; Author:
+;     Marcel Sondaar
+;     International Business Machines (public domain VGA fonts)
+;
+; License:
+;     Public Domain
+;
+*/
+
+#define SDL_DEBUG_FONT_NUM_GLYPHS 190
+
+static const Uint8 SDL_RenderDebugTextFontData[] = {
+    // there's a gap at the start.
+
+    /*
+     * 33 0x21 '!'
+     */
+    0x18, /* 00011000 */
+    0x3c, /* 00111100 */
+    0x3c, /* 00111100 */
+    0x18, /* 00011000 */
+    0x18, /* 00011000 */
+    0x00, /* 00000000 */
+    0x18, /* 00011000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 34 0x22 '"'
+     */
+    0x36, /* 01101100 */
+    0x36, /* 01101100 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 35 0x23 '#'
+     */
+    0x36, /* 01101100 */
+    0x36, /* 01101100 */
+    0x7f, /* 11111110 */
+    0x36, /* 01101100 */
+    0x7f, /* 11111110 */
+    0x36, /* 01101100 */
+    0x36, /* 01101100 */
+    0x00, /* 00000000 */
+
+    /*
+     * 36 0x24 '$'
+     */
+    0x0c, /* 00110000 */
+    0x3e, /* 01111100 */
+    0x03, /* 11000000 */
+    0x1e, /* 01111000 */
+    0x30, /* 00001100 */
+    0x1f, /* 11111000 */
+    0x0c, /* 00110000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 37 0x25 '%'
+     */
+    0x00, /* 00000000 */
+    0x63, /* 11000110 */
+    0x33, /* 11001100 */
+    0x18, /* 00011000 */
+    0x0c, /* 00110000 */
+    0x66, /* 01100110 */
+    0x63, /* 11000110 */
+    0x00, /* 00000000 */
+
+    /*
+     * 38 0x26 '&'
+     */
+    0x1c, /* 00111000 */
+    0x36, /* 01101100 */
+    0x1c, /* 00111000 */
+    0x6e, /* 01110110 */
+    0x3b, /* 11011100 */
+    0x33, /* 11001100 */
+    0x6e, /* 01110110 */
+    0x00, /* 00000000 */
+
+    /*
+     * 39 0x27 '''
+     */
+    0x06, /* 01100000 */
+    0x06, /* 01100000 */
+    0x03, /* 11000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 40 0x28 '('
+     */
+    0x18, /* 00011000 */
+    0x0c, /* 00110000 */
+    0x06, /* 01100000 */
+    0x06, /* 01100000 */
+    0x06, /* 01100000 */
+    0x0c, /* 00110000 */
+    0x18, /* 00011000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 41 0x29 ')'
+     */
+    0x06, /* 01100000 */
+    0x0c, /* 00110000 */
+    0x18, /* 00011000 */
+    0x18, /* 00011000 */
+    0x18, /* 00011000 */
+    0x0c, /* 00110000 */
+    0x06, /* 01100000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 42 0x2a '*'
+     */
+    0x00, /* 00000000 */
+    0x66, /* 01100110 */
+    0x3c, /* 00111100 */
+    0xff, /* 11111111 */
+    0x3c, /* 00111100 */
+    0x66, /* 01100110 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 43 0x2b '+'
+     */
+    0x00, /* 00000000 */
+    0x0c, /* 00110000 */
+    0x0c, /* 00110000 */
+    0x3f, /* 11111100 */
+    0x0c, /* 00110000 */
+    0x0c, /* 00110000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 44 0x2c ','
+     */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x0c, /* 00110000 */
+    0x0c, /* 00110000 */
+    0x06, /* 01100000 */
+
+    /*
+     * 45 0x2d '-'
+     */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x3f, /* 11111100 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 46 0x2e '.'
+     */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x0c, /* 00110000 */
+    0x0c, /* 00110000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 47 0x2f '/'
+     */
+    0x60, /* 00000110 */
+    0x30, /* 00001100 */
+    0x18, /* 00011000 */
+    0x0c, /* 00110000 */
+    0x06, /* 01100000 */
+    0x03, /* 11000000 */
+    0x01, /* 10000000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 48 0x30 '0'
+     */
+    0x3e, /* 01111100 */
+    0x63, /* 11000110 */
+    0x73, /* 11001110 */
+    0x7b, /* 11011110 */
+    0x6f, /* 11110110 */
+    0x67, /* 11100110 */
+    0x3e, /* 01111100 */
+    0x00, /* 00000000 */
+
+    /*
+     * 49 0x31 '1'
+     */
+    0x0c, /* 00110000 */
+    0x0e, /* 01110000 */
+    0x0c, /* 00110000 */
+    0x0c, /* 00110000 */
+    0x0c, /* 00110000 */
+    0x0c, /* 00110000 */
+    0x3f, /* 11111100 */
+    0x00, /* 00000000 */
+
+    /*
+     * 50 0x32 '2'
+     */
+    0x1e, /* 01111000 */
+    0x33, /* 11001100 */
+    0x30, /* 00001100 */
+    0x1c, /* 00111000 */
+    0x06, /* 01100000 */
+    0x33, /* 11001100 */
+    0x3f, /* 11111100 */
+    0x00, /* 00000000 */
+
+    /*
+     * 51 0x33 '3'
+     */
+    0x1e, /* 01111000 */
+    0x33, /* 11001100 */
+    0x30, /* 00001100 */
+    0x1c, /* 00111000 */
+    0x30, /* 00001100 */
+    0x33, /* 11001100 */
+    0x1e, /* 01111000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 52 0x34 '4'
+     */
+    0x38, /* 00011100 */
+    0x3c, /* 00111100 */
+    0x36, /* 01101100 */
+    0x33, /* 11001100 */
+    0x7f, /* 11111110 */
+    0x30, /* 00001100 */
+    0x78, /* 00011110 */
+    0x00, /* 00000000 */
+
+    /*
+     * 53 0x35 '5'
+     */
+    0x3f, /* 11111100 */
+    0x03, /* 11000000 */
+    0x1f, /* 11111000 */
+    0x30, /* 00001100 */
+    0x30, /* 00001100 */
+    0x33, /* 11001100 */
+    0x1e, /* 01111000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 54 0x36 '6'
+     */
+    0x1c, /* 00111000 */
+    0x06, /* 01100000 */
+    0x03, /* 11000000 */
+    0x1f, /* 11111000 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x1e, /* 01111000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 55 0x37 '7'
+     */
+    0x3f, /* 11111100 */
+    0x33, /* 11001100 */
+    0x30, /* 00001100 */
+    0x18, /* 00011000 */
+    0x0c, /* 00110000 */
+    0x0c, /* 00110000 */
+    0x0c, /* 00110000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 56 0x38 '8'
+     */
+    0x1e, /* 01111000 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x1e, /* 01111000 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x1e, /* 01111000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 57 0x39 '9'
+     */
+    0x1e, /* 01111000 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x3e, /* 01111100 */
+    0x30, /* 00001100 */
+    0x18, /* 00011000 */
+    0x0e, /* 01110000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 58 0x3a ':'
+     */
+    0x00, /* 00000000 */
+    0x0c, /* 00110000 */
+    0x0c, /* 00110000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x0c, /* 00110000 */
+    0x0c, /* 00110000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 59 0x3b ';'
+     */
+    0x00, /* 00000000 */
+    0x0c, /* 00110000 */
+    0x0c, /* 00110000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x0c, /* 00110000 */
+    0x0c, /* 00110000 */
+    0x06, /* 01100000 */
+
+    /*
+     * 60 0x3c '<'
+     */
+    0x18, /* 00011000 */
+    0x0c, /* 00110000 */
+    0x06, /* 01100000 */
+    0x03, /* 11000000 */
+    0x06, /* 01100000 */
+    0x0c, /* 00110000 */
+    0x18, /* 00011000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 61 0x3d '='
+     */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x3f, /* 11111100 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x3f, /* 11111100 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 62 0x3e '>'
+     */
+    0x06, /* 01100000 */
+    0x0c, /* 00110000 */
+    0x18, /* 00011000 */
+    0x30, /* 00001100 */
+    0x18, /* 00011000 */
+    0x0c, /* 00110000 */
+    0x06, /* 01100000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 63 0x3f '?'
+     */
+    0x1e, /* 01111000 */
+    0x33, /* 11001100 */
+    0x30, /* 00001100 */
+    0x18, /* 00011000 */
+    0x0c, /* 00110000 */
+    0x00, /* 00000000 */
+    0x0c, /* 00110000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 64 0x40 '@'
+     */
+    0x3e, /* 01111100 */
+    0x63, /* 11000110 */
+    0x7b, /* 11011110 */
+    0x7b, /* 11011110 */
+    0x7b, /* 11011110 */
+    0x03, /* 11000000 */
+    0x1e, /* 01111000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 65 0x41 'A'
+     */
+    0x0c, /* 00110000 */
+    0x1e, /* 01111000 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x3f, /* 11111100 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x00, /* 00000000 */
+
+    /*
+     * 66 0x42 'B'
+     */
+    0x3f, /* 11111100 */
+    0x66, /* 01100110 */
+    0x66, /* 01100110 */
+    0x3e, /* 01111100 */
+    0x66, /* 01100110 */
+    0x66, /* 01100110 */
+    0x3f, /* 11111100 */
+    0x00, /* 00000000 */
+
+    /*
+     * 67 0x43 'C'
+     */
+    0x3c, /* 00111100 */
+    0x66, /* 01100110 */
+    0x03, /* 11000000 */
+    0x03, /* 11000000 */
+    0x03, /* 11000000 */
+    0x66, /* 01100110 */
+    0x3c, /* 00111100 */
+    0x00, /* 00000000 */
+
+    /*
+     * 68 0x44 'D'
+     */
+    0x1f, /* 11111000 */
+    0x36, /* 01101100 */
+    0x66, /* 01100110 */
+    0x66, /* 01100110 */
+    0x66, /* 01100110 */
+    0x36, /* 01101100 */
+    0x1f, /* 11111000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 69 0x45 'E'
+     */
+    0x7f, /* 11111110 */
+    0x46, /* 01100010 */
+    0x16, /* 01101000 */
+    0x1e, /* 01111000 */
+    0x16, /* 01101000 */
+    0x46, /* 01100010 */
+    0x7f, /* 11111110 */
+    0x00, /* 00000000 */
+
+    /*
+     * 70 0x46 'F'
+     */
+    0x7f, /* 11111110 */
+    0x46, /* 01100010 */
+    0x16, /* 01101000 */
+    0x1e, /* 01111000 */
+    0x16, /* 01101000 */
+    0x06, /* 01100000 */
+    0x0f, /* 11110000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 71 0x47 'G'
+     */
+    0x3c, /* 00111100 */
+    0x66, /* 01100110 */
+    0x03, /* 11000000 */
+    0x03, /* 11000000 */
+    0x73, /* 11001110 */
+    0x66, /* 01100110 */
+    0x7c, /* 00111110 */
+    0x00, /* 00000000 */
+
+    /*
+     * 72 0x48 'H'
+     */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x3f, /* 11111100 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x00, /* 00000000 */
+
+    /*
+     * 73 0x49 'I'
+     */
+    0x1e, /* 01111000 */
+    0x0c, /* 00110000 */
+    0x0c, /* 00110000 */
+    0x0c, /* 00110000 */
+    0x0c, /* 00110000 */
+    0x0c, /* 00110000 */
+    0x1e, /* 01111000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 74 0x4a 'J'
+     */
+    0x78, /* 00011110 */
+    0x30, /* 00001100 */
+    0x30, /* 00001100 */
+    0x30, /* 00001100 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x1e, /* 01111000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 75 0x4b 'K'
+     */
+    0x67, /* 11100110 */
+    0x66, /* 01100110 */
+    0x36, /* 01101100 */
+    0x1e, /* 01111000 */
+    0x36, /* 01101100 */
+    0x66, /* 01100110 */
+    0x67, /* 11100110 */
+    0x00, /* 00000000 */
+
+    /*
+     * 76 0x4c 'L'
+     */
+    0x0f, /* 11110000 */
+    0x06, /* 01100000 */
+    0x06, /* 01100000 */
+    0x06, /* 01100000 */
+    0x46, /* 01100010 */
+    0x66, /* 01100110 */
+    0x7f, /* 11111110 */
+    0x00, /* 00000000 */
+
+    /*
+     * 77 0x4d 'M'
+     */
+    0x63, /* 11000110 */
+    0x77, /* 11101110 */
+    0x7f, /* 11111110 */
+    0x7f, /* 11111110 */
+    0x6b, /* 11010110 */
+    0x63, /* 11000110 */
+    0x63, /* 11000110 */
+    0x00, /* 00000000 */
+
+    /*
+     * 78 0x4e 'N'
+     */
+    0x63, /* 11000110 */
+    0x67, /* 11100110 */
+    0x6f, /* 11110110 */
+    0x7b, /* 11011110 */
+    0x73, /* 11001110 */
+    0x63, /* 11000110 */
+    0x63, /* 11000110 */
+    0x00, /* 00000000 */
+
+    /*
+     * 79 0x4f 'O'
+     */
+    0x1c, /* 00111000 */
+    0x36, /* 01101100 */
+    0x63, /* 11000110 */
+    0x63, /* 11000110 */
+    0x63, /* 11000110 */
+    0x36, /* 01101100 */
+    0x1c, /* 00111000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 80 0x50 'P'
+     */
+    0x3f, /* 11111100 */
+    0x66, /* 01100110 */
+    0x66, /* 01100110 */
+    0x3e, /* 01111100 */
+    0x06, /* 01100000 */
+    0x06, /* 01100000 */
+    0x0f, /* 11110000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 81 0x51 'Q'
+     */
+    0x1e, /* 01111000 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x3b, /* 11011100 */
+    0x1e, /* 01111000 */
+    0x38, /* 00011100 */
+    0x00, /* 00000000 */
+
+    /*
+     * 82 0x52 'R'
+     */
+    0x3f, /* 11111100 */
+    0x66, /* 01100110 */
+    0x66, /* 01100110 */
+    0x3e, /* 01111100 */
+    0x36, /* 01101100 */
+    0x66, /* 01100110 */
+    0x67, /* 11100110 */
+    0x00, /* 00000000 */
+
+    /*
+     * 83 0x53 'S'
+     */
+    0x1e, /* 01111000 */
+    0x33, /* 11001100 */
+    0x07, /* 11100000 */
+    0x0e, /* 01110000 */
+    0x38, /* 00011100 */
+    0x33, /* 11001100 */
+    0x1e, /* 01111000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 84 0x54 'T'
+     */
+    0x3f, /* 11111100 */
+    0x2d, /* 10110100 */
+    0x0c, /* 00110000 */
+    0x0c, /* 00110000 */
+    0x0c, /* 00110000 */
+    0x0c, /* 00110000 */
+    0x1e, /* 01111000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 85 0x55 'U'
+     */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x3f, /* 11111100 */
+    0x00, /* 00000000 */
+
+    /*
+     * 86 0x56 'V'
+     */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x1e, /* 01111000 */
+    0x0c, /* 00110000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 87 0x57 'W'
+     */
+    0x63, /* 11000110 */
+    0x63, /* 11000110 */
+    0x63, /* 11000110 */
+    0x6b, /* 11010110 */
+    0x7f, /* 11111110 */
+    0x77, /* 11101110 */
+    0x63, /* 11000110 */
+    0x00, /* 00000000 */
+
+    /*
+     * 88 0x58 'X'
+     */
+    0x63, /* 11000110 */
+    0x63, /* 11000110 */
+    0x36, /* 01101100 */
+    0x1c, /* 00111000 */
+    0x1c, /* 00111000 */
+    0x36, /* 01101100 */
+    0x63, /* 11000110 */
+    0x00, /* 00000000 */
+
+    /*
+     * 89 0x59 'Y'
+     */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x1e, /* 01111000 */
+    0x0c, /* 00110000 */
+    0x0c, /* 00110000 */
+    0x1e, /* 01111000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 90 0x5a 'Z'
+     */
+    0x7f, /* 11111110 */
+    0x63, /* 11000110 */
+    0x31, /* 10001100 */
+    0x18, /* 00011000 */
+    0x4c, /* 00110010 */
+    0x66, /* 01100110 */
+    0x7f, /* 11111110 */
+    0x00, /* 00000000 */
+
+    /*
+     * 91 0x5b '['
+     */
+    0x1e, /* 01111000 */
+    0x06, /* 01100000 */
+    0x06, /* 01100000 */
+    0x06, /* 01100000 */
+    0x06, /* 01100000 */
+    0x06, /* 01100000 */
+    0x1e, /* 01111000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 92 0x5c '\'
+     */
+    0x03, /* 11000000 */
+    0x06, /* 01100000 */
+    0x0c, /* 00110000 */
+    0x18, /* 00011000 */
+    0x30, /* 00001100 */
+    0x60, /* 00000110 */
+    0x40, /* 00000010 */
+    0x00, /* 00000000 */
+
+    /*
+     * 93 0x5d ']'
+     */
+    0x1e, /* 01111000 */
+    0x18, /* 00011000 */
+    0x18, /* 00011000 */
+    0x18, /* 00011000 */
+    0x18, /* 00011000 */
+    0x18, /* 00011000 */
+    0x1e, /* 01111000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 94 0x5e '^'
+     */
+    0x08, /* 00010000 */
+    0x1c, /* 00111000 */
+    0x36, /* 01101100 */
+    0x63, /* 11000110 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 95 0x5f '_'
+     */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0xff, /* 11111111 */
+
+    /*
+     * 96 0x60 '`'
+     */
+    0x0c, /* 00110000 */
+    0x0c, /* 00110000 */
+    0x18, /* 00011000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 97 0x61 'a'
+     */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x1e, /* 01111000 */
+    0x30, /* 00001100 */
+    0x3e, /* 01111100 */
+    0x33, /* 11001100 */
+    0x6e, /* 01110110 */
+    0x00, /* 00000000 */
+
+    /*
+     * 98 0x62 'b'
+     */
+    0x07, /* 11100000 */
+    0x06, /* 01100000 */
+    0x06, /* 01100000 */
+    0x3e, /* 01111100 */
+    0x66, /* 01100110 */
+    0x66, /* 01100110 */
+    0x3b, /* 11011100 */
+    0x00, /* 00000000 */
+
+    /*
+     * 99 0x63 'c'
+     */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x1e, /* 01111000 */
+    0x33, /* 11001100 */
+    0x03, /* 11000000 */
+    0x33, /* 11001100 */
+    0x1e, /* 01111000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 100 0x64 'd'
+     */
+    0x38, /* 00011100 */
+    0x30, /* 00001100 */
+    0x30, /* 00001100 */
+    0x3e, /* 01111100 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x6e, /* 01110110 */
+    0x00, /* 00000000 */
+
+    /*
+     * 101 0x65 'e'
+     */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x1e, /* 01111000 */
+    0x33, /* 11001100 */
+    0x3f, /* 11111100 */
+    0x03, /* 11000000 */
+    0x1e, /* 01111000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 102 0x66 'f'
+     */
+    0x1c, /* 00111000 */
+    0x36, /* 01101100 */
+    0x06, /* 01100000 */
+    0x0f, /* 11110000 */
+    0x06, /* 01100000 */
+    0x06, /* 01100000 */
+    0x0f, /* 11110000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 103 0x67 'g'
+     */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x6e, /* 01110110 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x3e, /* 01111100 */
+    0x30, /* 00001100 */
+    0x1f, /* 11111000 */
+
+    /*
+     * 104 0x68 'h'
+     */
+    0x07, /* 11100000 */
+    0x06, /* 01100000 */
+    0x36, /* 01101100 */
+    0x6e, /* 01110110 */
+    0x66, /* 01100110 */
+    0x66, /* 01100110 */
+    0x67, /* 11100110 */
+    0x00, /* 00000000 */
+
+    /*
+     * 105 0x69 'i'
+     */
+    0x0c, /* 00110000 */
+    0x00, /* 00000000 */
+    0x0e, /* 01110000 */
+    0x0c, /* 00110000 */
+    0x0c, /* 00110000 */
+    0x0c, /* 00110000 */
+    0x1e, /* 01111000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 106 0x6a 'j'
+     */
+    0x30, /* 00001100 */
+    0x00, /* 00000000 */
+    0x30, /* 00001100 */
+    0x30, /* 00001100 */
+    0x30, /* 00001100 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x1e, /* 01111000 */
+
+    /*
+     * 107 0x6b 'k'
+     */
+    0x07, /* 11100000 */
+    0x06, /* 01100000 */
+    0x66, /* 01100110 */
+    0x36, /* 01101100 */
+    0x1e, /* 01111000 */
+    0x36, /* 01101100 */
+    0x67, /* 11100110 */
+    0x00, /* 00000000 */
+
+    /*
+     * 108 0x6c 'l'
+     */
+    0x0e, /* 01110000 */
+    0x0c, /* 00110000 */
+    0x0c, /* 00110000 */
+    0x0c, /* 00110000 */
+    0x0c, /* 00110000 */
+    0x0c, /* 00110000 */
+    0x1e, /* 01111000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 109 0x6d 'm'
+     */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x33, /* 11001100 */
+    0x7f, /* 11111110 */
+    0x7f, /* 11111110 */
+    0x6b, /* 11010110 */
+    0x63, /* 11000110 */
+    0x00, /* 00000000 */
+
+    /*
+     * 110 0x6e 'n'
+     */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x1f, /* 11111000 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x00, /* 00000000 */
+
+    /*
+     * 111 0x6f 'o'
+     */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x1e, /* 01111000 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x1e, /* 01111000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 112 0x70 'p'
+     */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x3b, /* 11011100 */
+    0x66, /* 01100110 */
+    0x66, /* 01100110 */
+    0x3e, /* 01111100 */
+    0x06, /* 01100000 */
+    0x0f, /* 11110000 */
+
+    /*
+     * 113 0x71 'q'
+     */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x6e, /* 01110110 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x3e, /* 01111100 */
+    0x30, /* 00001100 */
+    0x78, /* 00011110 */
+
+    /*
+     * 114 0x72 'r'
+     */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x3b, /* 11011100 */
+    0x6e, /* 01110110 */
+    0x66, /* 01100110 */
+    0x06, /* 01100000 */
+    0x0f, /* 11110000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 115 0x73 's'
+     */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x3e, /* 01111100 */
+    0x03, /* 11000000 */
+    0x1e, /* 01111000 */
+    0x30, /* 00001100 */
+    0x1f, /* 11111000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 116 0x74 't'
+     */
+    0x08, /* 00010000 */
+    0x0c, /* 00110000 */
+    0x3e, /* 01111100 */
+    0x0c, /* 00110000 */
+    0x0c, /* 00110000 */
+    0x2c, /* 00110100 */
+    0x18, /* 00011000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 117 0x75 'u'
+     */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x6e, /* 01110110 */
+    0x00, /* 00000000 */
+
+    /*
+     * 118 0x76 'v'
+     */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x1e, /* 01111000 */
+    0x0c, /* 00110000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 119 0x77 'w'
+     */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x63, /* 11000110 */
+    0x6b, /* 11010110 */
+    0x7f, /* 11111110 */
+    0x7f, /* 11111110 */
+    0x36, /* 01101100 */
+    0x00, /* 00000000 */
+
+    /*
+     * 120 0x78 'x'
+     */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x63, /* 11000110 */
+    0x36, /* 01101100 */
+    0x1c, /* 00111000 */
+    0x36, /* 01101100 */
+    0x63, /* 11000110 */
+    0x00, /* 00000000 */
+
+    /*
+     * 121 0x79 'y'
+     */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x3e, /* 01111100 */
+    0x30, /* 00001100 */
+    0x1f, /* 11111000 */
+
+    /*
+     * 122 0x7a 'z'
+     */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x3f, /* 11111100 */
+    0x19, /* 10011000 */
+    0x0c, /* 00110000 */
+    0x26, /* 01100100 */
+    0x3f, /* 11111100 */
+    0x00, /* 00000000 */
+
+    /*
+     * 123 0x7b '{'
+     */
+    0x38, /* 00011100 */
+    0x0c, /* 00110000 */
+    0x0c, /* 00110000 */
+    0x07, /* 11100000 */
+    0x0c, /* 00110000 */
+    0x0c, /* 00110000 */
+    0x38, /* 00011100 */
+    0x00, /* 00000000 */
+
+    /*
+     * 124 0x7c '|'
+     */
+    0x18, /* 00011000 */
+    0x18, /* 00011000 */
+    0x18, /* 00011000 */
+    0x00, /* 00000000 */
+    0x18, /* 00011000 */
+    0x18, /* 00011000 */
+    0x18, /* 00011000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 125 0x7d '}'
+     */
+    0x07, /* 11100000 */
+    0x0c, /* 00110000 */
+    0x0c, /* 00110000 */
+    0x38, /* 00011100 */
+    0x0c, /* 00110000 */
+    0x0c, /* 00110000 */
+    0x07, /* 11100000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 126 0x7e '~'
+     */
+    0x6e, /* 01110110 */
+    0x3b, /* 11011100 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+
+    // there's a gap here.
+
+    /*
+     * 161 0xa1 '¡'
+     */
+    0x18, /* 00011000 */
+    0x18, /* 00011000 */
+    0x00, /* 00000000 */
+    0x18, /* 00011000 */
+    0x18, /* 00011000 */
+    0x18, /* 00011000 */
+    0x18, /* 00011000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 162 0xa2 '¢'
+     */
+    0x18, /* 00011000 */
+    0x18, /* 00011000 */
+    0x7e, /* 01111110 */
+    0x03, /* 11000000 */
+    0x03, /* 11000000 */
+    0x7e, /* 01111110 */
+    0x18, /* 00011000 */
+    0x18, /* 00011000 */
+
+    /*
+     * 163 0xa3 '£'
+     */
+    0x1c, /* 00111000 */
+    0x36, /* 01101100 */
+    0x26, /* 01100100 */
+    0x0f, /* 11110000 */
+    0x06, /* 01100000 */
+    0x67, /* 11100110 */
+    0x3f, /* 11111100 */
+    0x00, /* 00000000 */
+
+    /*
+     * 164 0xa4 '¤'
+     */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x63, /* 11000110 */
+    0x3e, /* 01111100 */
+    0x36, /* 01101100 */
+    0x3e, /* 01111100 */
+    0x63, /* 11000110 */
+    0x00, /* 00000000 */
+
+    /*
+     * 165 0xa5 'Â¥'
+     */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x1e, /* 01111000 */
+    0x3f, /* 11111100 */
+    0x0c, /* 00110000 */
+    0x3f, /* 11111100 */
+    0x0c, /* 00110000 */
+    0x0c, /* 00110000 */
+
+    /*
+     * 166 0xa6 '¦'
+     */
+    0x18, /* 00011000 */
+    0x18, /* 00011000 */
+    0x18, /* 00011000 */
+    0x00, /* 00000000 */
+    0x18, /* 00011000 */
+    0x18, /* 00011000 */
+    0x18, /* 00011000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 167 0xa7 '§'
+     */
+    0x7c, /* 00111110 */
+    0xc6, /* 01100011 */
+    0x1c, /* 00111000 */
+    0x36, /* 01101100 */
+    0x36, /* 01101100 */
+    0x1c, /* 00111000 */
+    0x33, /* 11001100 */
+    0x1e, /* 01111000 */
+
+    /*
+     * 168 0xa8 '¨'
+     */
+    0x33, /* 11001100 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 169 0xa9 '©'
+     */
+    0x3c, /* 00111100 */
+    0x42, /* 01000010 */
+    0x99, /* 10011001 */
+    0x85, /* 10100001 */
+    0x85, /* 10100001 */
+    0x99, /* 10011001 */
+    0x42, /* 01000010 */
+    0x3c, /* 00111100 */
+
+    /*
+     * 170 0xaa 'ª'
+     */
+    0x3c, /* 00111100 */
+    0x36, /* 01101100 */
+    0x36, /* 01101100 */
+    0x7c, /* 00111110 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 171 0xab '«'
+     */
+    0x00, /* 00000000 */
+    0xcc, /* 00110011 */
+    0x66, /* 01100110 */
+    0x33, /* 11001100 */
+    0x66, /* 01100110 */
+    0xcc, /* 00110011 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 172 0xac '¬'
+     */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x3f, /* 11111100 */
+    0x30, /* 00001100 */
+    0x30, /* 00001100 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 173 0xad '­'
+     */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 174 0xae '®'
+     */
+    0x3c, /* 00111100 */
+    0x42, /* 01000010 */
+    0x9d, /* 10111001 */
+    0xa5, /* 10100101 */
+    0x9d, /* 10111001 */
+    0xa5, /* 10100101 */
+    0x42, /* 01000010 */
+    0x3c, /* 00111100 */
+
+    /*
+     * 175 0xaf '¯'
+     */
+    0x7e, /* 01111110 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 176 0xb0 '°'
+     */
+    0x1c, /* 00111000 */
+    0x36, /* 01101100 */
+    0x36, /* 01101100 */
+    0x1c, /* 00111000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 177 0xb1 '±'
+     */
+    0x18, /* 00011000 */
+    0x18, /* 00011000 */
+    0x7e, /* 01111110 */
+    0x18, /* 00011000 */
+    0x18, /* 00011000 */
+    0x00, /* 00000000 */
+    0x7e, /* 01111110 */
+    0x00, /* 00000000 */
+
+    /*
+     * 178 0xb2 '²'
+     */
+    0x1c, /* 00111000 */
+    0x30, /* 00001100 */
+    0x18, /* 00011000 */
+    0x0c, /* 00110000 */
+    0x3c, /* 00111100 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 179 0xb3 '³'
+     */
+    0x1c, /* 00111000 */
+    0x30, /* 00001100 */
+    0x18, /* 00011000 */
+    0x30, /* 00001100 */
+    0x1c, /* 00111000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 180 0xb4 '´'
+     */
+    0x18, /* 00011000 */
+    0x0c, /* 00110000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 181 0xb5 'µ'
+     */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x66, /* 01100110 */
+    0x66, /* 01100110 */
+    0x66, /* 01100110 */
+    0x3e, /* 01111100 */
+    0x06, /* 01100000 */
+    0x03, /* 11000000 */
+
+    /*
+     * 182 0xb6 '¶'
+     */
+    0xfe, /* 01111111 */
+    0xdb, /* 11011011 */
+    0xdb, /* 11011011 */
+    0xde, /* 01111011 */
+    0xd8, /* 00011011 */
+    0xd8, /* 00011011 */
+    0xd8, /* 00011011 */
+    0x00, /* 00000000 */
+
+    /*
+     * 183 0xb7 '·'
+     */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x18, /* 00011000 */
+    0x18, /* 00011000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 184 0xb8 '¸'
+     */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x18, /* 00011000 */
+    0x30, /* 00001100 */
+    0x1e, /* 01111000 */
+
+    /*
+     * 185 0xb9 '¹'
+     */
+    0x08, /* 00010000 */
+    0x0c, /* 00110000 */
+    0x08, /* 00010000 */
+    0x1c, /* 00111000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 186 0xba 'º'
+     */
+    0x1c, /* 00111000 */
+    0x36, /* 01101100 */
+    0x36, /* 01101100 */
+    0x1c, /* 00111000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 187 0xbb '»'
+     */
+    0x00, /* 00000000 */
+    0x33, /* 11001100 */
+    0x66, /* 01100110 */
+    0xcc, /* 00110011 */
+    0x66, /* 01100110 */
+    0x33, /* 11001100 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 188 0xbc '¼'
+     */
+    0xc3, /* 11000011 */
+    0x63, /* 11000110 */
+    0x33, /* 11001100 */
+    0xbd, /* 10111101 */
+    0xec, /* 00110111 */
+    0xf6, /* 01101111 */
+    0xf3, /* 11001111 */
+    0x03, /* 11000000 */
+
+    /*
+     * 189 0xbd '½'
+     */
+    0xc3, /* 11000011 */
+    0x63, /* 11000110 */
+    0x33, /* 11001100 */
+    0x7b, /* 11011110 */
+    0xcc, /* 00110011 */
+    0x66, /* 01100110 */
+    0x33, /* 11001100 */
+    0xf0, /* 00001111 */
+
+    /*
+     * 190 0xbe '¾'
+     */
+    0x03, /* 11000000 */
+    0xc4, /* 00100011 */
+    0x63, /* 11000110 */
+    0xb4, /* 00101101 */
+    0xdb, /* 11011011 */
+    0xac, /* 00110101 */
+    0xe6, /* 01100111 */
+    0x80, /* 00000001 */
+
+    /*
+     * 191 0xbf '¿'
+     */
+    0x0c, /* 00110000 */
+    0x00, /* 00000000 */
+    0x0c, /* 00110000 */
+    0x06, /* 01100000 */
+    0x03, /* 11000000 */
+    0x33, /* 11001100 */
+    0x1e, /* 01111000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 192 0xc0 'À'
+     */
+    0x07, /* 11100000 */
+    0x00, /* 00000000 */
+    0x1c, /* 00111000 */
+    0x36, /* 01101100 */
+    0x63, /* 11000110 */
+    0x7f, /* 11111110 */
+    0x63, /* 11000110 */
+    0x00, /* 00000000 */
+
+    /*
+     * 193 0xc1 'Á'
+     */
+    0x70, /* 00001110 */
+    0x00, /* 00000000 */
+    0x1c, /* 00111000 */
+    0x36, /* 01101100 */
+    0x63, /* 11000110 */
+    0x7f, /* 11111110 */
+    0x63, /* 11000110 */
+    0x00, /* 00000000 */
+
+    /*
+     * 194 0xc2 'Â'
+     */
+    0x1c, /* 00111000 */
+    0x36, /* 01101100 */
+    0x00, /* 00000000 */
+    0x3e, /* 01111100 */
+    0x63, /* 11000110 */
+    0x7f, /* 11111110 */
+    0x63, /* 11000110 */
+    0x00, /* 00000000 */
+
+    /*
+     * 195 0xc3 'Ã'
+     */
+    0x6e, /* 01110110 */
+    0x3b, /* 11011100 */
+    0x00, /* 00000000 */
+    0x3e, /* 01111100 */
+    0x63, /* 11000110 */
+    0x7f, /* 11111110 */
+    0x63, /* 11000110 */
+    0x00, /* 00000000 */
+
+    /*
+     * 196 0xc4 'Ä'
+     */
+    0x63, /* 11000110 */
+    0x1c, /* 00111000 */
+    0x36, /* 01101100 */
+    0x63, /* 11000110 */
+    0x7f, /* 11111110 */
+    0x63, /* 11000110 */
+    0x63, /* 11000110 */
+    0x00, /* 00000000 */
+
+    /*
+     * 197 0xc5 'Å'
+     */
+    0x0c, /* 00110000 */
+    0x0c, /* 00110000 */
+    0x00, /* 00000000 */
+    0x1e, /* 01111000 */
+    0x33, /* 11001100 */
+    0x3f, /* 11111100 */
+    0x33, /* 11001100 */
+    0x00, /* 00000000 */
+
+    /*
+     * 198 0xc6 'Æ'
+     */
+    0x7c, /* 00111110 */
+    0x36, /* 01101100 */
+    0x33, /* 11001100 */
+    0x7f, /* 11111110 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x73, /* 11001110 */
+    0x00, /* 00000000 */
+
+    /*
+     * 199 0xc7 'Ç'
+     */
+    0x1e, /* 01111000 */
+    0x33, /* 11001100 */
+    0x03, /* 11000000 */
+    0x33, /* 11001100 */
+    0x1e, /* 01111000 */
+    0x18, /* 00011000 */
+    0x30, /* 00001100 */
+    0x1e, /* 01111000 */
+
+    /*
+     * 200 0xc8 'È'
+     */
+    0x07, /* 11100000 */
+    0x00, /* 00000000 */
+    0x3f, /* 11111100 */
+    0x06, /* 01100000 */
+    0x1e, /* 01111000 */
+    0x06, /* 01100000 */
+    0x3f, /* 11111100 */
+    0x00, /* 00000000 */
+
+    /*
+     * 201 0xc9 'É'
+     */
+    0x38, /* 00011100 */
+    0x00, /* 00000000 */
+    0x3f, /* 11111100 */
+    0x06, /* 01100000 */
+    0x1e, /* 01111000 */
+    0x06, /* 01100000 */
+    0x3f, /* 11111100 */
+    0x00, /* 00000000 */
+
+    /*
+     * 202 0xca 'Ê'
+     */
+    0x0c, /* 00110000 */
+    0x12, /* 01001000 */
+    0x3f, /* 11111100 */
+    0x06, /* 01100000 */
+    0x1e, /* 01111000 */
+    0x06, /* 01100000 */
+    0x3f, /* 11111100 */
+    0x00, /* 00000000 */
+
+    /*
+     * 203 0xcb 'Ë'
+     */
+    0x36, /* 01101100 */
+    0x00, /* 00000000 */
+    0x3f, /* 11111100 */
+    0x06, /* 01100000 */
+    0x1e, /* 01111000 */
+    0x06, /* 01100000 */
+    0x3f, /* 11111100 */
+    0x00, /* 00000000 */
+
+    /*
+     * 204 0xcc 'Ì'
+     */
+    0x07, /* 11100000 */
+    0x00, /* 00000000 */
+    0x1e, /* 01111000 */
+    0x0c, /* 00110000 */
+    0x0c, /* 00110000 */
+    0x0c, /* 00110000 */
+    0x1e, /* 01111000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 205 0xcd 'Í'
+     */
+    0x38, /* 00011100 */
+    0x00, /* 00000000 */
+    0x1e, /* 01111000 */
+    0x0c, /* 00110000 */
+    0x0c, /* 00110000 */
+    0x0c, /* 00110000 */
+    0x1e, /* 01111000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 206 0xce 'Î'
+     */
+    0x0c, /* 00110000 */
+    0x12, /* 01001000 */
+    0x00, /* 00000000 */
+    0x1e, /* 01111000 */
+    0x0c, /* 00110000 */
+    0x0c, /* 00110000 */
+    0x1e, /* 01111000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 207 0xcf 'Ï'
+     */
+    0x33, /* 11001100 */
+    0x00, /* 00000000 */
+    0x1e, /* 01111000 */
+    0x0c, /* 00110000 */
+    0x0c, /* 00110000 */
+    0x0c, /* 00110000 */
+    0x1e, /* 01111000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 208 0xd0 'Ð'
+     */
+    0x3f, /* 11111100 */
+    0x66, /* 01100110 */
+    0x6f, /* 11110110 */
+    0x6f, /* 11110110 */
+    0x66, /* 01100110 */
+    0x66, /* 01100110 */
+    0x3f, /* 11111100 */
+    0x00, /* 00000000 */
+
+    /*
+     * 209 0xd1 'Ñ'
+     */
+    0x3f, /* 11111100 */
+    0x00, /* 00000000 */
+    0x33, /* 11001100 */
+    0x37, /* 11101100 */
+    0x3f, /* 11111100 */
+    0x3b, /* 11011100 */
+    0x33, /* 11001100 */
+    0x00, /* 00000000 */
+
+    /*
+     * 210 0xd2 'Ò'
+     */
+    0x0e, /* 01110000 */
+    0x00, /* 00000000 */
+    0x18, /* 00011000 */
+    0x3c, /* 00111100 */
+    0x66, /* 01100110 */
+    0x3c, /* 00111100 */
+    0x18, /* 00011000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 211 0xd3 'Ó'
+     */
+    0x70, /* 00001110 */
+    0x00, /* 00000000 */
+    0x18, /* 00011000 */
+    0x3c, /* 00111100 */
+    0x66, /* 01100110 */
+    0x3c, /* 00111100 */
+    0x18, /* 00011000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 212 0xd4 'Ô'
+     */
+    0x3c, /* 00111100 */
+    0x66, /* 01100110 */
+    0x18, /* 00011000 */
+    0x3c, /* 00111100 */
+    0x66, /* 01100110 */
+    0x3c, /* 00111100 */
+    0x18, /* 00011000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 213 0xd5 'Õ'
+     */
+    0x6e, /* 01110110 */
+    0x3b, /* 11011100 */
+    0x00, /* 00000000 */
+    0x3e, /* 01111100 */
+    0x63, /* 11000110 */
+    0x63, /* 11000110 */
+    0x3e, /* 01111100 */
+    0x00, /* 00000000 */
+
+    /*
+     * 214 0xd6 'Ö'
+     */
+    0xc3, /* 11000011 */
+    0x18, /* 00011000 */
+    0x3c, /* 00111100 */
+    0x66, /* 01100110 */
+    0x66, /* 01100110 */
+    0x3c, /* 00111100 */
+    0x18, /* 00011000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 215 0xd7 '×'
+     */
+    0x00, /* 00000000 */
+    0x36, /* 01101100 */
+    0x1c, /* 00111000 */
+    0x08, /* 00010000 */
+    0x1c, /* 00111000 */
+    0x36, /* 01101100 */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 216 0xd8 'Ø'
+     */
+    0x5c, /* 00111010 */
+    0x36, /* 01101100 */
+    0x73, /* 11001110 */
+    0x7b, /* 11011110 */
+    0x6f, /* 11110110 */
+    0x36, /* 01101100 */
+    0x1d, /* 10111000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 217 0xd9 'Ù'
+     */
+    0x0e, /* 01110000 */
+    0x00, /* 00000000 */
+    0x66, /* 01100110 */
+    0x66, /* 01100110 */
+    0x66, /* 01100110 */
+    0x66, /* 01100110 */
+    0x3c, /* 00111100 */
+    0x00, /* 00000000 */
+
+    /*
+     * 218 0xda 'Ú'
+     */
+    0x70, /* 00001110 */
+    0x00, /* 00000000 */
+    0x66, /* 01100110 */
+    0x66, /* 01100110 */
+    0x66, /* 01100110 */
+    0x66, /* 01100110 */
+    0x3c, /* 00111100 */
+    0x00, /* 00000000 */
+
+    /*
+     * 219 0xdb 'Û'
+     */
+    0x3c, /* 00111100 */
+    0x66, /* 01100110 */
+    0x00, /* 00000000 */
+    0x66, /* 01100110 */
+    0x66, /* 01100110 */
+    0x66, /* 01100110 */
+    0x3c, /* 00111100 */
+    0x00, /* 00000000 */
+
+    /*
+     * 220 0xdc 'Ü'
+     */
+    0x33, /* 11001100 */
+    0x00, /* 00000000 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x1e, /* 01111000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 221 0xdd 'Ý'
+     */
+    0x70, /* 00001110 */
+    0x00, /* 00000000 */
+    0x66, /* 01100110 */
+    0x66, /* 01100110 */
+    0x3c, /* 00111100 */
+    0x18, /* 00011000 */
+    0x18, /* 00011000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 222 0xde 'Þ'
+     */
+    0x0f, /* 11110000 */
+    0x06, /* 01100000 */
+    0x3e, /* 01111100 */
+    0x66, /* 01100110 */
+    0x66, /* 01100110 */
+    0x3e, /* 01111100 */
+    0x06, /* 01100000 */
+    0x0f, /* 11110000 */
+
+    /*
+     * 223 0xdf 'ß'
+     */
+    0x00, /* 00000000 */
+    0x1e, /* 01111000 */
+    0x33, /* 11001100 */
+    0x1f, /* 11111000 */
+    0x33, /* 11001100 */
+    0x1f, /* 11111000 */
+    0x03, /* 11000000 */
+    0x03, /* 11000000 */
+
+    /*
+     * 224 0xe0 'à'
+     */
+    0x07, /* 11100000 */
+    0x00, /* 00000000 */
+    0x1e, /* 01111000 */
+    0x30, /* 00001100 */
+    0x3e, /* 01111100 */
+    0x33, /* 11001100 */
+    0x7e, /* 01111110 */
+    0x00, /* 00000000 */
+
+    /*
+     * 225 0xe1 'á'
+     */
+    0x38, /* 00011100 */
+    0x00, /* 00000000 */
+    0x1e, /* 01111000 */
+    0x30, /* 00001100 */
+    0x3e, /* 01111100 */
+    0x33, /* 11001100 */
+    0x7e, /* 01111110 */
+    0x00, /* 00000000 */
+
+    /*
+     * 226 0xe2 'â'
+     */
+    0x7e, /* 01111110 */
+    0xc3, /* 11000011 */
+    0x3c, /* 00111100 */
+    0x60, /* 00000110 */
+    0x7c, /* 00111110 */
+    0x66, /* 01100110 */
+    0xfc, /* 00111111 */
+    0x00, /* 00000000 */
+
+    /*
+     * 227 0xe3 'ã'
+     */
+    0x6e, /* 01110110 */
+    0x3b, /* 11011100 */
+    0x1e, /* 01111000 */
+    0x30, /* 00001100 */
+    0x3e, /* 01111100 */
+    0x33, /* 11001100 */
+    0x7e, /* 01111110 */
+    0x00, /* 00000000 */
+
+    /*
+     * 228 0xe4 'ä'
+     */
+    0x33, /* 11001100 */
+    0x00, /* 00000000 */
+    0x1e, /* 01111000 */
+    0x30, /* 00001100 */
+    0x3e, /* 01111100 */
+    0x33, /* 11001100 */
+    0x7e, /* 01111110 */
+    0x00, /* 00000000 */
+
+    /*
+     * 229 0xe5 'Ã¥'
+     */
+    0x0c, /* 00110000 */
+    0x0c, /* 00110000 */
+    0x1e, /* 01111000 */
+    0x30, /* 00001100 */
+    0x3e, /* 01111100 */
+    0x33, /* 11001100 */
+    0x7e, /* 01111110 */
+    0x00, /* 00000000 */
+
+    /*
+     * 230 0xe6 'æ'
+     */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0xfe, /* 01111111 */
+    0x30, /* 00001100 */
+    0xfe, /* 01111111 */
+    0x33, /* 11001100 */
+    0xfe, /* 01111111 */
+    0x00, /* 00000000 */
+
+    /*
+     * 231 0xe7 'ç'
+     */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x1e, /* 01111000 */
+    0x03, /* 11000000 */
+    0x03, /* 11000000 */
+    0x1e, /* 01111000 */
+    0x30, /* 00001100 */
+    0x1c, /* 00111000 */
+
+    /*
+     * 232 0xe8 'è'
+     */
+    0x07, /* 11100000 */
+    0x00, /* 00000000 */
+    0x1e, /* 01111000 */
+    0x33, /* 11001100 */
+    0x3f, /* 11111100 */
+    0x03, /* 11000000 */
+    0x1e, /* 01111000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 233 0xe9 'é'
+     */
+    0x38, /* 00011100 */
+    0x00, /* 00000000 */
+    0x1e, /* 01111000 */
+    0x33, /* 11001100 */
+    0x3f, /* 11111100 */
+    0x03, /* 11000000 */
+    0x1e, /* 01111000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 234 0xea 'ê'
+     */
+    0x7e, /* 01111110 */
+    0xc3, /* 11000011 */
+    0x3c, /* 00111100 */
+    0x66, /* 01100110 */
+    0x7e, /* 01111110 */
+    0x06, /* 01100000 */
+    0x3c, /* 00111100 */
+    0x00, /* 00000000 */
+
+    /*
+     * 235 0xeb 'ë'
+     */
+    0x33, /* 11001100 */
+    0x00, /* 00000000 */
+    0x1e, /* 01111000 */
+    0x33, /* 11001100 */
+    0x3f, /* 11111100 */
+    0x03, /* 11000000 */
+    0x1e, /* 01111000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 236 0xec 'ì'
+     */
+    0x07, /* 11100000 */
+    0x00, /* 00000000 */
+    0x0e, /* 01110000 */
+    0x0c, /* 00110000 */
+    0x0c, /* 00110000 */
+    0x0c, /* 00110000 */
+    0x1e, /* 01111000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 237 0xed 'í'
+     */
+    0x1c, /* 00111000 */
+    0x00, /* 00000000 */
+    0x0e, /* 01110000 */
+    0x0c, /* 00110000 */
+    0x0c, /* 00110000 */
+    0x0c, /* 00110000 */
+    0x1e, /* 01111000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 238 0xee 'î'
+     */
+    0x3e, /* 01111100 */
+    0x63, /* 11000110 */
+    0x1c, /* 00111000 */
+    0x18, /* 00011000 */
+    0x18, /* 00011000 */
+    0x18, /* 00011000 */
+    0x3c, /* 00111100 */
+    0x00, /* 00000000 */
+
+    /*
+     * 239 0xef 'ï'
+     */
+    0x33, /* 11001100 */
+    0x00, /* 00000000 */
+    0x0e, /* 01110000 */
+    0x0c, /* 00110000 */
+    0x0c, /* 00110000 */
+    0x0c, /* 00110000 */
+    0x1e, /* 01111000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 240 0xf0 'ð'
+     */
+    0x1b, /* 11011000 */
+    0x0e, /* 01110000 */
+    0x1b, /* 11011000 */
+    0x30, /* 00001100 */
+    0x3e, /* 01111100 */
+    0x33, /* 11001100 */
+    0x1e, /* 01111000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 241 0xf1 'ñ'
+     */
+    0x00, /* 00000000 */
+    0x1f, /* 11111000 */
+    0x00, /* 00000000 */
+    0x1f, /* 11111000 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x00, /* 00000000 */
+
+    /*
+     * 242 0xf2 'ò'
+     */
+    0x00, /* 00000000 */
+    0x07, /* 11100000 */
+    0x00, /* 00000000 */
+    0x1e, /* 01111000 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x1e, /* 01111000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 243 0xf3 'ó'
+     */
+    0x00, /* 00000000 */
+    0x38, /* 00011100 */
+    0x00, /* 00000000 */
+    0x1e, /* 01111000 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x1e, /* 01111000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 244 0xf4 'ô'
+     */
+    0x1e, /* 01111000 */
+    0x33, /* 11001100 */
+    0x00, /* 00000000 */
+    0x1e, /* 01111000 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x1e, /* 01111000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 245 0xf5 'õ'
+     */
+    0x6e, /* 01110110 */
+    0x3b, /* 11011100 */
+    0x00, /* 00000000 */
+    0x1e, /* 01111000 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x1e, /* 01111000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 246 0xf6 'ö'
+     */
+    0x00, /* 00000000 */
+    0x33, /* 11001100 */
+    0x00, /* 00000000 */
+    0x1e, /* 01111000 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x1e, /* 01111000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 247 0xf7 '÷'
+     */
+    0x18, /* 00011000 */
+    0x18, /* 00011000 */
+    0x00, /* 00000000 */
+    0x7e, /* 01111110 */
+    0x00, /* 00000000 */
+    0x18, /* 00011000 */
+    0x18, /* 00011000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 248 0xf8 'ø'
+     */
+    0x00, /* 00000000 */
+    0x60, /* 00000110 */
+    0x3c, /* 00111100 */
+    0x76, /* 01101110 */
+    0x7e, /* 01111110 */
+    0x6e, /* 01110110 */
+    0x3c, /* 00111100 */
+    0x06, /* 01100000 */
+
+    /*
+     * 249 0xf9 'ù'
+     */
+    0x00, /* 00000000 */
+    0x07, /* 11100000 */
+    0x00, /* 00000000 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x7e, /* 01111110 */
+    0x00, /* 00000000 */
+
+    /*
+     * 250 0xfa 'ú'
+     */
+    0x00, /* 00000000 */
+    0x38, /* 00011100 */
+    0x00, /* 00000000 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x7e, /* 01111110 */
+    0x00, /* 00000000 */
+
+    /*
+     * 251 0xfb 'û'
+     */
+    0x1e, /* 01111000 */
+    0x33, /* 11001100 */
+    0x00, /* 00000000 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x7e, /* 01111110 */
+    0x00, /* 00000000 */
+
+    /*
+     * 252 0xfc 'ü'
+     */
+    0x00, /* 00000000 */
+    0x33, /* 11001100 */
+    0x00, /* 00000000 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x7e, /* 01111110 */
+    0x00, /* 00000000 */
+
+    /*
+     * 253 0xfd 'ý'
+     */
+    0x00, /* 00000000 */
+    0x38, /* 00011100 */
+    0x00, /* 00000000 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x3e, /* 01111100 */
+    0x30, /* 00001100 */
+    0x1f, /* 11111000 */
+
+    /*
+     * 254 0xfe 'þ'
+     */
+    0x00, /* 00000000 */
+    0x00, /* 00000000 */
+    0x06, /* 01100000 */
+    0x3e, /* 01111100 */
+    0x66, /* 01100110 */
+    0x3e, /* 01111100 */
+    0x06, /* 01100000 */
+    0x00, /* 00000000 */
+
+    /*
+     * 255 0xff 'ÿ'
+     */
+    0x00, /* 00000000 */
+    0x33, /* 11001100 */
+    0x00, /* 00000000 */
+    0x33, /* 11001100 */
+    0x33, /* 11001100 */
+    0x3e, /* 01111100 */
+    0x30, /* 00001100 */
+    0x1f, /* 11111000 */
+
+    /*
+     * 256 0x100 - missing character
+     */
+    0x55, /* 01010101 */
+    0xAA, /* 10101010 */
+    0x55, /* 01010101 */
+    0xAA, /* 10101010 */
+    0x55, /* 01010101 */
+    0xAA, /* 10101010 */
+    0x55, /* 01010101 */
+    0xAA, /* 10101010 */
+};
+
+SDL_COMPILE_TIME_ASSERT(SDL_RenderDebugTextFontDataSize, SDL_arraysize(SDL_RenderDebugTextFontData) == SDL_DEBUG_FONT_NUM_GLYPHS * 8);
+
+#endif
+
diff --git a/libs/SDL3/src/render/SDL_sysrender.h b/libs/SDL3/src/render/SDL_sysrender.h
index 91118b845..381b516fd 100644
--- a/libs/SDL3/src/render/SDL_sysrender.h
+++ b/libs/SDL3/src/render/SDL_sysrender.h
@@ -305,6 +305,8 @@ struct SDL_Renderer
 
     SDL_PropertiesID props;
 
+    SDL_Texture *debug_char_texture_atlas;
+
     bool destroyed;   // already destroyed by SDL_DestroyWindow; just free this struct in SDL_DestroyRenderer.
 
     void *internal;
diff --git a/libs/SDL3/src/render/gpu/SDL_render_gpu.c b/libs/SDL3/src/render/gpu/SDL_render_gpu.c
index bf67551b9..1ecc0ae97 100644
--- a/libs/SDL3/src/render/gpu/SDL_render_gpu.c
+++ b/libs/SDL3/src/render/gpu/SDL_render_gpu.c
@@ -1215,15 +1215,15 @@ static bool GPU_CreateRenderer(SDL_Renderer *renderer, SDL_Window *window, SDL_P
     renderer->window = window;
     renderer->name = GPU_RenderDriver.name;
 
-    bool debug = SDL_GetBooleanProperty(create_props, SDL_PROP_GPU_DEVICE_CREATE_DEBUGMODE_BOOL, false);
-    bool lowpower = SDL_GetBooleanProperty(create_props, SDL_PROP_GPU_DEVICE_CREATE_PREFERLOWPOWER_BOOL, false);
+    bool debug = SDL_GetBooleanProperty(create_props, SDL_PROP_GPU_DEVICE_CREATE_DEBUGMODE_BOOLEAN, false);
+    bool lowpower = SDL_GetBooleanProperty(create_props, SDL_PROP_GPU_DEVICE_CREATE_PREFERLOWPOWER_BOOLEAN, false);
 
     // Prefer environment variables/hints if they exist, otherwise defer to properties
     debug = SDL_GetHintBoolean(SDL_HINT_RENDER_GPU_DEBUG, debug);
     lowpower = SDL_GetHintBoolean(SDL_HINT_RENDER_GPU_LOW_POWER, lowpower);
 
-    SDL_SetBooleanProperty(create_props, SDL_PROP_GPU_DEVICE_CREATE_DEBUGMODE_BOOL, debug);
-    SDL_SetBooleanProperty(create_props, SDL_PROP_GPU_DEVICE_CREATE_PREFERLOWPOWER_BOOL, lowpower);
+    SDL_SetBooleanProperty(create_props, SDL_PROP_GPU_DEVICE_CREATE_DEBUGMODE_BOOLEAN, debug);
+    SDL_SetBooleanProperty(create_props, SDL_PROP_GPU_DEVICE_CREATE_PREFERLOWPOWER_BOOLEAN, lowpower);
 
     GPU_FillSupportedShaderFormats(create_props);
     data->device = SDL_CreateGPUDeviceWithProperties(create_props);
diff --git a/libs/SDL3/src/render/gpu/SDL_shaders_gpu.c b/libs/SDL3/src/render/gpu/SDL_shaders_gpu.c
index 49be1e47d..ce5a55e2c 100644
--- a/libs/SDL3/src/render/gpu/SDL_shaders_gpu.c
+++ b/libs/SDL3/src/render/gpu/SDL_shaders_gpu.c
@@ -247,10 +247,10 @@ SDL_GPUShader *GPU_GetFragmentShader(GPU_Shaders *shaders, GPU_FragmentShaderID
 
 void GPU_FillSupportedShaderFormats(SDL_PropertiesID props)
 {
-    SDL_SetBooleanProperty(props, SDL_PROP_GPU_DEVICE_CREATE_SHADERS_SPIRV_BOOL, HAVE_SPIRV_SHADERS);
-    SDL_SetBooleanProperty(props, SDL_PROP_GPU_DEVICE_CREATE_SHADERS_DXBC_BOOL, HAVE_DXBC50_SHADERS);
-    SDL_SetBooleanProperty(props, SDL_PROP_GPU_DEVICE_CREATE_SHADERS_DXIL_BOOL, HAVE_DXIL60_SHADERS);
-    SDL_SetBooleanProperty(props, SDL_PROP_GPU_DEVICE_CREATE_SHADERS_MSL_BOOL, HAVE_METAL_SHADERS);
+    SDL_SetBooleanProperty(props, SDL_PROP_GPU_DEVICE_CREATE_SHADERS_SPIRV_BOOLEAN, HAVE_SPIRV_SHADERS);
+    SDL_SetBooleanProperty(props, SDL_PROP_GPU_DEVICE_CREATE_SHADERS_DXBC_BOOLEAN, HAVE_DXBC50_SHADERS);
+    SDL_SetBooleanProperty(props, SDL_PROP_GPU_DEVICE_CREATE_SHADERS_DXIL_BOOLEAN, HAVE_DXIL60_SHADERS);
+    SDL_SetBooleanProperty(props, SDL_PROP_GPU_DEVICE_CREATE_SHADERS_MSL_BOOLEAN, HAVE_METAL_SHADERS);
 }
 
 #endif // SDL_VIDEO_RENDER_GPU
diff --git a/libs/SDL3/src/render/opengl/SDL_render_gl.c b/libs/SDL3/src/render/opengl/SDL_render_gl.c
index 627c74e44..b598098a5 100644
--- a/libs/SDL3/src/render/opengl/SDL_render_gl.c
+++ b/libs/SDL3/src/render/opengl/SDL_render_gl.c
@@ -1497,20 +1497,7 @@ static SDL_Surface *GL_RenderReadPixels(SDL_Renderer *renderer, const SDL_Rect *
 
     // Flip the rows to be top-down if necessary
     if (!renderer->target) {
-        bool isstack;
-        int length = rect->w * SDL_BYTESPERPIXEL(format);
-        Uint8 *src = (Uint8 *)surface->pixels + (rect->h - 1) * surface->pitch;
-        Uint8 *dst = (Uint8 *)surface->pixels;
-        Uint8 *tmp = SDL_small_alloc(Uint8, length, &isstack);
-        int rows = rect->h / 2;
-        while (rows--) {
-            SDL_memcpy(tmp, dst, length);
-            SDL_memcpy(dst, src, length);
-            SDL_memcpy(src, tmp, length);
-            dst += surface->pitch;
-            src -= surface->pitch;
-        }
-        SDL_small_free(tmp, isstack);
+        SDL_FlipSurface(surface, SDL_FLIP_VERTICAL);
     }
     return surface;
 }
diff --git a/libs/SDL3/src/render/opengl/SDL_shaders_gl.c b/libs/SDL3/src/render/opengl/SDL_shaders_gl.c
index d9600f59d..c876fb982 100644
--- a/libs/SDL3/src/render/opengl/SDL_shaders_gl.c
+++ b/libs/SDL3/src/render/opengl/SDL_shaders_gl.c
@@ -348,15 +348,11 @@ static bool CompileShader(GL_ShaderContext *ctx, GLhandleARB shader, const char
 
         ctx->glGetObjectParameterivARB(shader, GL_OBJECT_INFO_LOG_LENGTH_ARB, &length);
         info = SDL_small_alloc(char, length + 1, &isstack);
-        ctx->glGetInfoLogARB(shader, length, NULL, info);
-        SDL_LogError(SDL_LOG_CATEGORY_RENDER,
-                     "Failed to compile shader:\n%s%s\n%s", defines, source, info);
-#ifdef DEBUG_SHADERS
-        fprintf(stderr,
-                "Failed to compile shader:\n%s%s\n%s", defines, source, info);
-#endif
-        SDL_small_free(info, isstack);
-
+        if (info) {
+            ctx->glGetInfoLogARB(shader, length, NULL, info);
+            SDL_LogError(SDL_LOG_CATEGORY_RENDER, "Failed to compile shader:\n%s%s\n%s", defines, source, info);
+            SDL_small_free(info, isstack);
+        }
         return false;
     } else {
         return true;
diff --git a/libs/SDL3/src/render/opengles2/SDL_render_gles2.c b/libs/SDL3/src/render/opengles2/SDL_render_gles2.c
index a779ff312..37aab0703 100644
--- a/libs/SDL3/src/render/opengles2/SDL_render_gles2.c
+++ b/libs/SDL3/src/render/opengles2/SDL_render_gles2.c
@@ -2014,20 +2014,7 @@ static SDL_Surface *GLES2_RenderReadPixels(SDL_Renderer *renderer, const SDL_Rec
 
     // Flip the rows to be top-down if necessary
     if (!renderer->target) {
-        bool isstack;
-        int length = rect->w * SDL_BYTESPERPIXEL(format);
-        Uint8 *src = (Uint8 *)surface->pixels + (rect->h - 1) * surface->pitch;
-        Uint8 *dst = (Uint8 *)surface->pixels;
-        Uint8 *tmp = SDL_small_alloc(Uint8, length, &isstack);
-        int rows = rect->h / 2;
-        while (rows--) {
-            SDL_memcpy(tmp, dst, length);
-            SDL_memcpy(dst, src, length);
-            SDL_memcpy(src, tmp, length);
-            dst += surface->pitch;
-            src -= surface->pitch;
-        }
-        SDL_small_free(tmp, isstack);
+        SDL_FlipSurface(surface, SDL_FLIP_VERTICAL);
     }
     return surface;
 }
diff --git a/libs/SDL3/src/render/vitagxm/SDL_render_vita_gxm.c b/libs/SDL3/src/render/vitagxm/SDL_render_vita_gxm.c
index 559a15266..20449cf2b 100644
--- a/libs/SDL3/src/render/vitagxm/SDL_render_vita_gxm.c
+++ b/libs/SDL3/src/render/vitagxm/SDL_render_vita_gxm.c
@@ -349,6 +349,7 @@ static bool VITA_GXM_UpdateTexture(SDL_Renderer *renderer, SDL_Texture *texture,
     length = rect->w * SDL_BYTESPERPIXEL(texture->format);
     if (length == pitch && length == dpitch) {
         SDL_memcpy(dst, pixels, length * rect->h);
+        pixels += pitch * rect->h;
     } else {
         for (row = 0; row < rect->h; ++row) {
             SDL_memcpy(dst, pixels, length);
@@ -376,6 +377,7 @@ static bool VITA_GXM_UpdateTexture(SDL_Renderer *renderer, SDL_Texture *texture,
         // U plane
         if (length == uv_src_pitch && length == uv_pitch) {
             SDL_memcpy(Udst, pixels, length * UVrect.h);
+            pixels += uv_src_pitch * UVrect.h;
         } else {
             for (row = 0; row < UVrect.h; ++row) {
                 SDL_memcpy(Udst, pixels, length);
@@ -1103,22 +1105,8 @@ static SDL_Surface *VITA_GXM_RenderReadPixels(SDL_Renderer *renderer, const SDL_
     read_pixels(rect->x, y, rect->w, rect->h, surface->pixels);
 
     // Flip the rows to be top-down if necessary
-
     if (!renderer->target) {
-        bool isstack;
-        int length = rect->w * SDL_BYTESPERPIXEL(format);
-        Uint8 *src = (Uint8 *)surface->pixels + (rect->h - 1) * surface->pitch;
-        Uint8 *dst = (Uint8 *)surface->pixels;
-        Uint8 *tmp = SDL_small_alloc(Uint8, length, &isstack);
-        int rows = rect->h / 2;
-        while (rows--) {
-            SDL_memcpy(tmp, dst, length);
-            SDL_memcpy(dst, src, length);
-            SDL_memcpy(src, tmp, length);
-            dst += surface->pitch;
-            src -= surface->pitch;
-        }
-        SDL_small_free(tmp, isstack);
+        SDL_FlipSurface(surface, SDL_FLIP_VERTICAL);
     }
     return surface;
 }
diff --git a/libs/SDL3/src/render/vitagxm/SDL_render_vita_gxm_tools.c b/libs/SDL3/src/render/vitagxm/SDL_render_vita_gxm_tools.c
index 52e9d742f..652ad055c 100644
--- a/libs/SDL3/src/render/vitagxm/SDL_render_vita_gxm_tools.c
+++ b/libs/SDL3/src/render/vitagxm/SDL_render_vita_gxm_tools.c
@@ -740,10 +740,10 @@ int gxm_init(SDL_Renderer *renderer)
         colorVertexAttributes[0].format = SCE_GXM_ATTRIBUTE_FORMAT_F32;
         colorVertexAttributes[0].componentCount = 2; // (x, y)
         colorVertexAttributes[0].regIndex = sceGxmProgramParameterGetResourceIndex(paramColorPositionAttribute);
-        // color: 4 unsigned char  = 32 bits
+        // color: 4 floats = 4*32 bits
         colorVertexAttributes[1].streamIndex = 0;
         colorVertexAttributes[1].offset = 8; // (x, y) * 4 = 8 bytes
-        colorVertexAttributes[1].format = SCE_GXM_ATTRIBUTE_FORMAT_U8N;
+        colorVertexAttributes[1].format = SCE_GXM_ATTRIBUTE_FORMAT_F32;
         colorVertexAttributes[1].componentCount = 4; // (color)
         colorVertexAttributes[1].regIndex = sceGxmProgramParameterGetResourceIndex(paramColorColorAttribute);
         // 16 bit (short) indices
@@ -785,10 +785,10 @@ int gxm_init(SDL_Renderer *renderer)
         textureVertexAttributes[1].format = SCE_GXM_ATTRIBUTE_FORMAT_F32;
         textureVertexAttributes[1].componentCount = 2; // (u, v)
         textureVertexAttributes[1].regIndex = sceGxmProgramParameterGetResourceIndex(paramTextureTexcoordAttribute);
-        // r,g,b,a: 4 unsigned chars 32 bits
+        // r,g,b,a: 4 floats 4*32 bits
         textureVertexAttributes[2].streamIndex = 0;
         textureVertexAttributes[2].offset = 16; // (x, y, u, v) * 4 = 16 bytes
-        textureVertexAttributes[2].format = SCE_GXM_ATTRIBUTE_FORMAT_U8N;
+        textureVertexAttributes[2].format = SCE_GXM_ATTRIBUTE_FORMAT_F32;
         textureVertexAttributes[2].componentCount = 4; // (r, g, b, a)
         textureVertexAttributes[2].regIndex = sceGxmProgramParameterGetResourceIndex(paramTextureColorAttribute);
         // 16 bit (short) indices
diff --git a/libs/SDL3/src/render/vulkan/SDL_render_vulkan.c b/libs/SDL3/src/render/vulkan/SDL_render_vulkan.c
index 5e150e9ae..df65e4bd6 100644
--- a/libs/SDL3/src/render/vulkan/SDL_render_vulkan.c
+++ b/libs/SDL3/src/render/vulkan/SDL_render_vulkan.c
@@ -2054,6 +2054,89 @@ static VkResult VULKAN_CreateSwapChain(SDL_Renderer *renderer, int w, int h)
         return result;
     }
 
+    // clean up previous swapchain resources
+    if (rendererData->swapchainImageViews) {
+        for (uint32_t i = 0; i < rendererData->swapchainImageCount; i++) {
+            vkDestroyImageView(rendererData->device, rendererData->swapchainImageViews[i], NULL);
+        }
+        SDL_free(rendererData->swapchainImageViews);
+        rendererData->swapchainImageViews = NULL;
+    }
+    if (rendererData->fences) {
+        for (uint32_t i = 0; i < rendererData->swapchainImageCount; i++) {
+            if (rendererData->fences[i] != VK_NULL_HANDLE) {
+                vkDestroyFence(rendererData->device, rendererData->fences[i], NULL);
+            }
+        }
+        SDL_free(rendererData->fences);
+        rendererData->fences = NULL;
+    }
+    if (rendererData->framebuffers) {
+        for (uint32_t i = 0; i < rendererData->swapchainImageCount; i++) {
+            if (rendererData->framebuffers[i] != VK_NULL_HANDLE) {
+                vkDestroyFramebuffer(rendererData->device, rendererData->framebuffers[i], NULL);
+            }
+        }
+        SDL_free(rendererData->framebuffers);
+        rendererData->framebuffers = NULL;
+    }
+    if (rendererData->descriptorPools) {
+        SDL_assert(rendererData->numDescriptorPools);
+        for (uint32_t i = 0; i < rendererData->swapchainImageCount; i++) {
+            for (uint32_t j = 0; j < rendererData->numDescriptorPools[i]; j++) {
+                if (rendererData->descriptorPools[i][j] != VK_NULL_HANDLE) {
+                    vkDestroyDescriptorPool(rendererData->device, rendererData->descriptorPools[i][j], NULL);
+                }
+            }
+            SDL_free(rendererData->descriptorPools[i]);
+        }
+        SDL_free(rendererData->descriptorPools);
+        rendererData->descriptorPools = NULL;
+        SDL_free(rendererData->numDescriptorPools);
+        rendererData->numDescriptorPools = NULL;
+    }
+    if (rendererData->imageAvailableSemaphores) {
+        for (uint32_t i = 0; i < rendererData->swapchainImageCount; ++i) {
+            if (rendererData->imageAvailableSemaphores[i] != VK_NULL_HANDLE) {
+                vkDestroySemaphore(rendererData->device, rendererData->imageAvailableSemaphores[i], NULL);
+            }
+        }
+        SDL_free(rendererData->imageAvailableSemaphores);
+        rendererData->imageAvailableSemaphores = NULL;
+    }
+    if (rendererData->renderingFinishedSemaphores) {
+        for (uint32_t i = 0; i < rendererData->swapchainImageCount; ++i) {
+            if (rendererData->renderingFinishedSemaphores[i] != VK_NULL_HANDLE) {
+                vkDestroySemaphore(rendererData->device, rendererData->renderingFinishedSemaphores[i], NULL);
+            }
+        }
+        SDL_free(rendererData->renderingFinishedSemaphores);
+        rendererData->renderingFinishedSemaphores = NULL;
+    }
+    if (rendererData->uploadBuffers) {
+        for (uint32_t i = 0; i < rendererData->swapchainImageCount; i++) {
+            for (uint32_t j = 0; j < SDL_VULKAN_NUM_UPLOAD_BUFFERS; j++) {
+                VULKAN_DestroyBuffer(rendererData, &rendererData->uploadBuffers[i][j]);
+            }
+            SDL_free(rendererData->uploadBuffers[i]);
+        }
+        SDL_free(rendererData->uploadBuffers);
+        rendererData->uploadBuffers = NULL;
+    }
+    if (rendererData->constantBuffers) {
+        SDL_assert(rendererData->numConstantBuffers);
+        for (uint32_t i = 0; i < rendererData->swapchainImageCount; ++i) {
+            for (uint32_t j = 0; j < rendererData->numConstantBuffers[i]; j++) {
+                VULKAN_DestroyBuffer(rendererData, &rendererData->constantBuffers[i][j]);
+            }
+            SDL_free(rendererData->constantBuffers[i]);
+        }
+        SDL_free(rendererData->constantBuffers);
+        rendererData->constantBuffers = NULL;
+        SDL_free(rendererData->numConstantBuffers);
+        rendererData->numConstantBuffers = NULL;
+    }
+
     // pick an image count
     rendererData->swapchainDesiredImageCount = rendererData->surfaceCapabilities.minImageCount + SDL_VULKAN_FRAME_QUEUE_DEPTH;
     if ((rendererData->swapchainDesiredImageCount > rendererData->surfaceCapabilities.maxImageCount) &&
@@ -2217,12 +2300,6 @@ static VkResult VULKAN_CreateSwapChain(SDL_Renderer *renderer, int w, int h)
         imageViewCreateInfo.subresourceRange.layerCount = 1;
         imageViewCreateInfo.subresourceRange.levelCount = 1;
         imageViewCreateInfo.viewType = VK_IMAGE_VIEW_TYPE_2D;
-        if (rendererData->swapchainImageViews) {
-             for (uint32_t i = 0; i < rendererData->swapchainImageCount; i++) {
-                 vkDestroyImageView(rendererData->device, rendererData->swapchainImageViews[i], NULL);
-             }
-             SDL_free(rendererData->swapchainImageViews);
-        }
         rendererData->swapchainImageViews = (VkImageView *)SDL_calloc(rendererData->swapchainImageCount, sizeof(VkImageView));
         SDL_free(rendererData->swapchainImageLayouts);
         rendererData->swapchainImageLayouts = (VkImageLayout *)SDL_calloc(rendererData->swapchainImageCount, sizeof(VkImageLayout));
@@ -2259,14 +2336,6 @@ static VkResult VULKAN_CreateSwapChain(SDL_Renderer *renderer, int w, int h)
     }
 
     // Create fences
-    if (rendererData->fences) {
-        for (uint32_t i = 0; i < rendererData->swapchainImageCount; i++) {
-            if (rendererData->fences[i] != VK_NULL_HANDLE) {
-                vkDestroyFence(rendererData->device, rendererData->fences[i], NULL);
-            }
-        }
-        SDL_free(rendererData->fences);
-    }
     rendererData->fences = (VkFence *)SDL_calloc(rendererData->swapchainImageCount, sizeof(VkFence));
     for (uint32_t i = 0; i < rendererData->swapchainImageCount; i++) {
         VkFenceCreateInfo fenceCreateInfo = { 0 };
@@ -2281,14 +2350,6 @@ static VkResult VULKAN_CreateSwapChain(SDL_Renderer *renderer, int w, int h)
     }
 
     // Create renderpasses and framebuffer
-    if (rendererData->framebuffers) {
-        for (uint32_t i = 0; i < rendererData->swapchainImageCount; i++) {
-            if (rendererData->framebuffers[i] != VK_NULL_HANDLE) {
-                vkDestroyFramebuffer(rendererData->device, rendererData->framebuffers[i], NULL);
-            }
-        }
-        SDL_free(rendererData->framebuffers);
-    }
     for (uint32_t i = 0; i < SDL_arraysize(rendererData->renderPasses); i++) {
         if (rendererData->renderPasses[i] != VK_NULL_HANDLE) {
             vkDestroyRenderPass(rendererData->device, rendererData->renderPasses[i], NULL);
@@ -2311,19 +2372,6 @@ static VkResult VULKAN_CreateSwapChain(SDL_Renderer *renderer, int w, int h)
     }
 
     // Create descriptor pools - start by allocating one per swapchain image, let it grow if more are needed
-    if (rendererData->descriptorPools) {
-        SDL_assert(rendererData->numDescriptorPools);
-        for (uint32_t i = 0; i < rendererData->swapchainImageCount; i++) {
-            for (uint32_t j = 0; j < rendererData->numDescriptorPools[i]; j++) {
-                if (rendererData->descriptorPools[i][j] != VK_NULL_HANDLE) {
-                    vkDestroyDescriptorPool(rendererData->device, rendererData->descriptorPools[i][j], NULL);
-                }
-            }
-            SDL_free(rendererData->descriptorPools[i]);
-        }
-        SDL_free(rendererData->descriptorPools);
-        SDL_free(rendererData->numDescriptorPools);
-    }
     rendererData->descriptorPools = (VkDescriptorPool **)SDL_calloc(rendererData->swapchainImageCount, sizeof(VkDescriptorPool*));
     rendererData->numDescriptorPools = (uint32_t *)SDL_calloc(rendererData->swapchainImageCount, sizeof(uint32_t));
     for (uint32_t i = 0; i < rendererData->swapchainImageCount; i++) {
@@ -2338,22 +2386,6 @@ static VkResult VULKAN_CreateSwapChain(SDL_Renderer *renderer, int w, int h)
     }
 
     // Create semaphores
-    if (rendererData->imageAvailableSemaphores) {
-        for (uint32_t i = 0; i < rendererData->swapchainImageCount; ++i) {
-            if (rendererData->imageAvailableSemaphores[i] != VK_NULL_HANDLE) {
-                vkDestroySemaphore(rendererData->device, rendererData->imageAvailableSemaphores[i], NULL);
-            }
-        }
-        SDL_free(rendererData->imageAvailableSemaphores);
-    }
-    if (rendererData->renderingFinishedSemaphores) {
-        for (uint32_t i = 0; i < rendererData->swapchainImageCount; ++i) {
-            if (rendererData->renderingFinishedSemaphores[i] != VK_NULL_HANDLE) {
-                vkDestroySemaphore(rendererData->device, rendererData->renderingFinishedSemaphores[i], NULL);
-            }
-        }
-        SDL_free(rendererData->renderingFinishedSemaphores);
-    }
     rendererData->imageAvailableSemaphores = (VkSemaphore *)SDL_calloc(rendererData->swapchainImageCount, sizeof(VkSemaphore));
     rendererData->renderingFinishedSemaphores = (VkSemaphore *)SDL_calloc(rendererData->swapchainImageCount, sizeof(VkSemaphore));
     for (uint32_t i = 0; i < rendererData->swapchainImageCount; i++) {
@@ -2370,15 +2402,6 @@ static VkResult VULKAN_CreateSwapChain(SDL_Renderer *renderer, int w, int h)
     }
 
     // Upload buffers
-    if (rendererData->uploadBuffers) {
-        for (uint32_t i = 0; i < rendererData->swapchainImageCount; i++) {
-            for (uint32_t j = 0; j < SDL_VULKAN_NUM_UPLOAD_BUFFERS; j++) {
-                VULKAN_DestroyBuffer(rendererData, &rendererData->uploadBuffers[i][j]);
-            }
-            SDL_free(rendererData->uploadBuffers[i]);
-        }
-        SDL_free(rendererData->uploadBuffers);
-    }
     rendererData->uploadBuffers = (VULKAN_Buffer **)SDL_calloc(rendererData->swapchainImageCount, sizeof(VULKAN_Buffer*));
     for (uint32_t i = 0; i < rendererData->swapchainImageCount; i++) {
         rendererData->uploadBuffers[i] = (VULKAN_Buffer *)SDL_calloc(SDL_VULKAN_NUM_UPLOAD_BUFFERS, sizeof(VULKAN_Buffer));
@@ -2387,18 +2410,6 @@ static VkResult VULKAN_CreateSwapChain(SDL_Renderer *renderer, int w, int h)
     rendererData->currentUploadBuffer = (int *)SDL_calloc(rendererData->swapchainImageCount, sizeof(int));
 
     // Constant buffers
-    if (rendererData->constantBuffers) {
-        SDL_assert(rendererData->numConstantBuffers);
-        for (uint32_t i = 0; i < rendererData->swapchainImageCount; ++i) {
-            for (uint32_t j = 0; j < rendererData->numConstantBuffers[i]; j++) {
-                VULKAN_DestroyBuffer(rendererData, &rendererData->constantBuffers[i][j]);
-            }
-            SDL_free(rendererData->constantBuffers[i]);
-        }
-        SDL_free(rendererData->constantBuffers);
-        SDL_free(rendererData->numConstantBuffers);
-        rendererData->constantBuffers = NULL;
-    }
     rendererData->constantBuffers = (VULKAN_Buffer **)SDL_calloc(rendererData->swapchainImageCount, sizeof(VULKAN_Buffer*));
     rendererData->numConstantBuffers = (uint32_t *)SDL_calloc(rendererData->swapchainImageCount, sizeof(uint32_t));
     for (uint32_t i = 0; i < rendererData->swapchainImageCount; i++) {
diff --git a/libs/SDL3/src/stdlib/SDL_string.c b/libs/SDL3/src/stdlib/SDL_string.c
index 03ed3c13a..ec6b5e703 100644
--- a/libs/SDL3/src/stdlib/SDL_string.c
+++ b/libs/SDL3/src/stdlib/SDL_string.c
@@ -265,6 +265,26 @@ Uint32 SDL_StepUTF8(const char **pstr, size_t *pslen)
     return result;
 }
 
+Uint32 SDL_StepBackUTF8(const char *start, const char **pstr)
+{
+    if (!pstr || *pstr <= start) {
+        return 0;
+    }
+
+    // Step back over the previous UTF-8 character
+    const char *str = *pstr;
+    do {
+        if (str == start) {
+            break;
+        }
+        --str;
+    } while ((*str & 0xC0) == 0x80);
+
+    size_t length = (*pstr - str);
+    *pstr = str;
+    return StepUTF8(&str, length);
+}
+
 #if (SDL_SIZEOF_WCHAR_T == 2)
 static Uint32 StepUTF16(const Uint16 **_str, const size_t slen)
 {
diff --git a/libs/SDL3/src/test/SDL_test_font.c b/libs/SDL3/src/test/SDL_test_font.c
index 160fa7b9a..19e6bc9f6 100644
--- a/libs/SDL3/src/test/SDL_test_font.c
+++ b/libs/SDL3/src/test/SDL_test_font.c
@@ -20,3352 +20,21 @@
 */
 #include <SDL3/SDL_test.h>
 
-/* ---- 8x8 font definition ---- */
-
-/*
-; Summary: font8_8.asm
-; 8x8 monochrome bitmap fonts for rendering
-;
-; Author:
-;     Marcel Sondaar
-;     International Business Machines (public domain VGA fonts)
-;
-; License:
-;     Public Domain
-;
-*/
-
-#define NUM_FONT_GLYPHS 257
-
-static unsigned char SDLTest_FontData[] = {
-
-    /*
-     * 0 0x00 '^@'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 1 0x01 '^A'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 2 0x02 '^B'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 3 0x03 '^C'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 4 0x04 '^D'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 5 0x05 '^E'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 6 0x06 '^F'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 7 0x07 '^G'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 8 0x08 '^H'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 9 0x09 '^I'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 10 0x0a '^J'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 11 0x0b '^K'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 12 0x0c '^L'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 13 0x0d '^M'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 14 0x0e '^N'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 15 0x0f '^O'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 16 0x10 '^P'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 17 0x11 '^Q'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 18 0x12 '^R'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 19 0x13 '^S'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 20 0x14 '^T'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 21 0x15 '^U'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 22 0x16 '^V'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 23 0x17 '^W'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 24 0x18 '^X'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 25 0x19 '^Y'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 26 0x1a '^Z'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 27 0x1b '^['
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 28 0x1c '^\'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 29 0x1d '^]'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 30 0x1e '^^'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 31 0x1f '^_'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 32 0x20 ' '
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 33 0x21 '!'
-     */
-    0x18, /* 00011000 */
-    0x3c, /* 00111100 */
-    0x3c, /* 00111100 */
-    0x18, /* 00011000 */
-    0x18, /* 00011000 */
-    0x00, /* 00000000 */
-    0x18, /* 00011000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 34 0x22 '"'
-     */
-    0x36, /* 01101100 */
-    0x36, /* 01101100 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 35 0x23 '#'
-     */
-    0x36, /* 01101100 */
-    0x36, /* 01101100 */
-    0x7f, /* 11111110 */
-    0x36, /* 01101100 */
-    0x7f, /* 11111110 */
-    0x36, /* 01101100 */
-    0x36, /* 01101100 */
-    0x00, /* 00000000 */
-
-    /*
-     * 36 0x24 '$'
-     */
-    0x0c, /* 00110000 */
-    0x3e, /* 01111100 */
-    0x03, /* 11000000 */
-    0x1e, /* 01111000 */
-    0x30, /* 00001100 */
-    0x1f, /* 11111000 */
-    0x0c, /* 00110000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 37 0x25 '%'
-     */
-    0x00, /* 00000000 */
-    0x63, /* 11000110 */
-    0x33, /* 11001100 */
-    0x18, /* 00011000 */
-    0x0c, /* 00110000 */
-    0x66, /* 01100110 */
-    0x63, /* 11000110 */
-    0x00, /* 00000000 */
-
-    /*
-     * 38 0x26 '&'
-     */
-    0x1c, /* 00111000 */
-    0x36, /* 01101100 */
-    0x1c, /* 00111000 */
-    0x6e, /* 01110110 */
-    0x3b, /* 11011100 */
-    0x33, /* 11001100 */
-    0x6e, /* 01110110 */
-    0x00, /* 00000000 */
-
-    /*
-     * 39 0x27 '''
-     */
-    0x06, /* 01100000 */
-    0x06, /* 01100000 */
-    0x03, /* 11000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 40 0x28 '('
-     */
-    0x18, /* 00011000 */
-    0x0c, /* 00110000 */
-    0x06, /* 01100000 */
-    0x06, /* 01100000 */
-    0x06, /* 01100000 */
-    0x0c, /* 00110000 */
-    0x18, /* 00011000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 41 0x29 ')'
-     */
-    0x06, /* 01100000 */
-    0x0c, /* 00110000 */
-    0x18, /* 00011000 */
-    0x18, /* 00011000 */
-    0x18, /* 00011000 */
-    0x0c, /* 00110000 */
-    0x06, /* 01100000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 42 0x2a '*'
-     */
-    0x00, /* 00000000 */
-    0x66, /* 01100110 */
-    0x3c, /* 00111100 */
-    0xff, /* 11111111 */
-    0x3c, /* 00111100 */
-    0x66, /* 01100110 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 43 0x2b '+'
-     */
-    0x00, /* 00000000 */
-    0x0c, /* 00110000 */
-    0x0c, /* 00110000 */
-    0x3f, /* 11111100 */
-    0x0c, /* 00110000 */
-    0x0c, /* 00110000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 44 0x2c ','
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x0c, /* 00110000 */
-    0x0c, /* 00110000 */
-    0x06, /* 01100000 */
-
-    /*
-     * 45 0x2d '-'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x3f, /* 11111100 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 46 0x2e '.'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x0c, /* 00110000 */
-    0x0c, /* 00110000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 47 0x2f '/'
-     */
-    0x60, /* 00000110 */
-    0x30, /* 00001100 */
-    0x18, /* 00011000 */
-    0x0c, /* 00110000 */
-    0x06, /* 01100000 */
-    0x03, /* 11000000 */
-    0x01, /* 10000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 48 0x30 '0'
-     */
-    0x3e, /* 01111100 */
-    0x63, /* 11000110 */
-    0x73, /* 11001110 */
-    0x7b, /* 11011110 */
-    0x6f, /* 11110110 */
-    0x67, /* 11100110 */
-    0x3e, /* 01111100 */
-    0x00, /* 00000000 */
-
-    /*
-     * 49 0x31 '1'
-     */
-    0x0c, /* 00110000 */
-    0x0e, /* 01110000 */
-    0x0c, /* 00110000 */
-    0x0c, /* 00110000 */
-    0x0c, /* 00110000 */
-    0x0c, /* 00110000 */
-    0x3f, /* 11111100 */
-    0x00, /* 00000000 */
-
-    /*
-     * 50 0x32 '2'
-     */
-    0x1e, /* 01111000 */
-    0x33, /* 11001100 */
-    0x30, /* 00001100 */
-    0x1c, /* 00111000 */
-    0x06, /* 01100000 */
-    0x33, /* 11001100 */
-    0x3f, /* 11111100 */
-    0x00, /* 00000000 */
-
-    /*
-     * 51 0x33 '3'
-     */
-    0x1e, /* 01111000 */
-    0x33, /* 11001100 */
-    0x30, /* 00001100 */
-    0x1c, /* 00111000 */
-    0x30, /* 00001100 */
-    0x33, /* 11001100 */
-    0x1e, /* 01111000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 52 0x34 '4'
-     */
-    0x38, /* 00011100 */
-    0x3c, /* 00111100 */
-    0x36, /* 01101100 */
-    0x33, /* 11001100 */
-    0x7f, /* 11111110 */
-    0x30, /* 00001100 */
-    0x78, /* 00011110 */
-    0x00, /* 00000000 */
-
-    /*
-     * 53 0x35 '5'
-     */
-    0x3f, /* 11111100 */
-    0x03, /* 11000000 */
-    0x1f, /* 11111000 */
-    0x30, /* 00001100 */
-    0x30, /* 00001100 */
-    0x33, /* 11001100 */
-    0x1e, /* 01111000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 54 0x36 '6'
-     */
-    0x1c, /* 00111000 */
-    0x06, /* 01100000 */
-    0x03, /* 11000000 */
-    0x1f, /* 11111000 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x1e, /* 01111000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 55 0x37 '7'
-     */
-    0x3f, /* 11111100 */
-    0x33, /* 11001100 */
-    0x30, /* 00001100 */
-    0x18, /* 00011000 */
-    0x0c, /* 00110000 */
-    0x0c, /* 00110000 */
-    0x0c, /* 00110000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 56 0x38 '8'
-     */
-    0x1e, /* 01111000 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x1e, /* 01111000 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x1e, /* 01111000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 57 0x39 '9'
-     */
-    0x1e, /* 01111000 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x3e, /* 01111100 */
-    0x30, /* 00001100 */
-    0x18, /* 00011000 */
-    0x0e, /* 01110000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 58 0x3a ':'
-     */
-    0x00, /* 00000000 */
-    0x0c, /* 00110000 */
-    0x0c, /* 00110000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x0c, /* 00110000 */
-    0x0c, /* 00110000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 59 0x3b ';'
-     */
-    0x00, /* 00000000 */
-    0x0c, /* 00110000 */
-    0x0c, /* 00110000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x0c, /* 00110000 */
-    0x0c, /* 00110000 */
-    0x06, /* 01100000 */
-
-    /*
-     * 60 0x3c '<'
-     */
-    0x18, /* 00011000 */
-    0x0c, /* 00110000 */
-    0x06, /* 01100000 */
-    0x03, /* 11000000 */
-    0x06, /* 01100000 */
-    0x0c, /* 00110000 */
-    0x18, /* 00011000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 61 0x3d '='
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x3f, /* 11111100 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x3f, /* 11111100 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 62 0x3e '>'
-     */
-    0x06, /* 01100000 */
-    0x0c, /* 00110000 */
-    0x18, /* 00011000 */
-    0x30, /* 00001100 */
-    0x18, /* 00011000 */
-    0x0c, /* 00110000 */
-    0x06, /* 01100000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 63 0x3f '?'
-     */
-    0x1e, /* 01111000 */
-    0x33, /* 11001100 */
-    0x30, /* 00001100 */
-    0x18, /* 00011000 */
-    0x0c, /* 00110000 */
-    0x00, /* 00000000 */
-    0x0c, /* 00110000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 64 0x40 '@'
-     */
-    0x3e, /* 01111100 */
-    0x63, /* 11000110 */
-    0x7b, /* 11011110 */
-    0x7b, /* 11011110 */
-    0x7b, /* 11011110 */
-    0x03, /* 11000000 */
-    0x1e, /* 01111000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 65 0x41 'A'
-     */
-    0x0c, /* 00110000 */
-    0x1e, /* 01111000 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x3f, /* 11111100 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x00, /* 00000000 */
-
-    /*
-     * 66 0x42 'B'
-     */
-    0x3f, /* 11111100 */
-    0x66, /* 01100110 */
-    0x66, /* 01100110 */
-    0x3e, /* 01111100 */
-    0x66, /* 01100110 */
-    0x66, /* 01100110 */
-    0x3f, /* 11111100 */
-    0x00, /* 00000000 */
-
-    /*
-     * 67 0x43 'C'
-     */
-    0x3c, /* 00111100 */
-    0x66, /* 01100110 */
-    0x03, /* 11000000 */
-    0x03, /* 11000000 */
-    0x03, /* 11000000 */
-    0x66, /* 01100110 */
-    0x3c, /* 00111100 */
-    0x00, /* 00000000 */
-
-    /*
-     * 68 0x44 'D'
-     */
-    0x1f, /* 11111000 */
-    0x36, /* 01101100 */
-    0x66, /* 01100110 */
-    0x66, /* 01100110 */
-    0x66, /* 01100110 */
-    0x36, /* 01101100 */
-    0x1f, /* 11111000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 69 0x45 'E'
-     */
-    0x7f, /* 11111110 */
-    0x46, /* 01100010 */
-    0x16, /* 01101000 */
-    0x1e, /* 01111000 */
-    0x16, /* 01101000 */
-    0x46, /* 01100010 */
-    0x7f, /* 11111110 */
-    0x00, /* 00000000 */
-
-    /*
-     * 70 0x46 'F'
-     */
-    0x7f, /* 11111110 */
-    0x46, /* 01100010 */
-    0x16, /* 01101000 */
-    0x1e, /* 01111000 */
-    0x16, /* 01101000 */
-    0x06, /* 01100000 */
-    0x0f, /* 11110000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 71 0x47 'G'
-     */
-    0x3c, /* 00111100 */
-    0x66, /* 01100110 */
-    0x03, /* 11000000 */
-    0x03, /* 11000000 */
-    0x73, /* 11001110 */
-    0x66, /* 01100110 */
-    0x7c, /* 00111110 */
-    0x00, /* 00000000 */
-
-    /*
-     * 72 0x48 'H'
-     */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x3f, /* 11111100 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x00, /* 00000000 */
-
-    /*
-     * 73 0x49 'I'
-     */
-    0x1e, /* 01111000 */
-    0x0c, /* 00110000 */
-    0x0c, /* 00110000 */
-    0x0c, /* 00110000 */
-    0x0c, /* 00110000 */
-    0x0c, /* 00110000 */
-    0x1e, /* 01111000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 74 0x4a 'J'
-     */
-    0x78, /* 00011110 */
-    0x30, /* 00001100 */
-    0x30, /* 00001100 */
-    0x30, /* 00001100 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x1e, /* 01111000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 75 0x4b 'K'
-     */
-    0x67, /* 11100110 */
-    0x66, /* 01100110 */
-    0x36, /* 01101100 */
-    0x1e, /* 01111000 */
-    0x36, /* 01101100 */
-    0x66, /* 01100110 */
-    0x67, /* 11100110 */
-    0x00, /* 00000000 */
-
-    /*
-     * 76 0x4c 'L'
-     */
-    0x0f, /* 11110000 */
-    0x06, /* 01100000 */
-    0x06, /* 01100000 */
-    0x06, /* 01100000 */
-    0x46, /* 01100010 */
-    0x66, /* 01100110 */
-    0x7f, /* 11111110 */
-    0x00, /* 00000000 */
-
-    /*
-     * 77 0x4d 'M'
-     */
-    0x63, /* 11000110 */
-    0x77, /* 11101110 */
-    0x7f, /* 11111110 */
-    0x7f, /* 11111110 */
-    0x6b, /* 11010110 */
-    0x63, /* 11000110 */
-    0x63, /* 11000110 */
-    0x00, /* 00000000 */
-
-    /*
-     * 78 0x4e 'N'
-     */
-    0x63, /* 11000110 */
-    0x67, /* 11100110 */
-    0x6f, /* 11110110 */
-    0x7b, /* 11011110 */
-    0x73, /* 11001110 */
-    0x63, /* 11000110 */
-    0x63, /* 11000110 */
-    0x00, /* 00000000 */
-
-    /*
-     * 79 0x4f 'O'
-     */
-    0x1c, /* 00111000 */
-    0x36, /* 01101100 */
-    0x63, /* 11000110 */
-    0x63, /* 11000110 */
-    0x63, /* 11000110 */
-    0x36, /* 01101100 */
-    0x1c, /* 00111000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 80 0x50 'P'
-     */
-    0x3f, /* 11111100 */
-    0x66, /* 01100110 */
-    0x66, /* 01100110 */
-    0x3e, /* 01111100 */
-    0x06, /* 01100000 */
-    0x06, /* 01100000 */
-    0x0f, /* 11110000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 81 0x51 'Q'
-     */
-    0x1e, /* 01111000 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x3b, /* 11011100 */
-    0x1e, /* 01111000 */
-    0x38, /* 00011100 */
-    0x00, /* 00000000 */
-
-    /*
-     * 82 0x52 'R'
-     */
-    0x3f, /* 11111100 */
-    0x66, /* 01100110 */
-    0x66, /* 01100110 */
-    0x3e, /* 01111100 */
-    0x36, /* 01101100 */
-    0x66, /* 01100110 */
-    0x67, /* 11100110 */
-    0x00, /* 00000000 */
-
-    /*
-     * 83 0x53 'S'
-     */
-    0x1e, /* 01111000 */
-    0x33, /* 11001100 */
-    0x07, /* 11100000 */
-    0x0e, /* 01110000 */
-    0x38, /* 00011100 */
-    0x33, /* 11001100 */
-    0x1e, /* 01111000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 84 0x54 'T'
-     */
-    0x3f, /* 11111100 */
-    0x2d, /* 10110100 */
-    0x0c, /* 00110000 */
-    0x0c, /* 00110000 */
-    0x0c, /* 00110000 */
-    0x0c, /* 00110000 */
-    0x1e, /* 01111000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 85 0x55 'U'
-     */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x3f, /* 11111100 */
-    0x00, /* 00000000 */
-
-    /*
-     * 86 0x56 'V'
-     */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x1e, /* 01111000 */
-    0x0c, /* 00110000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 87 0x57 'W'
-     */
-    0x63, /* 11000110 */
-    0x63, /* 11000110 */
-    0x63, /* 11000110 */
-    0x6b, /* 11010110 */
-    0x7f, /* 11111110 */
-    0x77, /* 11101110 */
-    0x63, /* 11000110 */
-    0x00, /* 00000000 */
-
-    /*
-     * 88 0x58 'X'
-     */
-    0x63, /* 11000110 */
-    0x63, /* 11000110 */
-    0x36, /* 01101100 */
-    0x1c, /* 00111000 */
-    0x1c, /* 00111000 */
-    0x36, /* 01101100 */
-    0x63, /* 11000110 */
-    0x00, /* 00000000 */
-
-    /*
-     * 89 0x59 'Y'
-     */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x1e, /* 01111000 */
-    0x0c, /* 00110000 */
-    0x0c, /* 00110000 */
-    0x1e, /* 01111000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 90 0x5a 'Z'
-     */
-    0x7f, /* 11111110 */
-    0x63, /* 11000110 */
-    0x31, /* 10001100 */
-    0x18, /* 00011000 */
-    0x4c, /* 00110010 */
-    0x66, /* 01100110 */
-    0x7f, /* 11111110 */
-    0x00, /* 00000000 */
-
-    /*
-     * 91 0x5b '['
-     */
-    0x1e, /* 01111000 */
-    0x06, /* 01100000 */
-    0x06, /* 01100000 */
-    0x06, /* 01100000 */
-    0x06, /* 01100000 */
-    0x06, /* 01100000 */
-    0x1e, /* 01111000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 92 0x5c '\'
-     */
-    0x03, /* 11000000 */
-    0x06, /* 01100000 */
-    0x0c, /* 00110000 */
-    0x18, /* 00011000 */
-    0x30, /* 00001100 */
-    0x60, /* 00000110 */
-    0x40, /* 00000010 */
-    0x00, /* 00000000 */
-
-    /*
-     * 93 0x5d ']'
-     */
-    0x1e, /* 01111000 */
-    0x18, /* 00011000 */
-    0x18, /* 00011000 */
-    0x18, /* 00011000 */
-    0x18, /* 00011000 */
-    0x18, /* 00011000 */
-    0x1e, /* 01111000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 94 0x5e '^'
-     */
-    0x08, /* 00010000 */
-    0x1c, /* 00111000 */
-    0x36, /* 01101100 */
-    0x63, /* 11000110 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 95 0x5f '_'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0xff, /* 11111111 */
-
-    /*
-     * 96 0x60 '`'
-     */
-    0x0c, /* 00110000 */
-    0x0c, /* 00110000 */
-    0x18, /* 00011000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 97 0x61 'a'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x1e, /* 01111000 */
-    0x30, /* 00001100 */
-    0x3e, /* 01111100 */
-    0x33, /* 11001100 */
-    0x6e, /* 01110110 */
-    0x00, /* 00000000 */
-
-    /*
-     * 98 0x62 'b'
-     */
-    0x07, /* 11100000 */
-    0x06, /* 01100000 */
-    0x06, /* 01100000 */
-    0x3e, /* 01111100 */
-    0x66, /* 01100110 */
-    0x66, /* 01100110 */
-    0x3b, /* 11011100 */
-    0x00, /* 00000000 */
-
-    /*
-     * 99 0x63 'c'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x1e, /* 01111000 */
-    0x33, /* 11001100 */
-    0x03, /* 11000000 */
-    0x33, /* 11001100 */
-    0x1e, /* 01111000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 100 0x64 'd'
-     */
-    0x38, /* 00011100 */
-    0x30, /* 00001100 */
-    0x30, /* 00001100 */
-    0x3e, /* 01111100 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x6e, /* 01110110 */
-    0x00, /* 00000000 */
-
-    /*
-     * 101 0x65 'e'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x1e, /* 01111000 */
-    0x33, /* 11001100 */
-    0x3f, /* 11111100 */
-    0x03, /* 11000000 */
-    0x1e, /* 01111000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 102 0x66 'f'
-     */
-    0x1c, /* 00111000 */
-    0x36, /* 01101100 */
-    0x06, /* 01100000 */
-    0x0f, /* 11110000 */
-    0x06, /* 01100000 */
-    0x06, /* 01100000 */
-    0x0f, /* 11110000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 103 0x67 'g'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x6e, /* 01110110 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x3e, /* 01111100 */
-    0x30, /* 00001100 */
-    0x1f, /* 11111000 */
-
-    /*
-     * 104 0x68 'h'
-     */
-    0x07, /* 11100000 */
-    0x06, /* 01100000 */
-    0x36, /* 01101100 */
-    0x6e, /* 01110110 */
-    0x66, /* 01100110 */
-    0x66, /* 01100110 */
-    0x67, /* 11100110 */
-    0x00, /* 00000000 */
-
-    /*
-     * 105 0x69 'i'
-     */
-    0x0c, /* 00110000 */
-    0x00, /* 00000000 */
-    0x0e, /* 01110000 */
-    0x0c, /* 00110000 */
-    0x0c, /* 00110000 */
-    0x0c, /* 00110000 */
-    0x1e, /* 01111000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 106 0x6a 'j'
-     */
-    0x30, /* 00001100 */
-    0x00, /* 00000000 */
-    0x30, /* 00001100 */
-    0x30, /* 00001100 */
-    0x30, /* 00001100 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x1e, /* 01111000 */
-
-    /*
-     * 107 0x6b 'k'
-     */
-    0x07, /* 11100000 */
-    0x06, /* 01100000 */
-    0x66, /* 01100110 */
-    0x36, /* 01101100 */
-    0x1e, /* 01111000 */
-    0x36, /* 01101100 */
-    0x67, /* 11100110 */
-    0x00, /* 00000000 */
-
-    /*
-     * 108 0x6c 'l'
-     */
-    0x0e, /* 01110000 */
-    0x0c, /* 00110000 */
-    0x0c, /* 00110000 */
-    0x0c, /* 00110000 */
-    0x0c, /* 00110000 */
-    0x0c, /* 00110000 */
-    0x1e, /* 01111000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 109 0x6d 'm'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x33, /* 11001100 */
-    0x7f, /* 11111110 */
-    0x7f, /* 11111110 */
-    0x6b, /* 11010110 */
-    0x63, /* 11000110 */
-    0x00, /* 00000000 */
-
-    /*
-     * 110 0x6e 'n'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x1f, /* 11111000 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x00, /* 00000000 */
-
-    /*
-     * 111 0x6f 'o'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x1e, /* 01111000 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x1e, /* 01111000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 112 0x70 'p'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x3b, /* 11011100 */
-    0x66, /* 01100110 */
-    0x66, /* 01100110 */
-    0x3e, /* 01111100 */
-    0x06, /* 01100000 */
-    0x0f, /* 11110000 */
-
-    /*
-     * 113 0x71 'q'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x6e, /* 01110110 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x3e, /* 01111100 */
-    0x30, /* 00001100 */
-    0x78, /* 00011110 */
-
-    /*
-     * 114 0x72 'r'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x3b, /* 11011100 */
-    0x6e, /* 01110110 */
-    0x66, /* 01100110 */
-    0x06, /* 01100000 */
-    0x0f, /* 11110000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 115 0x73 's'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x3e, /* 01111100 */
-    0x03, /* 11000000 */
-    0x1e, /* 01111000 */
-    0x30, /* 00001100 */
-    0x1f, /* 11111000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 116 0x74 't'
-     */
-    0x08, /* 00010000 */
-    0x0c, /* 00110000 */
-    0x3e, /* 01111100 */
-    0x0c, /* 00110000 */
-    0x0c, /* 00110000 */
-    0x2c, /* 00110100 */
-    0x18, /* 00011000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 117 0x75 'u'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x6e, /* 01110110 */
-    0x00, /* 00000000 */
-
-    /*
-     * 118 0x76 'v'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x1e, /* 01111000 */
-    0x0c, /* 00110000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 119 0x77 'w'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x63, /* 11000110 */
-    0x6b, /* 11010110 */
-    0x7f, /* 11111110 */
-    0x7f, /* 11111110 */
-    0x36, /* 01101100 */
-    0x00, /* 00000000 */
-
-    /*
-     * 120 0x78 'x'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x63, /* 11000110 */
-    0x36, /* 01101100 */
-    0x1c, /* 00111000 */
-    0x36, /* 01101100 */
-    0x63, /* 11000110 */
-    0x00, /* 00000000 */
-
-    /*
-     * 121 0x79 'y'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x3e, /* 01111100 */
-    0x30, /* 00001100 */
-    0x1f, /* 11111000 */
-
-    /*
-     * 122 0x7a 'z'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x3f, /* 11111100 */
-    0x19, /* 10011000 */
-    0x0c, /* 00110000 */
-    0x26, /* 01100100 */
-    0x3f, /* 11111100 */
-    0x00, /* 00000000 */
-
-    /*
-     * 123 0x7b '{'
-     */
-    0x38, /* 00011100 */
-    0x0c, /* 00110000 */
-    0x0c, /* 00110000 */
-    0x07, /* 11100000 */
-    0x0c, /* 00110000 */
-    0x0c, /* 00110000 */
-    0x38, /* 00011100 */
-    0x00, /* 00000000 */
-
-    /*
-     * 124 0x7c '|'
-     */
-    0x18, /* 00011000 */
-    0x18, /* 00011000 */
-    0x18, /* 00011000 */
-    0x00, /* 00000000 */
-    0x18, /* 00011000 */
-    0x18, /* 00011000 */
-    0x18, /* 00011000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 125 0x7d '}'
-     */
-    0x07, /* 11100000 */
-    0x0c, /* 00110000 */
-    0x0c, /* 00110000 */
-    0x38, /* 00011100 */
-    0x0c, /* 00110000 */
-    0x0c, /* 00110000 */
-    0x07, /* 11100000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 126 0x7e '~'
-     */
-    0x6e, /* 01110110 */
-    0x3b, /* 11011100 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 127 0x7f '^?'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 128 0x80 '€'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 129 0x81 ''
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 130 0x82 '‚'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 131 0x83 'ƒ'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 132 0x84 '„'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 133 0x85 '
-'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 134 0x86 '†'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 135 0x87 '‡'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 136 0x88 'ˆ'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 137 0x89 '‰'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 138 0x8a 'Š'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 139 0x8b '‹'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 140 0x8c 'Œ'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 141 0x8d ''
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 142 0x8e 'Ž'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 143 0x8f ''
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 144 0x90 ''
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 145 0x91 '‘'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 146 0x92 '’'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 147 0x93 '“'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 148 0x94 '”'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 149 0x95 '•'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 150 0x96 '–'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 151 0x97 '—'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 152 0x98 '˜'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 153 0x99 '™'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 154 0x9a 'š'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 155 0x9b '›'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 156 0x9c 'œ'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 157 0x9d ''
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 158 0x9e 'ž'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 159 0x9f 'Ÿ'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 160 0xa0 ' '
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 161 0xa1 '¡'
-     */
-    0x18, /* 00011000 */
-    0x18, /* 00011000 */
-    0x00, /* 00000000 */
-    0x18, /* 00011000 */
-    0x18, /* 00011000 */
-    0x18, /* 00011000 */
-    0x18, /* 00011000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 162 0xa2 '¢'
-     */
-    0x18, /* 00011000 */
-    0x18, /* 00011000 */
-    0x7e, /* 01111110 */
-    0x03, /* 11000000 */
-    0x03, /* 11000000 */
-    0x7e, /* 01111110 */
-    0x18, /* 00011000 */
-    0x18, /* 00011000 */
-
-    /*
-     * 163 0xa3 '£'
-     */
-    0x1c, /* 00111000 */
-    0x36, /* 01101100 */
-    0x26, /* 01100100 */
-    0x0f, /* 11110000 */
-    0x06, /* 01100000 */
-    0x67, /* 11100110 */
-    0x3f, /* 11111100 */
-    0x00, /* 00000000 */
-
-    /*
-     * 164 0xa4 '¤'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x63, /* 11000110 */
-    0x3e, /* 01111100 */
-    0x36, /* 01101100 */
-    0x3e, /* 01111100 */
-    0x63, /* 11000110 */
-    0x00, /* 00000000 */
-
-    /*
-     * 165 0xa5 '¥'
-     */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x1e, /* 01111000 */
-    0x3f, /* 11111100 */
-    0x0c, /* 00110000 */
-    0x3f, /* 11111100 */
-    0x0c, /* 00110000 */
-    0x0c, /* 00110000 */
-
-    /*
-     * 166 0xa6 '¦'
-     */
-    0x18, /* 00011000 */
-    0x18, /* 00011000 */
-    0x18, /* 00011000 */
-    0x00, /* 00000000 */
-    0x18, /* 00011000 */
-    0x18, /* 00011000 */
-    0x18, /* 00011000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 167 0xa7 '§'
-     */
-    0x7c, /* 00111110 */
-    0xc6, /* 01100011 */
-    0x1c, /* 00111000 */
-    0x36, /* 01101100 */
-    0x36, /* 01101100 */
-    0x1c, /* 00111000 */
-    0x33, /* 11001100 */
-    0x1e, /* 01111000 */
-
-    /*
-     * 168 0xa8 '¨'
-     */
-    0x33, /* 11001100 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 169 0xa9 '©'
-     */
-    0x3c, /* 00111100 */
-    0x42, /* 01000010 */
-    0x99, /* 10011001 */
-    0x85, /* 10100001 */
-    0x85, /* 10100001 */
-    0x99, /* 10011001 */
-    0x42, /* 01000010 */
-    0x3c, /* 00111100 */
-
-    /*
-     * 170 0xaa 'ª'
-     */
-    0x3c, /* 00111100 */
-    0x36, /* 01101100 */
-    0x36, /* 01101100 */
-    0x7c, /* 00111110 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 171 0xab '«'
-     */
-    0x00, /* 00000000 */
-    0xcc, /* 00110011 */
-    0x66, /* 01100110 */
-    0x33, /* 11001100 */
-    0x66, /* 01100110 */
-    0xcc, /* 00110011 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 172 0xac '¬'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x3f, /* 11111100 */
-    0x30, /* 00001100 */
-    0x30, /* 00001100 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 173 0xad '­'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 174 0xae '®'
-     */
-    0x3c, /* 00111100 */
-    0x42, /* 01000010 */
-    0x9d, /* 10111001 */
-    0xa5, /* 10100101 */
-    0x9d, /* 10111001 */
-    0xa5, /* 10100101 */
-    0x42, /* 01000010 */
-    0x3c, /* 00111100 */
-
-    /*
-     * 175 0xaf '¯'
-     */
-    0x7e, /* 01111110 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 176 0xb0 '°'
-     */
-    0x1c, /* 00111000 */
-    0x36, /* 01101100 */
-    0x36, /* 01101100 */
-    0x1c, /* 00111000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 177 0xb1 '±'
-     */
-    0x18, /* 00011000 */
-    0x18, /* 00011000 */
-    0x7e, /* 01111110 */
-    0x18, /* 00011000 */
-    0x18, /* 00011000 */
-    0x00, /* 00000000 */
-    0x7e, /* 01111110 */
-    0x00, /* 00000000 */
-
-    /*
-     * 178 0xb2 '²'
-     */
-    0x1c, /* 00111000 */
-    0x30, /* 00001100 */
-    0x18, /* 00011000 */
-    0x0c, /* 00110000 */
-    0x3c, /* 00111100 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 179 0xb3 '³'
-     */
-    0x1c, /* 00111000 */
-    0x30, /* 00001100 */
-    0x18, /* 00011000 */
-    0x30, /* 00001100 */
-    0x1c, /* 00111000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 180 0xb4 '´'
-     */
-    0x18, /* 00011000 */
-    0x0c, /* 00110000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 181 0xb5 'µ'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x66, /* 01100110 */
-    0x66, /* 01100110 */
-    0x66, /* 01100110 */
-    0x3e, /* 01111100 */
-    0x06, /* 01100000 */
-    0x03, /* 11000000 */
-
-    /*
-     * 182 0xb6 '¶'
-     */
-    0xfe, /* 01111111 */
-    0xdb, /* 11011011 */
-    0xdb, /* 11011011 */
-    0xde, /* 01111011 */
-    0xd8, /* 00011011 */
-    0xd8, /* 00011011 */
-    0xd8, /* 00011011 */
-    0x00, /* 00000000 */
-
-    /*
-     * 183 0xb7 '·'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x18, /* 00011000 */
-    0x18, /* 00011000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 184 0xb8 '¸'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x18, /* 00011000 */
-    0x30, /* 00001100 */
-    0x1e, /* 01111000 */
-
-    /*
-     * 185 0xb9 '¹'
-     */
-    0x08, /* 00010000 */
-    0x0c, /* 00110000 */
-    0x08, /* 00010000 */
-    0x1c, /* 00111000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 186 0xba 'º'
-     */
-    0x1c, /* 00111000 */
-    0x36, /* 01101100 */
-    0x36, /* 01101100 */
-    0x1c, /* 00111000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 187 0xbb '»'
-     */
-    0x00, /* 00000000 */
-    0x33, /* 11001100 */
-    0x66, /* 01100110 */
-    0xcc, /* 00110011 */
-    0x66, /* 01100110 */
-    0x33, /* 11001100 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 188 0xbc '¼'
-     */
-    0xc3, /* 11000011 */
-    0x63, /* 11000110 */
-    0x33, /* 11001100 */
-    0xbd, /* 10111101 */
-    0xec, /* 00110111 */
-    0xf6, /* 01101111 */
-    0xf3, /* 11001111 */
-    0x03, /* 11000000 */
-
-    /*
-     * 189 0xbd '½'
-     */
-    0xc3, /* 11000011 */
-    0x63, /* 11000110 */
-    0x33, /* 11001100 */
-    0x7b, /* 11011110 */
-    0xcc, /* 00110011 */
-    0x66, /* 01100110 */
-    0x33, /* 11001100 */
-    0xf0, /* 00001111 */
-
-    /*
-     * 190 0xbe '¾'
-     */
-    0x03, /* 11000000 */
-    0xc4, /* 00100011 */
-    0x63, /* 11000110 */
-    0xb4, /* 00101101 */
-    0xdb, /* 11011011 */
-    0xac, /* 00110101 */
-    0xe6, /* 01100111 */
-    0x80, /* 00000001 */
-
-    /*
-     * 191 0xbf '¿'
-     */
-    0x0c, /* 00110000 */
-    0x00, /* 00000000 */
-    0x0c, /* 00110000 */
-    0x06, /* 01100000 */
-    0x03, /* 11000000 */
-    0x33, /* 11001100 */
-    0x1e, /* 01111000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 192 0xc0 'À'
-     */
-    0x07, /* 11100000 */
-    0x00, /* 00000000 */
-    0x1c, /* 00111000 */
-    0x36, /* 01101100 */
-    0x63, /* 11000110 */
-    0x7f, /* 11111110 */
-    0x63, /* 11000110 */
-    0x00, /* 00000000 */
-
-    /*
-     * 193 0xc1 'Á'
-     */
-    0x70, /* 00001110 */
-    0x00, /* 00000000 */
-    0x1c, /* 00111000 */
-    0x36, /* 01101100 */
-    0x63, /* 11000110 */
-    0x7f, /* 11111110 */
-    0x63, /* 11000110 */
-    0x00, /* 00000000 */
-
-    /*
-     * 194 0xc2 'Â'
-     */
-    0x1c, /* 00111000 */
-    0x36, /* 01101100 */
-    0x00, /* 00000000 */
-    0x3e, /* 01111100 */
-    0x63, /* 11000110 */
-    0x7f, /* 11111110 */
-    0x63, /* 11000110 */
-    0x00, /* 00000000 */
-
-    /*
-     * 195 0xc3 'Ã'
-     */
-    0x6e, /* 01110110 */
-    0x3b, /* 11011100 */
-    0x00, /* 00000000 */
-    0x3e, /* 01111100 */
-    0x63, /* 11000110 */
-    0x7f, /* 11111110 */
-    0x63, /* 11000110 */
-    0x00, /* 00000000 */
-
-    /*
-     * 196 0xc4 'Ä'
-     */
-    0x63, /* 11000110 */
-    0x1c, /* 00111000 */
-    0x36, /* 01101100 */
-    0x63, /* 11000110 */
-    0x7f, /* 11111110 */
-    0x63, /* 11000110 */
-    0x63, /* 11000110 */
-    0x00, /* 00000000 */
-
-    /*
-     * 197 0xc5 'Å'
-     */
-    0x0c, /* 00110000 */
-    0x0c, /* 00110000 */
-    0x00, /* 00000000 */
-    0x1e, /* 01111000 */
-    0x33, /* 11001100 */
-    0x3f, /* 11111100 */
-    0x33, /* 11001100 */
-    0x00, /* 00000000 */
-
-    /*
-     * 198 0xc6 'Æ'
-     */
-    0x7c, /* 00111110 */
-    0x36, /* 01101100 */
-    0x33, /* 11001100 */
-    0x7f, /* 11111110 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x73, /* 11001110 */
-    0x00, /* 00000000 */
-
-    /*
-     * 199 0xc7 'Ç'
-     */
-    0x1e, /* 01111000 */
-    0x33, /* 11001100 */
-    0x03, /* 11000000 */
-    0x33, /* 11001100 */
-    0x1e, /* 01111000 */
-    0x18, /* 00011000 */
-    0x30, /* 00001100 */
-    0x1e, /* 01111000 */
-
-    /*
-     * 200 0xc8 'È'
-     */
-    0x07, /* 11100000 */
-    0x00, /* 00000000 */
-    0x3f, /* 11111100 */
-    0x06, /* 01100000 */
-    0x1e, /* 01111000 */
-    0x06, /* 01100000 */
-    0x3f, /* 11111100 */
-    0x00, /* 00000000 */
-
-    /*
-     * 201 0xc9 'É'
-     */
-    0x38, /* 00011100 */
-    0x00, /* 00000000 */
-    0x3f, /* 11111100 */
-    0x06, /* 01100000 */
-    0x1e, /* 01111000 */
-    0x06, /* 01100000 */
-    0x3f, /* 11111100 */
-    0x00, /* 00000000 */
-
-    /*
-     * 202 0xca 'Ê'
-     */
-    0x0c, /* 00110000 */
-    0x12, /* 01001000 */
-    0x3f, /* 11111100 */
-    0x06, /* 01100000 */
-    0x1e, /* 01111000 */
-    0x06, /* 01100000 */
-    0x3f, /* 11111100 */
-    0x00, /* 00000000 */
-
-    /*
-     * 203 0xcb 'Ë'
-     */
-    0x36, /* 01101100 */
-    0x00, /* 00000000 */
-    0x3f, /* 11111100 */
-    0x06, /* 01100000 */
-    0x1e, /* 01111000 */
-    0x06, /* 01100000 */
-    0x3f, /* 11111100 */
-    0x00, /* 00000000 */
-
-    /*
-     * 204 0xcc 'Ì'
-     */
-    0x07, /* 11100000 */
-    0x00, /* 00000000 */
-    0x1e, /* 01111000 */
-    0x0c, /* 00110000 */
-    0x0c, /* 00110000 */
-    0x0c, /* 00110000 */
-    0x1e, /* 01111000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 205 0xcd 'Í'
-     */
-    0x38, /* 00011100 */
-    0x00, /* 00000000 */
-    0x1e, /* 01111000 */
-    0x0c, /* 00110000 */
-    0x0c, /* 00110000 */
-    0x0c, /* 00110000 */
-    0x1e, /* 01111000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 206 0xce 'Î'
-     */
-    0x0c, /* 00110000 */
-    0x12, /* 01001000 */
-    0x00, /* 00000000 */
-    0x1e, /* 01111000 */
-    0x0c, /* 00110000 */
-    0x0c, /* 00110000 */
-    0x1e, /* 01111000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 207 0xcf 'Ï'
-     */
-    0x33, /* 11001100 */
-    0x00, /* 00000000 */
-    0x1e, /* 01111000 */
-    0x0c, /* 00110000 */
-    0x0c, /* 00110000 */
-    0x0c, /* 00110000 */
-    0x1e, /* 01111000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 208 0xd0 'Ð'
-     */
-    0x3f, /* 11111100 */
-    0x66, /* 01100110 */
-    0x6f, /* 11110110 */
-    0x6f, /* 11110110 */
-    0x66, /* 01100110 */
-    0x66, /* 01100110 */
-    0x3f, /* 11111100 */
-    0x00, /* 00000000 */
-
-    /*
-     * 209 0xd1 'Ñ'
-     */
-    0x3f, /* 11111100 */
-    0x00, /* 00000000 */
-    0x33, /* 11001100 */
-    0x37, /* 11101100 */
-    0x3f, /* 11111100 */
-    0x3b, /* 11011100 */
-    0x33, /* 11001100 */
-    0x00, /* 00000000 */
-
-    /*
-     * 210 0xd2 'Ò'
-     */
-    0x0e, /* 01110000 */
-    0x00, /* 00000000 */
-    0x18, /* 00011000 */
-    0x3c, /* 00111100 */
-    0x66, /* 01100110 */
-    0x3c, /* 00111100 */
-    0x18, /* 00011000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 211 0xd3 'Ó'
-     */
-    0x70, /* 00001110 */
-    0x00, /* 00000000 */
-    0x18, /* 00011000 */
-    0x3c, /* 00111100 */
-    0x66, /* 01100110 */
-    0x3c, /* 00111100 */
-    0x18, /* 00011000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 212 0xd4 'Ô'
-     */
-    0x3c, /* 00111100 */
-    0x66, /* 01100110 */
-    0x18, /* 00011000 */
-    0x3c, /* 00111100 */
-    0x66, /* 01100110 */
-    0x3c, /* 00111100 */
-    0x18, /* 00011000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 213 0xd5 'Õ'
-     */
-    0x6e, /* 01110110 */
-    0x3b, /* 11011100 */
-    0x00, /* 00000000 */
-    0x3e, /* 01111100 */
-    0x63, /* 11000110 */
-    0x63, /* 11000110 */
-    0x3e, /* 01111100 */
-    0x00, /* 00000000 */
-
-    /*
-     * 214 0xd6 'Ö'
-     */
-    0xc3, /* 11000011 */
-    0x18, /* 00011000 */
-    0x3c, /* 00111100 */
-    0x66, /* 01100110 */
-    0x66, /* 01100110 */
-    0x3c, /* 00111100 */
-    0x18, /* 00011000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 215 0xd7 '×'
-     */
-    0x00, /* 00000000 */
-    0x36, /* 01101100 */
-    0x1c, /* 00111000 */
-    0x08, /* 00010000 */
-    0x1c, /* 00111000 */
-    0x36, /* 01101100 */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 216 0xd8 'Ø'
-     */
-    0x5c, /* 00111010 */
-    0x36, /* 01101100 */
-    0x73, /* 11001110 */
-    0x7b, /* 11011110 */
-    0x6f, /* 11110110 */
-    0x36, /* 01101100 */
-    0x1d, /* 10111000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 217 0xd9 'Ù'
-     */
-    0x0e, /* 01110000 */
-    0x00, /* 00000000 */
-    0x66, /* 01100110 */
-    0x66, /* 01100110 */
-    0x66, /* 01100110 */
-    0x66, /* 01100110 */
-    0x3c, /* 00111100 */
-    0x00, /* 00000000 */
-
-    /*
-     * 218 0xda 'Ú'
-     */
-    0x70, /* 00001110 */
-    0x00, /* 00000000 */
-    0x66, /* 01100110 */
-    0x66, /* 01100110 */
-    0x66, /* 01100110 */
-    0x66, /* 01100110 */
-    0x3c, /* 00111100 */
-    0x00, /* 00000000 */
-
-    /*
-     * 219 0xdb 'Û'
-     */
-    0x3c, /* 00111100 */
-    0x66, /* 01100110 */
-    0x00, /* 00000000 */
-    0x66, /* 01100110 */
-    0x66, /* 01100110 */
-    0x66, /* 01100110 */
-    0x3c, /* 00111100 */
-    0x00, /* 00000000 */
-
-    /*
-     * 220 0xdc 'Ü'
-     */
-    0x33, /* 11001100 */
-    0x00, /* 00000000 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x1e, /* 01111000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 221 0xdd 'Ý'
-     */
-    0x70, /* 00001110 */
-    0x00, /* 00000000 */
-    0x66, /* 01100110 */
-    0x66, /* 01100110 */
-    0x3c, /* 00111100 */
-    0x18, /* 00011000 */
-    0x18, /* 00011000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 222 0xde 'Þ'
-     */
-    0x0f, /* 11110000 */
-    0x06, /* 01100000 */
-    0x3e, /* 01111100 */
-    0x66, /* 01100110 */
-    0x66, /* 01100110 */
-    0x3e, /* 01111100 */
-    0x06, /* 01100000 */
-    0x0f, /* 11110000 */
-
-    /*
-     * 223 0xdf 'ß'
-     */
-    0x00, /* 00000000 */
-    0x1e, /* 01111000 */
-    0x33, /* 11001100 */
-    0x1f, /* 11111000 */
-    0x33, /* 11001100 */
-    0x1f, /* 11111000 */
-    0x03, /* 11000000 */
-    0x03, /* 11000000 */
-
-    /*
-     * 224 0xe0 'à'
-     */
-    0x07, /* 11100000 */
-    0x00, /* 00000000 */
-    0x1e, /* 01111000 */
-    0x30, /* 00001100 */
-    0x3e, /* 01111100 */
-    0x33, /* 11001100 */
-    0x7e, /* 01111110 */
-    0x00, /* 00000000 */
-
-    /*
-     * 225 0xe1 'á'
-     */
-    0x38, /* 00011100 */
-    0x00, /* 00000000 */
-    0x1e, /* 01111000 */
-    0x30, /* 00001100 */
-    0x3e, /* 01111100 */
-    0x33, /* 11001100 */
-    0x7e, /* 01111110 */
-    0x00, /* 00000000 */
-
-    /*
-     * 226 0xe2 'â'
-     */
-    0x7e, /* 01111110 */
-    0xc3, /* 11000011 */
-    0x3c, /* 00111100 */
-    0x60, /* 00000110 */
-    0x7c, /* 00111110 */
-    0x66, /* 01100110 */
-    0xfc, /* 00111111 */
-    0x00, /* 00000000 */
-
-    /*
-     * 227 0xe3 'ã'
-     */
-    0x6e, /* 01110110 */
-    0x3b, /* 11011100 */
-    0x1e, /* 01111000 */
-    0x30, /* 00001100 */
-    0x3e, /* 01111100 */
-    0x33, /* 11001100 */
-    0x7e, /* 01111110 */
-    0x00, /* 00000000 */
-
-    /*
-     * 228 0xe4 'ä'
-     */
-    0x33, /* 11001100 */
-    0x00, /* 00000000 */
-    0x1e, /* 01111000 */
-    0x30, /* 00001100 */
-    0x3e, /* 01111100 */
-    0x33, /* 11001100 */
-    0x7e, /* 01111110 */
-    0x00, /* 00000000 */
-
-    /*
-     * 229 0xe5 'å'
-     */
-    0x0c, /* 00110000 */
-    0x0c, /* 00110000 */
-    0x1e, /* 01111000 */
-    0x30, /* 00001100 */
-    0x3e, /* 01111100 */
-    0x33, /* 11001100 */
-    0x7e, /* 01111110 */
-    0x00, /* 00000000 */
-
-    /*
-     * 230 0xe6 'æ'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0xfe, /* 01111111 */
-    0x30, /* 00001100 */
-    0xfe, /* 01111111 */
-    0x33, /* 11001100 */
-    0xfe, /* 01111111 */
-    0x00, /* 00000000 */
-
-    /*
-     * 231 0xe7 'ç'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x1e, /* 01111000 */
-    0x03, /* 11000000 */
-    0x03, /* 11000000 */
-    0x1e, /* 01111000 */
-    0x30, /* 00001100 */
-    0x1c, /* 00111000 */
-
-    /*
-     * 232 0xe8 'è'
-     */
-    0x07, /* 11100000 */
-    0x00, /* 00000000 */
-    0x1e, /* 01111000 */
-    0x33, /* 11001100 */
-    0x3f, /* 11111100 */
-    0x03, /* 11000000 */
-    0x1e, /* 01111000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 233 0xe9 'é'
-     */
-    0x38, /* 00011100 */
-    0x00, /* 00000000 */
-    0x1e, /* 01111000 */
-    0x33, /* 11001100 */
-    0x3f, /* 11111100 */
-    0x03, /* 11000000 */
-    0x1e, /* 01111000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 234 0xea 'ê'
-     */
-    0x7e, /* 01111110 */
-    0xc3, /* 11000011 */
-    0x3c, /* 00111100 */
-    0x66, /* 01100110 */
-    0x7e, /* 01111110 */
-    0x06, /* 01100000 */
-    0x3c, /* 00111100 */
-    0x00, /* 00000000 */
-
-    /*
-     * 235 0xeb 'ë'
-     */
-    0x33, /* 11001100 */
-    0x00, /* 00000000 */
-    0x1e, /* 01111000 */
-    0x33, /* 11001100 */
-    0x3f, /* 11111100 */
-    0x03, /* 11000000 */
-    0x1e, /* 01111000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 236 0xec 'ì'
-     */
-    0x07, /* 11100000 */
-    0x00, /* 00000000 */
-    0x0e, /* 01110000 */
-    0x0c, /* 00110000 */
-    0x0c, /* 00110000 */
-    0x0c, /* 00110000 */
-    0x1e, /* 01111000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 237 0xed 'í'
-     */
-    0x1c, /* 00111000 */
-    0x00, /* 00000000 */
-    0x0e, /* 01110000 */
-    0x0c, /* 00110000 */
-    0x0c, /* 00110000 */
-    0x0c, /* 00110000 */
-    0x1e, /* 01111000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 238 0xee 'î'
-     */
-    0x3e, /* 01111100 */
-    0x63, /* 11000110 */
-    0x1c, /* 00111000 */
-    0x18, /* 00011000 */
-    0x18, /* 00011000 */
-    0x18, /* 00011000 */
-    0x3c, /* 00111100 */
-    0x00, /* 00000000 */
-
-    /*
-     * 239 0xef 'ï'
-     */
-    0x33, /* 11001100 */
-    0x00, /* 00000000 */
-    0x0e, /* 01110000 */
-    0x0c, /* 00110000 */
-    0x0c, /* 00110000 */
-    0x0c, /* 00110000 */
-    0x1e, /* 01111000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 240 0xf0 'ð'
-     */
-    0x1b, /* 11011000 */
-    0x0e, /* 01110000 */
-    0x1b, /* 11011000 */
-    0x30, /* 00001100 */
-    0x3e, /* 01111100 */
-    0x33, /* 11001100 */
-    0x1e, /* 01111000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 241 0xf1 'ñ'
-     */
-    0x00, /* 00000000 */
-    0x1f, /* 11111000 */
-    0x00, /* 00000000 */
-    0x1f, /* 11111000 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x00, /* 00000000 */
-
-    /*
-     * 242 0xf2 'ò'
-     */
-    0x00, /* 00000000 */
-    0x07, /* 11100000 */
-    0x00, /* 00000000 */
-    0x1e, /* 01111000 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x1e, /* 01111000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 243 0xf3 'ó'
-     */
-    0x00, /* 00000000 */
-    0x38, /* 00011100 */
-    0x00, /* 00000000 */
-    0x1e, /* 01111000 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x1e, /* 01111000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 244 0xf4 'ô'
-     */
-    0x1e, /* 01111000 */
-    0x33, /* 11001100 */
-    0x00, /* 00000000 */
-    0x1e, /* 01111000 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x1e, /* 01111000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 245 0xf5 'õ'
-     */
-    0x6e, /* 01110110 */
-    0x3b, /* 11011100 */
-    0x00, /* 00000000 */
-    0x1e, /* 01111000 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x1e, /* 01111000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 246 0xf6 'ö'
-     */
-    0x00, /* 00000000 */
-    0x33, /* 11001100 */
-    0x00, /* 00000000 */
-    0x1e, /* 01111000 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x1e, /* 01111000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 247 0xf7 '÷'
-     */
-    0x18, /* 00011000 */
-    0x18, /* 00011000 */
-    0x00, /* 00000000 */
-    0x7e, /* 01111110 */
-    0x00, /* 00000000 */
-    0x18, /* 00011000 */
-    0x18, /* 00011000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 248 0xf8 'ø'
-     */
-    0x00, /* 00000000 */
-    0x60, /* 00000110 */
-    0x3c, /* 00111100 */
-    0x76, /* 01101110 */
-    0x7e, /* 01111110 */
-    0x6e, /* 01110110 */
-    0x3c, /* 00111100 */
-    0x06, /* 01100000 */
-
-    /*
-     * 249 0xf9 'ù'
-     */
-    0x00, /* 00000000 */
-    0x07, /* 11100000 */
-    0x00, /* 00000000 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x7e, /* 01111110 */
-    0x00, /* 00000000 */
-
-    /*
-     * 250 0xfa 'ú'
-     */
-    0x00, /* 00000000 */
-    0x38, /* 00011100 */
-    0x00, /* 00000000 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x7e, /* 01111110 */
-    0x00, /* 00000000 */
-
-    /*
-     * 251 0xfb 'û'
-     */
-    0x1e, /* 01111000 */
-    0x33, /* 11001100 */
-    0x00, /* 00000000 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x7e, /* 01111110 */
-    0x00, /* 00000000 */
-
-    /*
-     * 252 0xfc 'ü'
-     */
-    0x00, /* 00000000 */
-    0x33, /* 11001100 */
-    0x00, /* 00000000 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x7e, /* 01111110 */
-    0x00, /* 00000000 */
-
-    /*
-     * 253 0xfd 'ý'
-     */
-    0x00, /* 00000000 */
-    0x38, /* 00011100 */
-    0x00, /* 00000000 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x3e, /* 01111100 */
-    0x30, /* 00001100 */
-    0x1f, /* 11111000 */
-
-    /*
-     * 254 0xfe 'þ'
-     */
-    0x00, /* 00000000 */
-    0x00, /* 00000000 */
-    0x06, /* 01100000 */
-    0x3e, /* 01111100 */
-    0x66, /* 01100110 */
-    0x3e, /* 01111100 */
-    0x06, /* 01100000 */
-    0x00, /* 00000000 */
-
-    /*
-     * 255 0xff 'ÿ'
-     */
-    0x00, /* 00000000 */
-    0x33, /* 11001100 */
-    0x00, /* 00000000 */
-    0x33, /* 11001100 */
-    0x33, /* 11001100 */
-    0x3e, /* 01111100 */
-    0x30, /* 00001100 */
-    0x1f, /* 11111000 */
-
-    /*
-     * 256 0x100 - missing character
-     */
-    0x55, /* 01010101 */
-    0xAA, /* 10101010 */
-    0x55, /* 01010101 */
-    0xAA, /* 10101010 */
-    0x55, /* 01010101 */
-    0xAA, /* 10101010 */
-    0x55, /* 01010101 */
-    0xAA, /* 10101010 */
-};
-SDL_COMPILE_TIME_ASSERT(SDLTest_FontDataSize, SDL_arraysize(SDLTest_FontData) == NUM_FONT_GLYPHS * 8);
-
-/* ---- Character */
-
-struct SDLTest_CharTextureCache
-{
-    SDL_Renderer *renderer;
-    SDL_Texture *charTextureCache[NUM_FONT_GLYPHS];
-    struct SDLTest_CharTextureCache *next;
-};
-
-/*!
-List of per-renderer caches for 8x8 pixel font textures created at runtime.
-*/
-static struct SDLTest_CharTextureCache *SDLTest_CharTextureCacheList;
+#define UTF8_IsTrailingByte(c) ((c) >= 0x80 && (c) <= 0xBF)
 
-int FONT_CHARACTER_SIZE = 8;
+int FONT_CHARACTER_SIZE = SDL_DEBUG_TEXT_FONT_CHARACTER_SIZE;
 
 bool SDLTest_DrawCharacter(SDL_Renderer *renderer, float x, float y, Uint32 c)
 {
-    const Uint32 charWidth = FONT_CHARACTER_SIZE;
-    const Uint32 charHeight = FONT_CHARACTER_SIZE;
-    SDL_FRect srect;
-    SDL_FRect drect;
-    bool result;
-    Uint32 ix, iy;
-    const unsigned char *charpos;
-    Uint32 *curpos;
-    Uint8 *linepos;
-    Uint32 pitch;
-    SDL_Surface *character;
-    Uint32 ci;
-    Uint8 r, g, b, a;
-    struct SDLTest_CharTextureCache *cache;
-
-    /*
-     * Setup source rectangle
-     */
-    srect.x = 0.0f;
-    srect.y = 0.0f;
-    srect.w = 8.0f;
-    srect.h = 8.0f;
-
-    /*
-     * Setup destination rectangle
-     */
-    drect.x = x;
-    drect.y = y;
-    drect.w = (float)charWidth;
-    drect.h = (float)charHeight;
-
-    /* Character index in cache */
-    ci = c;
-    if (ci >= NUM_FONT_GLYPHS) {
-        ci = (NUM_FONT_GLYPHS - 1);
-    }
-
-    /* Search for this renderer's cache */
-    for (cache = SDLTest_CharTextureCacheList; cache; cache = cache->next) {
-        if (cache->renderer == renderer) {
-            break;
-        }
-    }
-
-    /* Allocate a new cache for this renderer if needed */
-    if (!cache) {
-        cache = (struct SDLTest_CharTextureCache *)SDL_calloc(1, sizeof(struct SDLTest_CharTextureCache));
-        cache->renderer = renderer;
-        cache->next = SDLTest_CharTextureCacheList;
-        SDLTest_CharTextureCacheList = cache;
-    }
-
-    /*
-     * Create new charWidth x charHeight bitmap surface if not already present.
-     */
-    if (cache->charTextureCache[ci] == NULL) {
-        /*
-         * Redraw character into surface
-         */
-        character = SDL_CreateSurface(charWidth, charHeight, SDL_PIXELFORMAT_RGBA8888);
-        if (!character) {
-            return false;
-        }
-
-        charpos = SDLTest_FontData + ci * 8;
-        linepos = (Uint8 *)character->pixels;
-        pitch = character->pitch;
-
-        /*
-         * Drawing loop
-         */
-        for (iy = 0; iy < charWidth; iy++) {
-            curpos = (Uint32 *)linepos;
-            for (ix = 0; ix < charWidth; ix++) {
-                if ((*charpos) & (1 << ix)) {
-                    *curpos = 0xffffffff;
-                } else {
-                    *curpos = 0;
-                }
-                ++curpos;
-            }
-            linepos += pitch;
-            ++charpos;
-        }
-
-        /* Convert temp surface into texture */
-        cache->charTextureCache[ci] = SDL_CreateTextureFromSurface(renderer, character);
-        SDL_DestroySurface(character);
-
-        /*
-         * Check pointer
-         */
-        if (cache->charTextureCache[ci] == NULL) {
-            return false;
-        }
-
-        SDL_SetTextureScaleMode(cache->charTextureCache[ci], SDL_SCALEMODE_NEAREST);
-    }
-
-    /*
-     * Set color
-     */
-    result = true;
-    result &= SDL_GetRenderDrawColor(renderer, &r, &g, &b, &a);
-    result &= SDL_SetTextureColorMod(cache->charTextureCache[ci], r, g, b);
-    result &= SDL_SetTextureAlphaMod(cache->charTextureCache[ci], a);
-
-    /*
-     * Draw texture onto destination
-     */
-    result &= SDL_RenderTexture(renderer, cache->charTextureCache[ci], &srect, &drect);
-
-    return result;
-}
-
-/* Gets a unicode value from a UTF-8 encoded string
- * Outputs increment to advance the string */
-#define UNKNOWN_UNICODE 0xFFFD
-static Uint32 UTF8_getch(const char *src, size_t srclen, int *inc)
-{
-    const Uint8 *p = (const Uint8 *)src;
-    size_t left = 0;
-    size_t save_srclen = srclen;
-    bool overlong = false;
-    bool underflow = false;
-    Uint32 ch = UNKNOWN_UNICODE;
-
-    if (srclen == 0) {
-        return UNKNOWN_UNICODE;
-    }
-    if (p[0] >= 0xFC) {
-        if ((p[0] & 0xFE) == 0xFC) {
-            if (p[0] == 0xFC && (p[1] & 0xFC) == 0x80) {
-                overlong = true;
-            }
-            ch = (Uint32)(p[0] & 0x01);
-            left = 5;
-        }
-    } else if (p[0] >= 0xF8) {
-        if ((p[0] & 0xFC) == 0xF8) {
-            if (p[0] == 0xF8 && (p[1] & 0xF8) == 0x80) {
-                overlong = true;
-            }
-            ch = (Uint32)(p[0] & 0x03);
-            left = 4;
-        }
-    } else if (p[0] >= 0xF0) {
-        if ((p[0] & 0xF8) == 0xF0) {
-            if (p[0] == 0xF0 && (p[1] & 0xF0) == 0x80) {
-                overlong = true;
-            }
-            ch = (Uint32)(p[0] & 0x07);
-            left = 3;
-        }
-    } else if (p[0] >= 0xE0) {
-        if ((p[0] & 0xF0) == 0xE0) {
-            if (p[0] == 0xE0 && (p[1] & 0xE0) == 0x80) {
-                overlong = true;
-            }
-            ch = (Uint32)(p[0] & 0x0F);
-            left = 2;
-        }
-    } else if (p[0] >= 0xC0) {
-        if ((p[0] & 0xE0) == 0xC0) {
-            if ((p[0] & 0xDE) == 0xC0) {
-                overlong = true;
-            }
-            ch = (Uint32)(p[0] & 0x1F);
-            left = 1;
-        }
-    } else {
-        if (!(p[0] & 0x80)) {
-            ch = (Uint32)p[0];
-        }
-    }
-    --srclen;
-    while (left > 0 && srclen > 0) {
-        ++p;
-        if ((p[0] & 0xC0) != 0x80) {
-            ch = UNKNOWN_UNICODE;
-            break;
-        }
-        ch <<= 6;
-        ch |= (p[0] & 0x3F);
-        --srclen;
-        --left;
-    }
-    if (left > 0) {
-        underflow = true;
-    }
-
-    if (overlong || underflow ||
-        (ch >= 0xD800 && ch <= 0xDFFF) ||
-        (ch == 0xFFFE || ch == 0xFFFF) || ch > 0x10FFFF) {
-        ch = UNKNOWN_UNICODE;
-    }
-
-    *inc = (int)(save_srclen - srclen);
-
-    return ch;
+    char str[5];
+    char *ptr = SDL_UCS4ToUTF8(c, str);
+    *ptr = '\0';
+    return SDL_RenderDebugText(renderer, x, y, str);
 }
 
-#define UTF8_IsTrailingByte(c) ((c) >= 0x80 && (c) <= 0xBF)
-
 bool SDLTest_DrawString(SDL_Renderer *renderer, float x, float y, const char *s)
 {
-    const Uint32 charWidth = FONT_CHARACTER_SIZE;
-    bool result = true;
-    float curx = x;
-    float cury = y;
-    size_t len = SDL_strlen(s);
-
-    while (len > 0 && result) {
-        int advance = 0;
-        Uint32 ch = UTF8_getch(s, len, &advance);
-        result &= SDLTest_DrawCharacter(renderer, curx, cury, ch);
-        curx += charWidth;
-        s += advance;
-        len -= advance;
-    }
-
-    return result;
+    return SDL_RenderDebugText(renderer, x, y, s);
 }
 
 SDLTest_TextWindow *SDLTest_TextWindowCreate(float x, float y, float w, float h)
@@ -3487,22 +156,4 @@ void SDLTest_TextWindowDestroy(SDLTest_TextWindow *textwin)
 
 void SDLTest_CleanupTextDrawing(void)
 {
-    unsigned int i;
-    struct SDLTest_CharTextureCache *cache, *next;
-
-    cache = SDLTest_CharTextureCacheList;
-    while (cache) {
-        for (i = 0; i < SDL_arraysize(cache->charTextureCache); ++i) {
-            if (cache->charTextureCache[i]) {
-                SDL_DestroyTexture(cache->charTextureCache[i]);
-                cache->charTextureCache[i] = NULL;
-            }
-        }
-
-        next = cache->next;
-        SDL_free(cache);
-        cache = next;
-    }
-
-    SDLTest_CharTextureCacheList = NULL;
 }
diff --git a/libs/SDL3/src/thread/generic/SDL_syscond.c b/libs/SDL3/src/thread/generic/SDL_syscond.c
index b5b2b3274..47ea14992 100644
--- a/libs/SDL3/src/thread/generic/SDL_syscond.c
+++ b/libs/SDL3/src/thread/generic/SDL_syscond.c
@@ -41,11 +41,11 @@
 
 typedef struct SDL_cond_generic
 {
-    SDL_Mutex *lock;
-    int waiting;
-    int signals;
-    SDL_Semaphore *wait_sem;
-    SDL_Semaphore *wait_done;
+    SDL_Semaphore *sem;
+    SDL_Semaphore *handshake_sem;
+    SDL_Semaphore *signal_sem;
+    int num_waiting;
+    int num_signals;
 } SDL_cond_generic;
 
 // Create a condition variable
@@ -55,11 +55,10 @@ SDL_Condition *SDL_CreateCondition_generic(void)
 
 #ifndef SDL_THREADS_DISABLED
     if (cond) {
-        cond->lock = SDL_CreateMutex();
-        cond->wait_sem = SDL_CreateSemaphore(0);
-        cond->wait_done = SDL_CreateSemaphore(0);
-        cond->waiting = cond->signals = 0;
-        if (!cond->lock || !cond->wait_sem || !cond->wait_done) {
+        cond->sem = SDL_CreateSemaphore(0);
+        cond->handshake_sem = SDL_CreateSemaphore(0);
+        cond->signal_sem = SDL_CreateSemaphore(1);
+        if (!cond->sem || !cond->handshake_sem || !cond->signal_sem) {
             SDL_DestroyCondition_generic((SDL_Condition *)cond);
             cond = NULL;
         }
@@ -74,14 +73,14 @@ void SDL_DestroyCondition_generic(SDL_Condition *_cond)
 {
     SDL_cond_generic *cond = (SDL_cond_generic *)_cond;
     if (cond) {
-        if (cond->wait_sem) {
-            SDL_DestroySemaphore(cond->wait_sem);
+        if (cond->sem) {
+            SDL_DestroySemaphore(cond->sem);
         }
-        if (cond->wait_done) {
-            SDL_DestroySemaphore(cond->wait_done);
+        if (cond->handshake_sem) {
+            SDL_DestroySemaphore(cond->handshake_sem);
         }
-        if (cond->lock) {
-            SDL_DestroyMutex(cond->lock);
+        if (cond->signal_sem) {
+            SDL_DestroySemaphore(cond->signal_sem);
         }
         SDL_free(cond);
     }
@@ -99,14 +98,14 @@ void SDL_SignalCondition_generic(SDL_Condition *_cond)
     /* If there are waiting threads not already signalled, then
        signal the condition and wait for the thread to respond.
      */
-    SDL_LockMutex(cond->lock);
-    if (cond->waiting > cond->signals) {
-        ++cond->signals;
-        SDL_SignalSemaphore(cond->wait_sem);
-        SDL_UnlockMutex(cond->lock);
-        SDL_WaitSemaphore(cond->wait_done);
+    SDL_WaitSemaphore(cond->signal_sem);
+    if (cond->num_waiting > cond->num_signals) {
+        cond->num_signals++;
+        SDL_SignalSemaphore(cond->sem);
+        SDL_SignalSemaphore(cond->signal_sem);
+        SDL_WaitSemaphore(cond->handshake_sem);
     } else {
-        SDL_UnlockMutex(cond->lock);
+        SDL_SignalSemaphore(cond->signal_sem);
     }
 #endif
 }
@@ -123,24 +122,22 @@ void SDL_BroadcastCondition_generic(SDL_Condition *_cond)
     /* If there are waiting threads not already signalled, then
        signal the condition and wait for the thread to respond.
      */
-    SDL_LockMutex(cond->lock);
-    if (cond->waiting > cond->signals) {
-        int i, num_waiting;
-
-        num_waiting = (cond->waiting - cond->signals);
-        cond->signals = cond->waiting;
-        for (i = 0; i < num_waiting; ++i) {
-            SDL_SignalSemaphore(cond->wait_sem);
+    SDL_WaitSemaphore(cond->signal_sem);
+    if (cond->num_waiting > cond->num_signals) {
+        const int num_waiting = (cond->num_waiting - cond->num_signals);
+        cond->num_signals = cond->num_waiting;
+        for (int i = 0; i < num_waiting; i++) {
+            SDL_SignalSemaphore(cond->sem);
         }
         /* Now all released threads are blocked here, waiting for us.
            Collect them all (and win fabulous prizes!) :-)
          */
-        SDL_UnlockMutex(cond->lock);
-        for (i = 0; i < num_waiting; ++i) {
-            SDL_WaitSemaphore(cond->wait_done);
+        SDL_SignalSemaphore(cond->signal_sem);
+        for (int i = 0; i < num_waiting; i++) {
+            SDL_WaitSemaphore(cond->handshake_sem);
         }
     } else {
-        SDL_UnlockMutex(cond->lock);
+        SDL_SignalSemaphore(cond->signal_sem);
     }
 #endif
 }
@@ -180,15 +177,15 @@ bool SDL_WaitConditionTimeoutNS_generic(SDL_Condition *_cond, SDL_Mutex *mutex,
        This allows the signal mechanism to only perform a signal if there
        are waiting threads.
      */
-    SDL_LockMutex(cond->lock);
-    ++cond->waiting;
-    SDL_UnlockMutex(cond->lock);
+    SDL_WaitSemaphore(cond->signal_sem);
+    cond->num_waiting++;
+    SDL_SignalSemaphore(cond->signal_sem);
 
     // Unlock the mutex, as is required by condition variable semantics
     SDL_UnlockMutex(mutex);
 
     // Wait for a signal
-    result = SDL_WaitSemaphoreTimeoutNS(cond->wait_sem, timeoutNS);
+    result = SDL_WaitSemaphoreTimeoutNS(cond->sem, timeoutNS);
 
     /* Let the signaler know we have completed the wait, otherwise
        the signaler can race ahead and get the condition semaphore
@@ -196,20 +193,13 @@ bool SDL_WaitConditionTimeoutNS_generic(SDL_Condition *_cond, SDL_Mutex *mutex,
        giving a deadlock.  See the following URL for details:
        http://web.archive.org/web/20010914175514/http://www-classic.be.com/aboutbe/benewsletter/volume_III/Issue40.html#Workshop
      */
-    SDL_LockMutex(cond->lock);
-    if (cond->signals > 0) {
-        // If we timed out, we need to eat a condition signal
-        if (!result) {
-            SDL_WaitSemaphore(cond->wait_sem);
-        }
-        // We always notify the signal thread that we are done
-        SDL_SignalSemaphore(cond->wait_done);
-
-        // Signal handshake complete
-        --cond->signals;
+    SDL_WaitSemaphore(cond->signal_sem);
+    if (cond->num_signals > 0) {
+        SDL_SignalSemaphore(cond->handshake_sem);
+        cond->num_signals--;
     }
-    --cond->waiting;
-    SDL_UnlockMutex(cond->lock);
+    cond->num_waiting--;
+    SDL_SignalSemaphore(cond->signal_sem);
 
     // Lock the mutex, as is required by condition variable semantics
     SDL_LockMutex(mutex);
diff --git a/libs/SDL3/src/thread/pthread/SDL_systhread.c b/libs/SDL3/src/thread/pthread/SDL_systhread.c
index feaae3b96..9ece73122 100644
--- a/libs/SDL3/src/thread/pthread/SDL_systhread.c
+++ b/libs/SDL3/src/thread/pthread/SDL_systhread.c
@@ -26,7 +26,9 @@
 #include <pthread_np.h>
 #endif
 
+#ifdef HAVE_SIGNAL_H
 #include <signal.h>
+#endif
 #include <errno.h>
 
 #ifdef SDL_PLATFORM_LINUX
@@ -55,11 +57,13 @@
 #include <kernel/OS.h>
 #endif
 
+#ifdef HAVE_SIGNAL_H
 // List of signals to mask in the subthreads
 static const int sig_list[] = {
     SIGHUP, SIGINT, SIGQUIT, SIGPIPE, SIGALRM, SIGTERM, SIGCHLD, SIGWINCH,
     SIGVTALRM, SIGPROF, 0
 };
+#endif
 
 static void *RunThread(void *data)
 {
@@ -117,8 +121,10 @@ bool SDL_SYS_CreateThread(SDL_Thread *thread,
 
 void SDL_SYS_SetupThread(const char *name)
 {
+#ifdef HAVE_SIGNAL_H
     int i;
     sigset_t mask;
+#endif
 
     if (name) {
 #if (defined(SDL_PLATFORM_MACOS) || defined(SDL_PLATFORM_IOS) || defined(SDL_PLATFORM_LINUX)) && defined(HAVE_DLOPEN)
@@ -154,12 +160,14 @@ void SDL_SYS_SetupThread(const char *name)
 #endif
     }
 
+#ifdef HAVE_SIGNAL_H
     // Mask asynchronous signals for this thread
     sigemptyset(&mask);
     for (i = 0; sig_list[i]; ++i) {
         sigaddset(&mask, sig_list[i]);
     }
     pthread_sigmask(SIG_BLOCK, &mask, 0);
+#endif
 
 #ifdef PTHREAD_CANCEL_ASYNCHRONOUS
     // Allow ourselves to be asynchronously cancelled
diff --git a/libs/SDL3/src/thread/windows/SDL_systhread.c b/libs/SDL3/src/thread/windows/SDL_systhread.c
index aeda019ae..2dcfe8f88 100644
--- a/libs/SDL3/src/thread/windows/SDL_systhread.c
+++ b/libs/SDL3/src/thread/windows/SDL_systhread.c
@@ -32,6 +32,8 @@
 #define STACK_SIZE_PARAM_IS_A_RESERVATION 0x00010000
 #endif
 
+#define SDL_DEBUGGER_NAME_EXCEPTION_CODE 0x406D1388
+
 typedef void (__cdecl * SDL_EndThreadExCallback) (unsigned retval);
 typedef uintptr_t (__cdecl * SDL_BeginThreadExCallback)
                    (void *security, unsigned stacksize, unsigned (__stdcall *startaddr)(void *),
@@ -97,10 +99,13 @@ typedef struct tagTHREADNAME_INFO
 } THREADNAME_INFO;
 #pragma pack(pop)
 
-static LONG NTAPI EmptyVectoredExceptionHandler(EXCEPTION_POINTERS *ExceptionInfo)
+static LONG NTAPI EmptyVectoredExceptionHandler(EXCEPTION_POINTERS *info)
 {
-    (void)ExceptionInfo;
-    return EXCEPTION_CONTINUE_EXECUTION;
+    if (info != NULL && info->ExceptionRecord != NULL && info->ExceptionRecord->ExceptionCode == SDL_DEBUGGER_NAME_EXCEPTION_CODE) {
+        return EXCEPTION_CONTINUE_EXECUTION;
+    } else {
+        return EXCEPTION_CONTINUE_SEARCH;
+    }
 }
 
 typedef HRESULT(WINAPI *pfnSetThreadDescription)(HANDLE, PCWSTR);
@@ -148,7 +153,7 @@ void SDL_SYS_SetupThread(const char *name)
             inf.dwFlags = 0;
 
             // The debugger catches this, renames the thread, continues on.
-            RaiseException(0x406D1388, 0, sizeof(inf) / sizeof(ULONG), (const ULONG_PTR *)&inf);
+            RaiseException(SDL_DEBUGGER_NAME_EXCEPTION_CODE, 0, sizeof(inf) / sizeof(ULONG), (const ULONG_PTR *)&inf);
             RemoveVectoredExceptionHandler(exceptionHandlerHandle);
         }
     }
diff --git a/libs/SDL3/src/timer/SDL_timer.c b/libs/SDL3/src/timer/SDL_timer.c
index 378832c62..b47117e52 100644
--- a/libs/SDL3/src/timer/SDL_timer.c
+++ b/libs/SDL3/src/timer/SDL_timer.c
@@ -657,22 +657,78 @@ void SDL_Delay(Uint32 ms)
 }
 
 void SDL_DelayNS(Uint64 ns)
+{
+    SDL_SYS_DelayNS(ns);
+}
+
+void SDL_DelayPrecise(Uint64 ns)
 {
     Uint64 current_value = SDL_GetTicksNS();
-    Uint64 target_value = current_value + ns;
+    const Uint64 target_value = current_value + ns;
+
+    // Sleep for a short number of cycles when real sleeps are desired.
+    // We'll use 1 ms, it's the minimum guaranteed to produce real sleeps across
+    // all platforms.
+    const Uint64 SHORT_SLEEP_NS = 1 * SDL_NS_PER_MS;
+
+    // Try to sleep short of target_value. If for some crazy reason
+    // a particular platform sleeps for less than 1 ms when 1 ms was requested,
+    // that's fine, the code below can cope with that, but in practice no
+    // platforms behave that way.
+    Uint64 max_sleep_ns = SHORT_SLEEP_NS;
+    while (current_value + max_sleep_ns < target_value) {
+        // Sleep for a short time
+        SDL_SYS_DelayNS(SHORT_SLEEP_NS);
+
+        const Uint64 now = SDL_GetTicksNS();
+        const Uint64 next_sleep_ns = (now - current_value);
+        if (next_sleep_ns > max_sleep_ns) {
+            max_sleep_ns = next_sleep_ns;
+        }
+        current_value = now;
+    }
+
+    // Do a shorter sleep of the remaining time here, less the max overshoot in
+    // the first loop. Due to maintaining max_sleep_ns as
+    // greater-than-or-equal-to-1 ms, we can always subtract off 1 ms to get
+    // the duration overshot beyond a 1 ms sleep request; if the system never
+    // overshot, great, it's zero duration. By choosing the max overshoot
+    // amount, we're likely to not overshoot here. If the sleep here ends up
+    // functioning like SDL_DelayNS(0) internally, that's fine, we just don't
+    // get to do a more-precise-than-1 ms-resolution sleep to undershoot by a
+    // small amount on the current system, but SDL_DelayNS(0) does at least
+    // introduce a small, yielding delay on many platforms, better than an
+    // unyielding busyloop.
+    //
+    // Note that we'll always do at least one sleep in this function, so the
+    // minimum resolution will be that of SDL_SYS_DelayNS()
+    if (current_value < target_value && (target_value - current_value) > (max_sleep_ns - SHORT_SLEEP_NS)) {
+        const Uint64 delay_ns = (target_value - current_value) - (max_sleep_ns - SHORT_SLEEP_NS);
+        SDL_SYS_DelayNS(delay_ns);
+        current_value = SDL_GetTicksNS();
+    }
 
-    // Sleep for a short number of cycles
-    // We'll use 1 ms as a scheduling timeslice, it's a good value for modern operating systems
-    const int SCHEDULING_TIMESLICE_NS = 1 * SDL_NS_PER_MS;
+    // We've likely undershot target_value at this point by a pretty small
+    // amount, but maybe not. The footgun case if not handled here is where
+    // we've undershot by a large amount, like several ms, but still smaller
+    // than the amount max_sleep_ns overshot by; in such a situation, the above
+    // shorter-sleep block didn't do any delay, the if-block wasn't entered.
+    // Also, maybe the shorter-sleep undershot by several ms, so we still don't
+    // want to spin a lot then. In such a case, we accept the possibility of
+    // overshooting to not spin much, or if overshot here, not at all, keeping
+    // CPU/power usage down in any case. Due to scheduler sloppiness, it's
+    // entirely possible to end up undershooting/overshooting here by much less
+    // than 1 ms even if the current system's sleep function is only 1
+    // ms-resolution, as SDL_GetTicksNS() generally is better resolution than 1
+    // ms on the systems SDL supports.
+    while (current_value + SHORT_SLEEP_NS < target_value) {
+        SDL_SYS_DelayNS(SHORT_SLEEP_NS);
+        current_value = SDL_GetTicksNS();
+    }
+
+    // Spin for any remaining time
     while (current_value < target_value) {
-        Uint64 remaining_ns = (target_value - current_value);
-        if (remaining_ns > (SCHEDULING_TIMESLICE_NS + SDL_NS_PER_US)) {
-            // Sleep for a short time, less than the scheduling timeslice
-            SDL_SYS_DelayNS(SCHEDULING_TIMESLICE_NS - SDL_NS_PER_US);
-        } else {
-            // Spin for any remaining time
-            SDL_CPUPauseInstruction();
-        }
+        SDL_CPUPauseInstruction();
         current_value = SDL_GetTicksNS();
     }
 }
diff --git a/libs/SDL3/src/timer/windows/SDL_systimer.c b/libs/SDL3/src/timer/windows/SDL_systimer.c
index 087c0f3db..591dda3d7 100644
--- a/libs/SDL3/src/timer/windows/SDL_systimer.c
+++ b/libs/SDL3/src/timer/windows/SDL_systimer.c
@@ -25,13 +25,13 @@
 #include "../../core/windows/SDL_windows.h"
 
 
-#ifdef CREATE_WAITABLE_TIMER_HIGH_RESOLUTION
-static void SDL_CleanupWaitableTimer(void *timer)
+static void SDL_CleanupWaitableHandle(void *handle)
 {
-    CloseHandle(timer);
+    CloseHandle(handle);
 }
 
-HANDLE SDL_GetWaitableTimer(void)
+#ifdef CREATE_WAITABLE_TIMER_HIGH_RESOLUTION
+static HANDLE SDL_GetWaitableTimer(void)
 {
     static SDL_TLSID TLS_timer_handle;
     HANDLE timer;
@@ -40,13 +40,28 @@ HANDLE SDL_GetWaitableTimer(void)
     if (!timer) {
         timer = CreateWaitableTimerExW(NULL, NULL, CREATE_WAITABLE_TIMER_HIGH_RESOLUTION, TIMER_ALL_ACCESS);
         if (timer) {
-            SDL_SetTLS(&TLS_timer_handle, timer, SDL_CleanupWaitableTimer);
+            SDL_SetTLS(&TLS_timer_handle, timer, SDL_CleanupWaitableHandle);
         }
     }
     return timer;
 }
 #endif // CREATE_WAITABLE_TIMER_HIGH_RESOLUTION
 
+static HANDLE SDL_GetWaitableEvent(void)
+{
+    static SDL_TLSID TLS_event_handle;
+    HANDLE event;
+
+    event = SDL_GetTLS(&TLS_event_handle);
+    if (!event) {
+        event = CreateEvent(NULL, FALSE, FALSE, NULL);
+        if (event) {
+            SDL_SetTLS(&TLS_event_handle, event, SDL_CleanupWaitableHandle);
+        }
+    }
+    return event;
+}
+
 Uint64 SDL_GetPerformanceCounter(void)
 {
     LARGE_INTEGER counter;
@@ -81,22 +96,19 @@ void SDL_SYS_DelayNS(Uint64 ns)
     }
 #endif
 
-    {
-        const Uint64 max_delay = 0xffffffffLL * SDL_NS_PER_MS;
-        if (ns > max_delay) {
-            ns = max_delay;
-        }
+    const Uint64 max_delay = 0xffffffffLL * SDL_NS_PER_MS;
+    if (ns > max_delay) {
+        ns = max_delay;
+    }
+    const DWORD delay = (DWORD)SDL_NS_TO_MS(ns);
 
-#if defined(_MSC_FULL_VER) && (_MSC_FULL_VER <= 180030723)
-        static HANDLE mutex = 0;
-        if (!mutex) {
-            mutex = CreateEventEx(0, 0, 0, EVENT_ALL_ACCESS);
-        }
-        WaitForSingleObjectEx(mutex, (DWORD)SDL_NS_TO_MS(ns), FALSE);
-#else
-        Sleep((DWORD)SDL_NS_TO_MS(ns));
-#endif
+    HANDLE event = SDL_GetWaitableEvent();
+    if (event) {
+        WaitForSingleObjectEx(event, delay, FALSE);
+        return;
     }
+
+    Sleep(delay);
 }
 
 #endif // SDL_TIMER_WINDOWS
diff --git a/libs/SDL3/src/video/SDL_RLEaccel.c b/libs/SDL3/src/video/SDL_RLEaccel.c
index 23a00cdd0..0defb010b 100644
--- a/libs/SDL3/src/video/SDL_RLEaccel.c
+++ b/libs/SDL3/src/video/SDL_RLEaccel.c
@@ -1064,7 +1064,7 @@ static bool RLEAlphaSurface(SDL_Surface *surface)
         return false;
     }
     // save the destination format so we can undo the encoding later
-    *(SDL_PixelFormat *)rlebuf = df->format;
+    *(SDL_PixelFormat *)rlebuf = dest->format;
     dst = rlebuf + sizeof(SDL_PixelFormat);
 
     // Do the actual encoding
@@ -1232,6 +1232,7 @@ static const getpix_func getpixes[4] = {
 
 static bool RLEColorkeySurface(SDL_Surface *surface)
 {
+    SDL_Surface *dest;
     Uint8 *rlebuf, *dst;
     int maxn;
     int y;
@@ -1242,6 +1243,11 @@ static bool RLEColorkeySurface(SDL_Surface *surface)
     Uint32 ckey, rgbmask;
     int w, h;
 
+    dest = surface->map.info.dst_surface;
+    if (!dest) {
+        return false;
+    }
+
     // calculate the worst case size for the compressed surface
     switch (bpp) {
     case 1:
@@ -1263,15 +1269,18 @@ static bool RLEColorkeySurface(SDL_Surface *surface)
         return false;
     }
 
+    maxsize += sizeof(SDL_PixelFormat);
     rlebuf = (Uint8 *)SDL_malloc(maxsize);
     if (!rlebuf) {
         return false;
     }
+    // save the destination format so we can undo the encoding later
+    *(SDL_PixelFormat *)rlebuf = dest->format;
 
     // Set up the conversion
     srcbuf = (Uint8 *)surface->pixels;
     maxn = bpp == 4 ? 65535 : 255;
-    dst = rlebuf;
+    dst = rlebuf + sizeof(SDL_PixelFormat);
     rgbmask = ~surface->fmt->Amask;
     ckey = surface->map.info.colorkey & rgbmask;
     lastline = dst;
diff --git a/libs/SDL3/src/video/SDL_blit.h b/libs/SDL3/src/video/SDL_blit.h
index 816194d07..375446f36 100644
--- a/libs/SDL3/src/video/SDL_blit.h
+++ b/libs/SDL3/src/video/SDL_blit.h
@@ -610,6 +610,15 @@ extern SDL_BlitFunc SDL_CalculateBlitA(SDL_Surface *surface);
 #else
 #define USE_DUFFS_LOOP
 #endif
+
+#define DUFFS_LOOP1(pixel_copy_increment, width) \
+    {                                            \
+        int n;                                   \
+        for (n = width; n > 0; --n) {            \
+            pixel_copy_increment;                \
+        }                                        \
+    }
+
 #ifdef USE_DUFFS_LOOP
 
 // 8-times unrolled loop
@@ -666,8 +675,26 @@ extern SDL_BlitFunc SDL_CalculateBlitA(SDL_Surface *surface);
         }                                        \
     }
 
-// Use the 8-times version of the loop by default
+// 2-times unrolled loop
+#define DUFFS_LOOP2(pixel_copy_increment, width) \
+    {                                            \
+        int n = (width + 1) / 2;                 \
+        switch (width & 1) {                     \
+        case 0:                                  \
+            do {                                 \
+                pixel_copy_increment;            \
+                SDL_FALLTHROUGH;                 \
+            case 1:                              \
+                pixel_copy_increment;            \
+            } while (--n > 0);                   \
+        }                                        \
+    }
+
+// Use the 4-times version of the loop by default
 #define DUFFS_LOOP(pixel_copy_increment, width) \
+    DUFFS_LOOP4(pixel_copy_increment, width)
+// Use the 8-times version of the loop for simple routines
+#define DUFFS_LOOP_TRIVIAL(pixel_copy_increment, width) \
     DUFFS_LOOP8(pixel_copy_increment, width)
 
 // Special version of Duff's device for even more optimization
@@ -701,20 +728,19 @@ extern SDL_BlitFunc SDL_CalculateBlitA(SDL_Surface *surface);
 
 // Don't use Duff's device to unroll loops
 #define DUFFS_LOOP(pixel_copy_increment, width) \
-    {                                           \
-        int n;                                  \
-        for (n = width; n > 0; --n) {           \
-            pixel_copy_increment;               \
-        }                                       \
-    }
+    DUFFS_LOOP1(pixel_copy_increment, width)
+#define DUFFS_LOOP_TRIVIAL(pixel_copy_increment, width) \
+    DUFFS_LOOP1(pixel_copy_increment, width)
 #define DUFFS_LOOP8(pixel_copy_increment, width) \
-    DUFFS_LOOP(pixel_copy_increment, width)
+    DUFFS_LOOP1(pixel_copy_increment, width)
 #define DUFFS_LOOP4(pixel_copy_increment, width) \
-    DUFFS_LOOP(pixel_copy_increment, width)
+    DUFFS_LOOP1(pixel_copy_increment, width)
+#define DUFFS_LOOP2(pixel_copy_increment, width) \
+    DUFFS_LOOP1(pixel_copy_increment, width)
 #define DUFFS_LOOP_124(pixel_copy_increment1,        \
                        pixel_copy_increment2,        \
                        pixel_copy_increment4, width) \
-    DUFFS_LOOP(pixel_copy_increment1, width)
+    DUFFS_LOOP1(pixel_copy_increment1, width)
 
 #endif // USE_DUFFS_LOOP
 
diff --git a/libs/SDL3/src/video/SDL_blit_0.c b/libs/SDL3/src/video/SDL_blit_0.c
index ff3026e59..0ae78669c 100644
--- a/libs/SDL3/src/video/SDL_blit_0.c
+++ b/libs/SDL3/src/video/SDL_blit_0.c
@@ -604,11 +604,8 @@ SDL_FORCE_INLINE void BlitBto4Key(SDL_BlitInfo *info, const Uint32 srcbpp)
     }
 }
 
-SDL_FORCE_INLINE void BlitBtoNAlpha(SDL_BlitInfo *info, const Uint32 srcbpp)
+static void BlitBtoNAlpha(SDL_BlitInfo *info)
 {
-    const Uint32 mask = (1 << srcbpp) - 1;
-    const Uint32 align = (8 / srcbpp) - 1;
-
     int width = info->dst_w;
     int height = info->dst_h;
     Uint8 *src = info->src;
@@ -616,15 +613,17 @@ SDL_FORCE_INLINE void BlitBtoNAlpha(SDL_BlitInfo *info, const Uint32 srcbpp)
     int srcskip = info->src_skip;
     int dstskip = info->dst_skip;
     const SDL_Color *srcpal = info->src_pal->colors;
+    const SDL_PixelFormatDetails *srcfmt = info->src_fmt;
     const SDL_PixelFormatDetails *dstfmt = info->dst_fmt;
-    int dstbpp;
+    int srcbpp, dstbpp;
     int c;
-    Uint32 pixel;
+    Uint32 pixel, mask, align;
     unsigned sR, sG, sB;
     unsigned dR, dG, dB, dA;
     const unsigned A = info->a;
 
     // Set up some basic variables
+    srcbpp = srcfmt->bytes_per_pixel;
     dstbpp = dstfmt->bytes_per_pixel;
     if (srcbpp == 4)
         srcskip += width - (width + 1) / 2;
@@ -632,6 +631,8 @@ SDL_FORCE_INLINE void BlitBtoNAlpha(SDL_BlitInfo *info, const Uint32 srcbpp)
         srcskip += width - (width + 3) / 4;
     else if (srcbpp == 1)
         srcskip += width - (width + 7) / 8;
+    mask = (1 << srcbpp) - 1;
+    align = (8 / srcbpp) - 1;
 
     if (SDL_PIXELORDER(info->src_fmt->format) == SDL_BITMAPORDER_4321) {
         while (height--) {
@@ -680,28 +681,27 @@ SDL_FORCE_INLINE void BlitBtoNAlpha(SDL_BlitInfo *info, const Uint32 srcbpp)
     }
 }
 
-SDL_FORCE_INLINE void BlitBtoNAlphaKey(SDL_BlitInfo *info, const Uint32 srcbpp)
+static void BlitBtoNAlphaKey(SDL_BlitInfo *info)
 {
-    const Uint32 mask = (1 << srcbpp) - 1;
-    const Uint32 align = (8 / srcbpp) - 1;
-
     int width = info->dst_w;
     int height = info->dst_h;
     Uint8 *src = info->src;
     Uint8 *dst = info->dst;
     int srcskip = info->src_skip;
     int dstskip = info->dst_skip;
+    const SDL_PixelFormatDetails *srcfmt = info->src_fmt;
     const SDL_PixelFormatDetails *dstfmt = info->dst_fmt;
     const SDL_Color *srcpal = info->src_pal->colors;
-    int dstbpp;
+    int srcbpp, dstbpp;
     int c;
-    Uint32 pixel;
+    Uint32 pixel, mask, align;
     unsigned sR, sG, sB;
     unsigned dR, dG, dB, dA;
     const unsigned A = info->a;
     Uint32 ckey = info->colorkey;
 
     // Set up some basic variables
+    srcbpp = srcfmt->bytes_per_pixel;
     dstbpp = dstfmt->bytes_per_pixel;
     if (srcbpp == 4)
         srcskip += width - (width + 1) / 2;
@@ -709,6 +709,8 @@ SDL_FORCE_INLINE void BlitBtoNAlphaKey(SDL_BlitInfo *info, const Uint32 srcbpp)
         srcskip += width - (width + 3) / 4;
     else if (srcbpp == 1)
         srcskip += width - (width + 7) / 8;
+    mask = (1 << srcbpp) - 1;
+    align = (8 / srcbpp) - 1;
 
     if (SDL_PIXELORDER(info->src_fmt->format) == SDL_BITMAPORDER_4321) {
         while (height--) {
@@ -799,16 +801,6 @@ static const SDL_BlitFunc colorkey_blit_1b[] = {
     (SDL_BlitFunc)NULL, Blit1bto1Key, Blit1bto2Key, Blit1bto3Key, Blit1bto4Key
 };
 
-static void Blit1btoNAlpha(SDL_BlitInfo *info)
-{
-    BlitBtoNAlpha(info, 1);
-}
-
-static void Blit1btoNAlphaKey(SDL_BlitInfo *info)
-{
-    BlitBtoNAlphaKey(info, 1);
-}
-
 
 
 static void Blit2bto1(SDL_BlitInfo *info) {
@@ -851,16 +843,6 @@ static const SDL_BlitFunc colorkey_blit_2b[] = {
     (SDL_BlitFunc)NULL, Blit2bto1Key, Blit2bto2Key, Blit2bto3Key, Blit2bto4Key
 };
 
-static void Blit2btoNAlpha(SDL_BlitInfo *info)
-{
-    BlitBtoNAlpha(info, 2);
-}
-
-static void Blit2btoNAlphaKey(SDL_BlitInfo *info)
-{
-    BlitBtoNAlphaKey(info, 2);
-}
-
 
 
 static void Blit4bto1(SDL_BlitInfo *info) {
@@ -903,16 +885,6 @@ static const SDL_BlitFunc colorkey_blit_4b[] = {
     (SDL_BlitFunc)NULL, Blit4bto1Key, Blit4bto2Key, Blit4bto3Key, Blit4bto4Key
 };
 
-static void Blit4btoNAlpha(SDL_BlitInfo *info)
-{
-    BlitBtoNAlpha(info, 4);
-}
-
-static void Blit4btoNAlphaKey(SDL_BlitInfo *info)
-{
-    BlitBtoNAlphaKey(info, 4);
-}
-
 
 
 SDL_BlitFunc SDL_CalculateBlit0(SDL_Surface *surface)
@@ -940,10 +912,10 @@ SDL_BlitFunc SDL_CalculateBlit0(SDL_Surface *surface)
             break;
 
         case SDL_COPY_MODULATE_ALPHA | SDL_COPY_BLEND:
-            return which >= 2 ? Blit1btoNAlpha : (SDL_BlitFunc)NULL;
+            return which >= 2 ? BlitBtoNAlpha : (SDL_BlitFunc)NULL;
 
         case SDL_COPY_COLORKEY | SDL_COPY_MODULATE_ALPHA | SDL_COPY_BLEND:
-            return which >= 2 ? Blit1btoNAlphaKey : (SDL_BlitFunc)NULL;
+            return which >= 2 ? BlitBtoNAlphaKey : (SDL_BlitFunc)NULL;
         }
         return NULL;
     }
@@ -963,10 +935,10 @@ SDL_BlitFunc SDL_CalculateBlit0(SDL_Surface *surface)
             break;
 
         case SDL_COPY_MODULATE_ALPHA | SDL_COPY_BLEND:
-            return which >= 2 ? Blit2btoNAlpha : (SDL_BlitFunc)NULL;
+            return which >= 2 ? BlitBtoNAlpha : (SDL_BlitFunc)NULL;
 
         case SDL_COPY_COLORKEY | SDL_COPY_MODULATE_ALPHA | SDL_COPY_BLEND:
-            return which >= 2 ? Blit2btoNAlphaKey : (SDL_BlitFunc)NULL;
+            return which >= 2 ? BlitBtoNAlphaKey : (SDL_BlitFunc)NULL;
         }
         return NULL;
     }
@@ -986,10 +958,10 @@ SDL_BlitFunc SDL_CalculateBlit0(SDL_Surface *surface)
             break;
 
         case SDL_COPY_MODULATE_ALPHA | SDL_COPY_BLEND:
-            return which >= 2 ? Blit4btoNAlpha : (SDL_BlitFunc)NULL;
+            return which >= 2 ? BlitBtoNAlpha : (SDL_BlitFunc)NULL;
 
         case SDL_COPY_COLORKEY | SDL_COPY_MODULATE_ALPHA | SDL_COPY_BLEND:
-            return which >= 2 ? Blit4btoNAlphaKey : (SDL_BlitFunc)NULL;
+            return which >= 2 ? BlitBtoNAlphaKey : (SDL_BlitFunc)NULL;
         }
         return NULL;
     }
diff --git a/libs/SDL3/src/video/SDL_blit_1.c b/libs/SDL3/src/video/SDL_blit_1.c
index 63e7c873b..1cc0a8c02 100644
--- a/libs/SDL3/src/video/SDL_blit_1.c
+++ b/libs/SDL3/src/video/SDL_blit_1.c
@@ -48,7 +48,7 @@ static void Blit1to1(SDL_BlitInfo *info)
     while (height--) {
 #ifdef USE_DUFFS_LOOP
         /* *INDENT-OFF* */ // clang-format off
-        DUFFS_LOOP(
+        DUFFS_LOOP_TRIVIAL(
             {
               *dst = map[*src];
             }
@@ -100,7 +100,7 @@ static void Blit1to2(SDL_BlitInfo *info)
 #ifdef USE_DUFFS_LOOP
     while (height--) {
         /* *INDENT-OFF* */ // clang-format off
-        DUFFS_LOOP(
+        DUFFS_LOOP_TRIVIAL(
         {
             *(Uint16 *)dst = map[*src++];
             dst += 2;
@@ -256,7 +256,7 @@ static void Blit1to4(SDL_BlitInfo *info)
     while (height--) {
 #ifdef USE_DUFFS_LOOP
         /* *INDENT-OFF* */ // clang-format off
-        DUFFS_LOOP(
+        DUFFS_LOOP_TRIVIAL(
             *dst++ = map[*src++];
         , width);
         /* *INDENT-ON* */ // clang-format on
@@ -297,7 +297,7 @@ static void Blit1to1Key(SDL_BlitInfo *info)
     if (palmap) {
         while (height--) {
             /* *INDENT-OFF* */ // clang-format off
-            DUFFS_LOOP(
+            DUFFS_LOOP_TRIVIAL(
             {
                 if ( *src != ckey ) {
                   *dst = palmap[*src];
@@ -313,7 +313,7 @@ static void Blit1to1Key(SDL_BlitInfo *info)
     } else {
         while (height--) {
             /* *INDENT-OFF* */ // clang-format off
-            DUFFS_LOOP(
+            DUFFS_LOOP_TRIVIAL(
             {
                 if ( *src != ckey ) {
                   *dst = *src;
@@ -345,7 +345,7 @@ static void Blit1to2Key(SDL_BlitInfo *info)
 
     while (height--) {
         /* *INDENT-OFF* */ // clang-format off
-        DUFFS_LOOP(
+        DUFFS_LOOP_TRIVIAL(
         {
             if ( *src != ckey ) {
                 *dstp=palmap[*src];
@@ -408,7 +408,7 @@ static void Blit1to4Key(SDL_BlitInfo *info)
 
     while (height--) {
         /* *INDENT-OFF* */ // clang-format off
-        DUFFS_LOOP(
+        DUFFS_LOOP_TRIVIAL(
         {
             if ( *src != ckey ) {
                 *dstp = palmap[*src];
@@ -444,7 +444,7 @@ static void Blit1toNAlpha(SDL_BlitInfo *info)
 
     while (height--) {
         /* *INDENT-OFF* */ // clang-format off
-        DUFFS_LOOP4(
+        DUFFS_LOOP(
         {
             sR = srcpal[*src].r;
             sG = srcpal[*src].g;
diff --git a/libs/SDL3/src/video/SDL_blit_A.c b/libs/SDL3/src/video/SDL_blit_A.c
index f39ff8038..403c482e7 100644
--- a/libs/SDL3/src/video/SDL_blit_A.c
+++ b/libs/SDL3/src/video/SDL_blit_A.c
@@ -46,7 +46,7 @@ static void BlitNto1SurfaceAlpha(SDL_BlitInfo *info)
 
     while (height--) {
         /* *INDENT-OFF* */ // clang-format off
-        DUFFS_LOOP4(
+        DUFFS_LOOP(
         {
         DISEMBLE_RGB(src, srcbpp, srcfmt, Pixel, sR, sG, sB);
         dR = dstpal[*dst].r;
@@ -91,7 +91,7 @@ static void BlitNto1PixelAlpha(SDL_BlitInfo *info)
 
     while (height--) {
         /* *INDENT-OFF* */ // clang-format off
-        DUFFS_LOOP4(
+        DUFFS_LOOP(
         {
         DISEMBLE_RGBA(src,srcbpp,srcfmt,Pixel,sR,sG,sB,sA);
         dR = dstpal[*dst].r;
@@ -253,7 +253,7 @@ static void BlitRGBtoRGBSurfaceAlpha128(SDL_BlitInfo *info)
 
     while (height--) {
         /* *INDENT-OFF* */ // clang-format off
-        DUFFS_LOOP4({
+        DUFFS_LOOP({
             Uint32 s = *srcp++;
             Uint32 d = *dstp;
             *dstp++ = ((((s & 0x00fefefe) + (d & 0x00fefefe)) >> 1)
@@ -283,7 +283,7 @@ static void BlitRGBtoRGBSurfaceAlpha(SDL_BlitInfo *info)
 
         while (height--) {
             /* *INDENT-OFF* */ // clang-format off
-            DUFFS_LOOP4({
+            DUFFS_LOOP({
                 s = *srcp;
                 d = *dstp;
 
@@ -705,7 +705,7 @@ static void Blit565to565SurfaceAlpha(SDL_BlitInfo *info)
 
         while (height--) {
             /* *INDENT-OFF* */ // clang-format off
-            DUFFS_LOOP4({
+            DUFFS_LOOP({
                 Uint32 s = *srcp++;
                 Uint32 d = *dstp;
                 /*
@@ -743,7 +743,7 @@ static void Blit555to555SurfaceAlpha(SDL_BlitInfo *info)
 
         while (height--) {
             /* *INDENT-OFF* */ // clang-format off
-            DUFFS_LOOP4({
+            DUFFS_LOOP({
                 Uint32 s = *srcp++;
                 Uint32 d = *dstp;
                 /*
@@ -776,7 +776,7 @@ static void BlitARGBto565PixelAlpha(SDL_BlitInfo *info)
 
     while (height--) {
         /* *INDENT-OFF* */ // clang-format off
-        DUFFS_LOOP4({
+        DUFFS_LOOP({
         Uint32 s = *srcp;
         unsigned alpha = s >> 27; // downscale alpha to 5 bits
         /* Here we special-case opaque alpha since the
@@ -819,7 +819,7 @@ static void BlitARGBto555PixelAlpha(SDL_BlitInfo *info)
 
     while (height--) {
         /* *INDENT-OFF* */ // clang-format off
-        DUFFS_LOOP4({
+        DUFFS_LOOP({
         unsigned alpha;
         Uint32 s = *srcp;
         alpha = s >> 27; // downscale alpha to 5 bits
@@ -872,7 +872,7 @@ static void BlitNtoNSurfaceAlpha(SDL_BlitInfo *info)
     if (sA) {
         while (height--) {
             /* *INDENT-OFF* */ // clang-format off
-        DUFFS_LOOP4(
+        DUFFS_LOOP(
         {
         DISEMBLE_RGB(src, srcbpp, srcfmt, Pixel, sR, sG, sB);
         DISEMBLE_RGBA(dst, dstbpp, dstfmt, Pixel, dR, dG, dB, dA);
@@ -910,7 +910,7 @@ static void BlitNtoNSurfaceAlphaKey(SDL_BlitInfo *info)
 
     while (height--) {
         /* *INDENT-OFF* */ // clang-format off
-        DUFFS_LOOP4(
+        DUFFS_LOOP(
         {
         RETRIEVE_RGB_PIXEL(src, srcbpp, Pixel);
         if (sA && Pixel != ckey) {
@@ -1302,7 +1302,7 @@ static void BlitNtoNPixelAlpha(SDL_BlitInfo *info)
     dstbpp = dstfmt->bytes_per_pixel;
 
     while (height--) {
-        DUFFS_LOOP4(
+        DUFFS_LOOP(
         {
         DISEMBLE_RGBA(src, srcbpp, srcfmt, Pixel, sR, sG, sB, sA);
         if (sA) {
diff --git a/libs/SDL3/src/video/SDL_blit_N.c b/libs/SDL3/src/video/SDL_blit_N.c
index bb7012cec..652a90662 100644
--- a/libs/SDL3/src/video/SDL_blit_N.c
+++ b/libs/SDL3/src/video/SDL_blit_N.c
@@ -40,7 +40,6 @@
 #define BLIT_FEATURE_HAS_MMX                    0x01
 #define BLIT_FEATURE_HAS_ALTIVEC                0x02
 #define BLIT_FEATURE_ALTIVEC_DONT_USE_PREFETCH  0x04
-#define BLIT_FEATURE_HAS_ARM_SIMD               0x08
 
 #ifdef SDL_ALTIVEC_BLITTERS
 #ifdef SDL_PLATFORM_MACOS
@@ -891,37 +890,7 @@ static Uint32 GetBlitFeatures(void)
 #endif
 #else
 // Feature 1 is has-MMX
-#define GetBlitFeatures() ((SDL_HasMMX() ? BLIT_FEATURE_HAS_MMX : 0) | (SDL_HasARMSIMD() ? BLIT_FEATURE_HAS_ARM_SIMD : 0))
-#endif
-
-#ifdef SDL_ARM_SIMD_BLITTERS
-void Blit_XBGR8888_XRGB8888ARMSIMDAsm(int32_t w, int32_t h, uint32_t *dst, int32_t dst_stride, uint32_t *src, int32_t src_stride);
-
-static void Blit_XBGR8888_XRGB8888ARMSIMD(SDL_BlitInfo *info)
-{
-    int32_t width = info->dst_w;
-    int32_t height = info->dst_h;
-    uint32_t *dstp = (uint32_t *)info->dst;
-    int32_t dststride = width + (info->dst_skip >> 2);
-    uint32_t *srcp = (uint32_t *)info->src;
-    int32_t srcstride = width + (info->src_skip >> 2);
-
-    Blit_XBGR8888_XRGB8888ARMSIMDAsm(width, height, dstp, dststride, srcp, srcstride);
-}
-
-void Blit_RGB444_XRGB8888ARMSIMDAsm(int32_t w, int32_t h, uint32_t *dst, int32_t dst_stride, uint16_t *src, int32_t src_stride);
-
-static void Blit_RGB444_XRGB8888ARMSIMD(SDL_BlitInfo *info)
-{
-    int32_t width = info->dst_w;
-    int32_t height = info->dst_h;
-    uint32_t *dstp = (uint32_t *)info->dst;
-    int32_t dststride = width + (info->dst_skip >> 2);
-    uint16_t *srcp = (uint16_t *)info->src;
-    int32_t srcstride = width + (info->src_skip >> 1);
-
-    Blit_RGB444_XRGB8888ARMSIMDAsm(width, height, dstp, dststride, srcp, srcstride);
-}
+#define GetBlitFeatures() ((SDL_HasMMX() ? BLIT_FEATURE_HAS_MMX : 0))
 #endif
 
 // This is now endian dependent
@@ -1831,7 +1800,7 @@ static void Blit_RGB555_ARGB1555(SDL_BlitInfo *info)
 
     while (height--) {
         /* *INDENT-OFF* */ // clang-format off
-        DUFFS_LOOP(
+        DUFFS_LOOP_TRIVIAL(
         {
             *dst = *src | mask;
             ++dst;
@@ -1862,7 +1831,7 @@ static void Blit4to4MaskAlpha(SDL_BlitInfo *info)
 
         while (height--) {
             /* *INDENT-OFF* */ // clang-format off
-            DUFFS_LOOP(
+            DUFFS_LOOP_TRIVIAL(
             {
                 *dst = *src | mask;
                 ++dst;
@@ -1879,7 +1848,7 @@ static void Blit4to4MaskAlpha(SDL_BlitInfo *info)
 
         while (height--) {
             /* *INDENT-OFF* */ // clang-format off
-            DUFFS_LOOP(
+            DUFFS_LOOP_TRIVIAL(
             {
                 *dst = *src & mask;
                 ++dst;
@@ -2173,7 +2142,7 @@ static void Blit2to2Key(SDL_BlitInfo *info)
 
     while (height--) {
         /* *INDENT-OFF* */ // clang-format off
-        DUFFS_LOOP(
+        DUFFS_LOOP_TRIVIAL(
         {
             if ( (*srcp & rgbmask) != ckey ) {
                 *dstp = *srcp;
@@ -2219,7 +2188,7 @@ static void BlitNtoNKey(SDL_BlitInfo *info)
             Uint32 mask = ((Uint32)info->a) << dstfmt->Ashift;
             while (height--) {
                 /* *INDENT-OFF* */ // clang-format off
-                DUFFS_LOOP(
+                DUFFS_LOOP_TRIVIAL(
                 {
                     if ((*src32 & rgbmask) != ckey) {
                         *dst32 = *src32 | mask;
@@ -2237,7 +2206,7 @@ static void BlitNtoNKey(SDL_BlitInfo *info)
             Uint32 mask = srcfmt->Rmask | srcfmt->Gmask | srcfmt->Bmask;
             while (height--) {
                 /* *INDENT-OFF* */ // clang-format off
-                DUFFS_LOOP(
+                DUFFS_LOOP_TRIVIAL(
                 {
                     if ((*src32 & rgbmask) != ckey) {
                         *dst32 = *src32 & mask;
@@ -2494,7 +2463,7 @@ static void BlitNtoNKeyCopyAlpha(SDL_BlitInfo *info)
             Uint32 *dst32 = (Uint32 *)dst;
             while (height--) {
                 /* *INDENT-OFF* */ // clang-format off
-                DUFFS_LOOP(
+                DUFFS_LOOP_TRIVIAL(
                 {
                     if ((*src32 & rgbmask) != ckey) {
                         *dst32 = *src32;
@@ -2825,10 +2794,6 @@ static const struct blit_table normal_blit_2[] = {
     { 0x00007C00, 0x000003E0, 0x0000001F, 4, 0x00000000, 0x00000000, 0x00000000,
       BLIT_FEATURE_HAS_ALTIVEC, Blit_RGB555_32Altivec, NO_ALPHA | COPY_ALPHA | SET_ALPHA },
 #endif
-#ifdef SDL_ARM_SIMD_BLITTERS
-    { 0x00000F00, 0x000000F0, 0x0000000F, 4, 0x00FF0000, 0x0000FF00, 0x000000FF,
-      BLIT_FEATURE_HAS_ARM_SIMD, Blit_RGB444_XRGB8888ARMSIMD, NO_ALPHA | COPY_ALPHA },
-#endif
 #if SDL_HAVE_BLIT_N_RGB565
     { 0x0000F800, 0x000007E0, 0x0000001F, 4, 0x00FF0000, 0x0000FF00, 0x000000FF,
       0, Blit_RGB565_ARGB8888, NO_ALPHA | COPY_ALPHA | SET_ALPHA },
@@ -2895,10 +2860,6 @@ static const struct blit_table normal_blit_4[] = {
     // has-altivec
     { 0x00000000, 0x00000000, 0x00000000, 2, 0x0000F800, 0x000007E0, 0x0000001F,
       BLIT_FEATURE_HAS_ALTIVEC, Blit_XRGB8888_RGB565Altivec, NO_ALPHA },
-#endif
-#ifdef SDL_ARM_SIMD_BLITTERS
-    { 0x000000FF, 0x0000FF00, 0x00FF0000, 4, 0x00FF0000, 0x0000FF00, 0x000000FF,
-      BLIT_FEATURE_HAS_ARM_SIMD, Blit_XBGR8888_XRGB8888ARMSIMD, NO_ALPHA | COPY_ALPHA },
 #endif
     // 4->3 with same rgb triplet
     { 0x000000FF, 0x0000FF00, 0x00FF0000, 3, 0x000000FF, 0x0000FF00, 0x00FF0000,
diff --git a/libs/SDL3/src/video/SDL_bmp.c b/libs/SDL3/src/video/SDL_bmp.c
index 053f22c11..ebead13bd 100644
--- a/libs/SDL3/src/video/SDL_bmp.c
+++ b/libs/SDL3/src/video/SDL_bmp.c
@@ -589,7 +589,11 @@ SDL_Surface *SDL_LoadBMP_IO(SDL_IOStream *src, bool closeio)
 
 SDL_Surface *SDL_LoadBMP(const char *file)
 {
-    return SDL_LoadBMP_IO(SDL_IOFromFile(file, "rb"), 1);
+    SDL_IOStream *stream = SDL_IOFromFile(file, "rb");
+    if (!stream) {
+        return NULL;
+    }
+    return SDL_LoadBMP_IO(stream, true);
 }
 
 bool SDL_SaveBMP_IO(SDL_Surface *surface, SDL_IOStream *dst, bool closeio)
@@ -597,7 +601,7 @@ bool SDL_SaveBMP_IO(SDL_Surface *surface, SDL_IOStream *dst, bool closeio)
     bool was_error = true;
     Sint64 fp_offset, new_offset;
     int i, pad;
-    SDL_Surface *intermediate_surface;
+    SDL_Surface *intermediate_surface = NULL;
     Uint8 *bits;
     bool save32bit = false;
     bool saveLegacyBMP = false;
@@ -634,63 +638,60 @@ bool SDL_SaveBMP_IO(SDL_Surface *surface, SDL_IOStream *dst, bool closeio)
     Uint32 bV4GammaBlue = 0;
 
     // Make sure we have somewhere to save
-    intermediate_surface = NULL;
-    if (dst) {
-        if (!SDL_SurfaceValid(surface)) {
-            SDL_InvalidParamError("surface");
-            goto done;
-        }
+    if (!SDL_SurfaceValid(surface)) {
+        SDL_InvalidParamError("surface");
+        goto done;
+    }
+    if (!dst) {
+        SDL_InvalidParamError("dst");
+        goto done;
+    }
 
 #ifdef SAVE_32BIT_BMP
-        // We can save alpha information in a 32-bit BMP
-        if (SDL_BITSPERPIXEL(surface->format) >= 8 &&
-            (SDL_ISPIXELFORMAT_ALPHA(surface->format) ||
-             surface->map.info.flags & SDL_COPY_COLORKEY)) {
-            save32bit = true;
-        }
+    // We can save alpha information in a 32-bit BMP
+    if (SDL_BITSPERPIXEL(surface->format) >= 8 &&
+        (SDL_ISPIXELFORMAT_ALPHA(surface->format) ||
+         surface->map.info.flags & SDL_COPY_COLORKEY)) {
+        save32bit = true;
+    }
 #endif // SAVE_32BIT_BMP
 
-        if (surface->palette && !save32bit) {
-            if (SDL_BITSPERPIXEL(surface->format) == 8) {
-                intermediate_surface = surface;
-            } else {
-                SDL_SetError("%u bpp BMP files not supported",
-                             SDL_BITSPERPIXEL(surface->format));
-                goto done;
-            }
-        } else if ((SDL_BITSPERPIXEL(surface->format) == 24) && !save32bit &&
+    if (surface->palette && !save32bit) {
+        if (SDL_BITSPERPIXEL(surface->format) == 8) {
+            intermediate_surface = surface;
+        } else {
+            SDL_SetError("%u bpp BMP files not supported",
+                         SDL_BITSPERPIXEL(surface->format));
+            goto done;
+        }
+    } else if ((SDL_BITSPERPIXEL(surface->format) == 24) && !save32bit &&
 #if SDL_BYTEORDER == SDL_LIL_ENDIAN
-                   (surface->fmt->Rmask == 0x00FF0000) &&
-                   (surface->fmt->Gmask == 0x0000FF00) &&
-                   (surface->fmt->Bmask == 0x000000FF)
+               (surface->fmt->Rmask == 0x00FF0000) &&
+               (surface->fmt->Gmask == 0x0000FF00) &&
+               (surface->fmt->Bmask == 0x000000FF)
 #else
-                   (surface->fmt->Rmask == 0x000000FF) &&
-                   (surface->fmt->Gmask == 0x0000FF00) &&
-                   (surface->fmt->Bmask == 0x00FF0000)
+               (surface->fmt->Rmask == 0x000000FF) &&
+               (surface->fmt->Gmask == 0x0000FF00) &&
+               (surface->fmt->Bmask == 0x00FF0000)
 #endif
-        ) {
-            intermediate_surface = surface;
-        } else {
-            SDL_PixelFormat pixel_format;
+    ) {
+        intermediate_surface = surface;
+    } else {
+        SDL_PixelFormat pixel_format;
 
-            /* If the surface has a colorkey or alpha channel we'll save a
-               32-bit BMP with alpha channel, otherwise save a 24-bit BMP. */
-            if (save32bit) {
-                pixel_format = SDL_PIXELFORMAT_BGRA32;
-            } else {
-                pixel_format = SDL_PIXELFORMAT_BGR24;
-            }
-            intermediate_surface = SDL_ConvertSurface(surface, pixel_format);
-            if (!intermediate_surface) {
-                SDL_SetError("Couldn't convert image to %d bpp",
-                             (int)SDL_BITSPERPIXEL(pixel_format));
-                goto done;
-            }
+        /* If the surface has a colorkey or alpha channel we'll save a
+           32-bit BMP with alpha channel, otherwise save a 24-bit BMP. */
+        if (save32bit) {
+            pixel_format = SDL_PIXELFORMAT_BGRA32;
+        } else {
+            pixel_format = SDL_PIXELFORMAT_BGR24;
+        }
+        intermediate_surface = SDL_ConvertSurface(surface, pixel_format);
+        if (!intermediate_surface) {
+            SDL_SetError("Couldn't convert image to %d bpp",
+                         (int)SDL_BITSPERPIXEL(pixel_format));
+            goto done;
         }
-    } else {
-        /* Set no error here because it may overwrite a more useful message from
-           SDL_IOFromFile() if SDL_SaveBMP_IO() is called from SDL_SaveBMP(). */
-        goto done;
     }
 
     if (save32bit) {
@@ -873,5 +874,9 @@ bool SDL_SaveBMP_IO(SDL_Surface *surface, SDL_IOStream *dst, bool closeio)
 
 bool SDL_SaveBMP(SDL_Surface *surface, const char *file)
 {
-    return SDL_SaveBMP_IO(surface, SDL_IOFromFile(file, "wb"), true);
+    SDL_IOStream *stream = SDL_IOFromFile(file, "wb");
+    if (!stream) {
+        return false;
+    }
+    return SDL_SaveBMP_IO(surface, stream, true);
 }
diff --git a/libs/SDL3/src/video/SDL_clipboard.c b/libs/SDL3/src/video/SDL_clipboard.c
index 9d663980b..934936735 100644
--- a/libs/SDL3/src/video/SDL_clipboard.c
+++ b/libs/SDL3/src/video/SDL_clipboard.c
@@ -196,9 +196,13 @@ void *SDL_GetClipboardData(const char *mime_type, size_t *size)
         return _this->GetClipboardData(_this, mime_type, size);
     } else if (_this->GetClipboardText && SDL_IsTextMimeType(mime_type)) {
         char *text = _this->GetClipboardText(_this);
-        if (text && *text == '\0') {
-            SDL_free(text);
-            text = NULL;
+        if (text) {
+            if (*text == '\0') {
+                SDL_free(text);
+                text = NULL;
+            } else {
+                *size = SDL_strlen(text);
+            }
         }
         return text;
     } else {
diff --git a/libs/SDL3/src/video/SDL_egl.c b/libs/SDL3/src/video/SDL_egl.c
index 4caf2db5b..703984d00 100644
--- a/libs/SDL3/src/video/SDL_egl.c
+++ b/libs/SDL3/src/video/SDL_egl.c
@@ -300,7 +300,9 @@ void SDL_EGL_UnloadLibrary(SDL_VideoDevice *_this)
 static bool SDL_EGL_LoadLibraryInternal(SDL_VideoDevice *_this, const char *egl_path)
 {
     SDL_SharedObject *egl_dll_handle = NULL;
+#if !defined(SDL_VIDEO_STATIC_ANGLE) && !defined(SDL_VIDEO_DRIVER_VITA)
     SDL_SharedObject *opengl_dll_handle = NULL;
+#endif
     const char *path = NULL;
 #if defined(SDL_VIDEO_DRIVER_WINDOWS)
     const char *d3dcompiler;
@@ -426,9 +428,6 @@ static bool SDL_EGL_LoadLibraryInternal(SDL_VideoDevice *_this, const char *egl_
 #endif
 
     _this->egl_data->egl_dll_handle = egl_dll_handle;
-#ifdef SDL_VIDEO_DRIVER_VITA
-    _this->egl_data->opengl_dll_handle = opengl_dll_handle;
-#endif
 
     // Load new function pointers
     LOAD_FUNC(PFNEGLGETDISPLAYPROC, eglGetDisplay);
diff --git a/libs/SDL3/src/video/SDL_pixels.c b/libs/SDL3/src/video/SDL_pixels.c
index 2a3735ff4..6f3adf64e 100644
--- a/libs/SDL3/src/video/SDL_pixels.c
+++ b/libs/SDL3/src/video/SDL_pixels.c
@@ -772,9 +772,9 @@ static const float mat_BT601_Limited_8bit[] = {
 
 static const float mat_BT601_Full_8bit[] = {
     0.0f, -0.501960814f, -0.501960814f, 0.0f,           // offset
-    1.0000f, 0.0000f, 1.4020f, 0.0f,                    // Rcoeff
-    1.0000f, -0.3441f, -0.7141f, 0.0f,                  // Gcoeff
-    1.0000f, 1.7720f, 0.0000f, 0.0f,                    // Bcoeff
+    1.0000f, 0.0000f, 1.4075f, 0.0f,                    // Rcoeff
+    1.0000f, -0.3455f, -0.7169f, 0.0f,                  // Gcoeff
+    1.0000f, 1.7790f, 0.0000f, 0.0f,                    // Bcoeff
 };
 
 static const float mat_BT709_Limited_8bit[] = {
@@ -786,9 +786,9 @@ static const float mat_BT709_Limited_8bit[] = {
 
 static const float mat_BT709_Full_8bit[] = {
     0.0f, -0.501960814f, -0.501960814f, 0.0f,           // offset
-    1.0000f, 0.0000f, 1.5748f, 0.0f,                    // Rcoeff
-    1.0000f, -0.1873f, -0.4681f, 0.0f,                  // Gcoeff
-    1.0000f, 1.8556f, 0.0000f, 0.0f,                    // Bcoeff
+    1.0000f, 0.0000f, 1.5810f, 0.0f,                    // Rcoeff
+    1.0000f, -0.1881f, -0.4700f, 0.0f,                  // Gcoeff
+    1.0000f, 1.8629f, 0.0000f, 0.0f,                    // Bcoeff
 };
 
 static const float mat_BT2020_Limited_10bit[] = {
diff --git a/libs/SDL3/src/video/SDL_rect_impl.h b/libs/SDL3/src/video/SDL_rect_impl.h
index 8ed8f84e6..46d56ea06 100644
--- a/libs/SDL3/src/video/SDL_rect_impl.h
+++ b/libs/SDL3/src/video/SDL_rect_impl.h
@@ -297,12 +297,12 @@ static int COMPUTEOUTCODE(const RECTTYPE *rect, SCALARTYPE x, SCALARTYPE y)
     int code = 0;
     if (y < rect->y) {
         code |= CODE_TOP;
-    } else if (y >= rect->y + rect->h) {
+    } else if (y > (rect->y + rect->h - ENCLOSEPOINTS_EPSILON)) {
         code |= CODE_BOTTOM;
     }
     if (x < rect->x) {
         code |= CODE_LEFT;
-    } else if (x >= rect->x + rect->w) {
+    } else if (x > (rect->x + rect->w - ENCLOSEPOINTS_EPSILON)) {
         code |= CODE_RIGHT;
     }
     return code;
diff --git a/libs/SDL3/src/video/SDL_surface.c b/libs/SDL3/src/video/SDL_surface.c
index 40847e390..657d7f462 100644
--- a/libs/SDL3/src/video/SDL_surface.c
+++ b/libs/SDL3/src/video/SDL_surface.c
@@ -1786,6 +1786,9 @@ static bool SDL_FlipSurfaceHorizontal(SDL_Surface *surface)
     bpp = SDL_BYTESPERPIXEL(surface->format);
     row = (Uint8 *)surface->pixels;
     tmp = SDL_small_alloc(Uint8, surface->pitch, &isstack);
+    if (!tmp) {
+        return false;
+    }
     for (i = surface->h; i--; ) {
         a = row;
         b = a + (surface->w - 1) * bpp;
@@ -1815,6 +1818,9 @@ static bool SDL_FlipSurfaceVertical(SDL_Surface *surface)
     a = (Uint8 *)surface->pixels;
     b = a + (surface->h - 1) * surface->pitch;
     tmp = SDL_small_alloc(Uint8, surface->pitch, &isstack);
+    if (!tmp) {
+        return false;
+    }
     for (i = surface->h / 2; i--; ) {
         SDL_memcpy(tmp, a, surface->pitch);
         SDL_memcpy(a, b, surface->pitch);
diff --git a/libs/SDL3/src/video/SDL_sysvideo.h b/libs/SDL3/src/video/SDL_sysvideo.h
index db53fe6e0..bd8c56982 100644
--- a/libs/SDL3/src/video/SDL_sysvideo.h
+++ b/libs/SDL3/src/video/SDL_sysvideo.h
@@ -498,6 +498,7 @@ typedef struct VideoBootStrap
 } VideoBootStrap;
 
 // Not all of these are available in a given build. Use #ifdefs, etc.
+extern VideoBootStrap PRIVATE_bootstrap;
 extern VideoBootStrap COCOA_bootstrap;
 extern VideoBootStrap X11_bootstrap;
 extern VideoBootStrap WINDOWS_bootstrap;
diff --git a/libs/SDL3/src/video/SDL_video.c b/libs/SDL3/src/video/SDL_video.c
index a0a147cae..c0687fb4c 100644
--- a/libs/SDL3/src/video/SDL_video.c
+++ b/libs/SDL3/src/video/SDL_video.c
@@ -59,6 +59,10 @@
 #include <emscripten.h>
 #endif
 
+#ifdef SDL_PLATFORM_3DS
+#include <3ds.h>
+#endif
+
 #ifdef SDL_PLATFORM_LINUX
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -67,6 +71,9 @@
 
 // Available video drivers
 static VideoBootStrap *bootstrap[] = {
+#ifdef SDL_VIDEO_DRIVER_PRIVATE
+    &PRIVATE_bootstrap,
+#endif
 #ifdef SDL_VIDEO_DRIVER_COCOA
     &COCOA_bootstrap,
 #endif
@@ -258,7 +265,7 @@ typedef struct
 
 static Uint32 SDL_DefaultGraphicsBackends(SDL_VideoDevice *_this)
 {
-#if (defined(SDL_VIDEO_OPENGL) && defined(SDL_PLATFORM_MACOS)) || (defined(SDL_PLATFORM_IOS) && !TARGET_OS_MACCATALYST) || defined(SDL_PLATFORM_ANDROID)
+#if (defined(SDL_VIDEO_OPENGL) && defined(SDL_PLATFORM_MACOS)) || (defined(SDL_PLATFORM_IOS) && !TARGET_OS_MACCATALYST)
     if (_this->GL_CreateContext) {
         return SDL_WINDOW_OPENGL;
     }
@@ -5518,6 +5525,23 @@ bool SDL_ShowSimpleMessageBox(SDL_MessageBoxFlags flags, const char *title, cons
     },
             title, message);
     return true;
+#elif defined(SDL_PLATFORM_3DS)
+    errorConf errCnf;
+    bool hasGpuRight;
+
+    // If the video subsystem has not been initialised, set up graphics temporarily
+    hasGpuRight = gspHasGpuRight();
+    if (!hasGpuRight)
+        gfxInitDefault();
+
+    errorInit(&errCnf, ERROR_TEXT_WORD_WRAP, CFG_LANGUAGE_EN);
+    errorText(&errCnf, message);
+    errorDisp(&errCnf);
+
+    if (!hasGpuRight)
+        gfxExit();
+
+    return true;
 #else
     SDL_MessageBoxData data;
     SDL_MessageBoxButtonData button;
diff --git a/libs/SDL3/src/video/SDL_yuv.c b/libs/SDL3/src/video/SDL_yuv.c
index 81ace699a..6c7ab1cd7 100644
--- a/libs/SDL3/src/video/SDL_yuv.c
+++ b/libs/SDL3/src/video/SDL_yuv.c
@@ -171,8 +171,10 @@ static bool GetYUVConversionType(SDL_Colorspace colorspace, YCbCrType *yuv_type)
     if (SDL_ISCOLORSPACE_MATRIX_BT709(colorspace)) {
         if (SDL_ISCOLORSPACE_LIMITED_RANGE(colorspace)) {
             *yuv_type = YCBCR_709_LIMITED;
-            return true;
+        } else {
+            *yuv_type = YCBCR_709_FULL;
         }
+        return true;
     }
 
     if (SDL_ISCOLORSPACE_MATRIX_BT2020_NCL(colorspace)) {
@@ -691,6 +693,13 @@ static struct RGB2YUVFactors RGB2YUVFactorTables[] = {
         { -0.1482f, -0.2910f, 0.4392f },
         { 0.4392f, -0.3678f, -0.0714f },
     },
+    // ITU-R BT.709-6 full range
+    {
+        0,
+        { 0.2126f, 0.7152f, 0.0722f },
+        { -0.1141f, -0.3839f, 0.498f },
+        { 0.498f, -0.4524f, -0.0457f },
+    },
     // ITU-R BT.709-6
     {
         16,
@@ -707,7 +716,7 @@ static struct RGB2YUVFactors RGB2YUVFactorTables[] = {
     },
 };
 
-static bool SDL_ConvertPixels_ARGB8888_to_YUV(int width, int height, const void *src, int src_pitch, SDL_PixelFormat dst_format, void *dst, int dst_pitch, YCbCrType yuv_type)
+static bool SDL_ConvertPixels_XRGB8888_to_YUV(int width, int height, const void *src, int src_pitch, SDL_PixelFormat dst_format, void *dst, int dst_pitch, YCbCrType yuv_type)
 {
     const int src_pitch_x_2 = src_pitch * 2;
     const int height_half = height / 2;
@@ -718,9 +727,9 @@ static bool SDL_ConvertPixels_ARGB8888_to_YUV(int width, int height, const void
 
     const struct RGB2YUVFactors *cvt = &RGB2YUVFactorTables[yuv_type];
 
-#define MAKE_Y(r, g, b) (Uint8)((int)(cvt->y[0] * (r) + cvt->y[1] * (g) + cvt->y[2] * (b) + 0.5f) + cvt->y_offset)
-#define MAKE_U(r, g, b) (Uint8)((int)(cvt->u[0] * (r) + cvt->u[1] * (g) + cvt->u[2] * (b) + 0.5f) + 128)
-#define MAKE_V(r, g, b) (Uint8)((int)(cvt->v[0] * (r) + cvt->v[1] * (g) + cvt->v[2] * (b) + 0.5f) + 128)
+#define MAKE_Y(r, g, b) (Uint8)SDL_clamp(((int)(cvt->y[0] * (r) + cvt->y[1] * (g) + cvt->y[2] * (b) + 0.5f) + cvt->y_offset), 0, 255)
+#define MAKE_U(r, g, b) (Uint8)SDL_clamp(((int)(cvt->u[0] * (r) + cvt->u[1] * (g) + cvt->u[2] * (b) + 0.5f) + 128), 0, 255)
+#define MAKE_V(r, g, b) (Uint8)SDL_clamp(((int)(cvt->v[0] * (r) + cvt->v[1] * (g) + cvt->v[2] * (b) + 0.5f) + 128), 0, 255)
 
 #define READ_2x2_PIXELS                                                                                     \
     const Uint32 p1 = ((const Uint32 *)curr_row)[2 * i];                                                    \
@@ -1149,9 +1158,9 @@ bool SDL_ConvertPixels_RGB_to_YUV(int width, int height,
 #endif
 
     // ARGB8888 to FOURCC
-    if (src_format == SDL_PIXELFORMAT_ARGB8888 &&
+    if ((src_format == SDL_PIXELFORMAT_ARGB8888 || src_format == SDL_PIXELFORMAT_XRGB8888) &&
         SDL_COLORSPACEPRIMARIES(src_colorspace) == SDL_COLORSPACEPRIMARIES(dst_colorspace)) {
-        return SDL_ConvertPixels_ARGB8888_to_YUV(width, height, src, src_pitch, dst_format, dst, dst_pitch, yuv_type);
+        return SDL_ConvertPixels_XRGB8888_to_YUV(width, height, src, src_pitch, dst_format, dst, dst_pitch, yuv_type);
     }
 
     if (dst_format == SDL_PIXELFORMAT_P010) {
@@ -1194,15 +1203,15 @@ bool SDL_ConvertPixels_RGB_to_YUV(int width, int height,
             return false;
         }
 
-        // convert src/src_format to tmp/ARGB8888
-        result = SDL_ConvertPixelsAndColorspace(width, height, src_format, src_colorspace, src_properties, src, src_pitch, SDL_PIXELFORMAT_ARGB8888, dst_colorspace, dst_properties, tmp, tmp_pitch);
+        // convert src/src_format to tmp/XRGB8888
+        result = SDL_ConvertPixelsAndColorspace(width, height, src_format, src_colorspace, src_properties, src, src_pitch, SDL_PIXELFORMAT_XRGB8888, SDL_COLORSPACE_SRGB, 0, tmp, tmp_pitch);
         if (!result) {
             SDL_free(tmp);
             return false;
         }
 
-        // convert tmp/ARGB8888 to dst/FOURCC
-        result = SDL_ConvertPixels_ARGB8888_to_YUV(width, height, tmp, tmp_pitch, dst_format, dst, dst_pitch, yuv_type);
+        // convert tmp/XRGB8888 to dst/FOURCC
+        result = SDL_ConvertPixels_XRGB8888_to_YUV(width, height, tmp, tmp_pitch, dst_format, dst, dst_pitch, yuv_type);
         SDL_free(tmp);
         return result;
     }
diff --git a/libs/SDL3/src/video/cocoa/SDL_cocoaopengl.m b/libs/SDL3/src/video/cocoa/SDL_cocoaopengl.m
index de1f661f2..29f1a66e0 100644
--- a/libs/SDL3/src/video/cocoa/SDL_cocoaopengl.m
+++ b/libs/SDL3/src/video/cocoa/SDL_cocoaopengl.m
@@ -286,7 +286,7 @@ SDL_GLContext Cocoa_GL_CreateContext(SDL_VideoDevice *_this, SDL_Window *window)
             _this->GL_SwapWindow = Cocoa_GLES_SwapWindow;
             _this->GL_DestroyContext = Cocoa_GLES_DestroyContext;
 
-            if (Cocoa_GLES_LoadLibrary(_this, NULL) != 0) {
+            if (!Cocoa_GLES_LoadLibrary(_this, NULL)) {
                 return NULL;
             }
             return Cocoa_GLES_CreateContext(_this, window);
diff --git a/libs/SDL3/src/video/cocoa/SDL_cocoawindow.m b/libs/SDL3/src/video/cocoa/SDL_cocoawindow.m
index d70c681c8..2504d9677 100644
--- a/libs/SDL3/src/video/cocoa/SDL_cocoawindow.m
+++ b/libs/SDL3/src/video/cocoa/SDL_cocoawindow.m
@@ -199,7 +199,7 @@ - (NSDragOperation)draggingUpdated:(id<NSDraggingInfo>)sender
 
 - (BOOL)performDragOperation:(id<NSDraggingInfo>)sender
 {
-    SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+    SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                  ". [SDL] In performDragOperation, draggingSourceOperationMask %lx, "
                  "expected Generic %lx, others Copy %lx, Link %lx, Private %lx, Move %lx, Delete %lx\n",
                  (unsigned long)[sender draggingSourceOperationMask],
@@ -210,7 +210,7 @@ - (BOOL)performDragOperation:(id<NSDraggingInfo>)sender
                  (unsigned long)NSDragOperationMove,
                  (unsigned long)NSDragOperationDelete);
     if ([sender draggingPasteboard]) {
-        SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+        SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                      ". [SDL] In performDragOperation, valid draggingPasteboard, "
                      "name [%s] '%s', changeCount %ld\n",
                      [[[[sender draggingPasteboard] name] className] UTF8String],
@@ -229,7 +229,7 @@ - (BOOL)performDragOperation:(id<NSDraggingInfo>)sender
 
         for (NSString *supportedType in [pasteboard types]) {
             NSString *typeString = [pasteboard stringForType:supportedType];
-            SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+            SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                          ". [SDL] In performDragOperation, Pasteboard type '%s', stringForType (%lu) '%s'\n",
                          [[supportedType description] UTF8String],
                          (unsigned long)[[typeString description] length],
@@ -281,7 +281,7 @@ - (BOOL)performDragOperation:(id<NSDraggingInfo>)sender
                         }
                     }
                 }
-                SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+                SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                              ". [SDL] In performDragOperation, desiredType '%s', "
                              "Submitting DropFile as (%lu) '%s'\n",
                              [[desiredType description] UTF8String],
@@ -296,7 +296,7 @@ - (BOOL)performDragOperation:(id<NSDraggingInfo>)sender
             char *saveptr = NULL;
             char *token   = SDL_strtok_r(buffer, "\r\n", &saveptr);
             while (token) {
-                SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+                SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                              ". [SDL] In performDragOperation, desiredType '%s', "
                              "Submitting DropText as (%lu) '%s'\n",
                              [[desiredType description] UTF8String],
diff --git a/libs/SDL3/src/video/emscripten/SDL_emscriptenframebuffer.c b/libs/SDL3/src/video/emscripten/SDL_emscriptenframebuffer.c
index 50e945bc5..f300555e4 100644
--- a/libs/SDL3/src/video/emscripten/SDL_emscriptenframebuffer.c
+++ b/libs/SDL3/src/video/emscripten/SDL_emscriptenframebuffer.c
@@ -88,7 +88,7 @@ bool Emscripten_UpdateWindowFramebuffer(SDL_VideoDevice *_this, SDL_Window *wind
             SDL3.imageCtx = SDL3.ctx;
         }
         var data = SDL3.image.data;
-        var src = pixels >> 2;
+        var src = pixels / 4;
         var dst = 0;
         var num;
 
diff --git a/libs/SDL3/src/video/emscripten/SDL_emscriptenmouse.c b/libs/SDL3/src/video/emscripten/SDL_emscriptenmouse.c
index 8ded04d10..44ca4dd77 100644
--- a/libs/SDL3/src/video/emscripten/SDL_emscriptenmouse.c
+++ b/libs/SDL3/src/video/emscripten/SDL_emscriptenmouse.c
@@ -94,7 +94,7 @@ static SDL_Cursor *Emscripten_CreateCursor(SDL_Surface *surface, int hot_x, int
 
         var image = ctx.createImageData(w, h);
         var data = image.data;
-        var src = pixels >> 2;
+        var src = pixels / 4;
 
         var data32 = new Int32Array(data.buffer);
         data32.set(HEAP32.subarray(src, src + data32.length));
diff --git a/libs/SDL3/src/video/uikit/SDL_uikitview.m b/libs/SDL3/src/video/uikit/SDL_uikitview.m
index f01c0374f..215f84712 100644
--- a/libs/SDL3/src/video/uikit/SDL_uikitview.m
+++ b/libs/SDL3/src/video/uikit/SDL_uikitview.m
@@ -292,26 +292,11 @@ - (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event
             if (touch.type == UITouchTypeIndirectPointer) {
                 if (!SDL_HasMouse()) {
                     int i;
+                    SDL_MouseButtonFlags buttons = SDL_GetMouseState(NULL, NULL);
 
-                    for (i = 1; i <= MAX_MOUSE_BUTTONS; ++i) {
-                        if (event.buttonMask & SDL_BUTTON_MASK(i)) {
-                            Uint8 button;
-
-                            switch (i) {
-                            case 1:
-                                button = SDL_BUTTON_LEFT;
-                                break;
-                            case 2:
-                                button = SDL_BUTTON_RIGHT;
-                                break;
-                            case 3:
-                                button = SDL_BUTTON_MIDDLE;
-                                break;
-                            default:
-                                button = (Uint8)i;
-                                break;
-                            }
-                            SDL_SendMouseButton(UIKit_GetEventTimestamp([event timestamp]), sdlwindow, SDL_GLOBAL_MOUSE_ID, button, false);
+                    for (i = 0; i < MAX_MOUSE_BUTTONS; ++i) {
+                        if (buttons & SDL_BUTTON_MASK(i)) {
+                            SDL_SendMouseButton(UIKit_GetEventTimestamp([event timestamp]), sdlwindow, SDL_GLOBAL_MOUSE_ID, (Uint8)i, false);
                         }
                     }
                 }
diff --git a/libs/SDL3/src/video/uikit/SDL_uikitwindow.m b/libs/SDL3/src/video/uikit/SDL_uikitwindow.m
index 1d6e7f884..85e0b920b 100644
--- a/libs/SDL3/src/video/uikit/SDL_uikitwindow.m
+++ b/libs/SDL3/src/video/uikit/SDL_uikitwindow.m
@@ -257,11 +257,13 @@ void UIKit_HideWindow(SDL_VideoDevice *_this, SDL_Window *window)
 
 void UIKit_RaiseWindow(SDL_VideoDevice *_this, SDL_Window *window)
 {
+#if defined(SDL_VIDEO_OPENGL_ES) || defined(SDL_VIDEO_OPENGL_ES2)
     /* We don't currently offer a concept of "raising" the SDL window, since
      * we only allow one per display, in the iOS fashion.
      * However, we use this entry point to rebind the context to the view
      * during OnWindowRestored processing. */
     _this->GL_MakeCurrent(_this, _this->current_glwin, _this->current_glctx);
+#endif
 }
 
 static void UIKit_UpdateWindowBorder(SDL_VideoDevice *_this, SDL_Window *window)
diff --git a/libs/SDL3/src/video/wayland/SDL_waylanddatamanager.c b/libs/SDL3/src/video/wayland/SDL_waylanddatamanager.c
index dc04af5b5..6ab25f5ca 100644
--- a/libs/SDL3/src/video/wayland/SDL_waylanddatamanager.c
+++ b/libs/SDL3/src/video/wayland/SDL_waylanddatamanager.c
@@ -381,7 +381,7 @@ void *Wayland_data_offer_receive(SDL_WaylandDataOffer *offer,
         }
         close(pipefd[0]);
     }
-    SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+    SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                  ". In Wayland_data_offer_receive for '%s', buffer (%ld) at %p\n",
                  mime_type, *length, buffer);
     return buffer;
@@ -417,7 +417,7 @@ void *Wayland_primary_selection_offer_receive(SDL_WaylandPrimarySelectionOffer *
         }
         close(pipefd[0]);
     }
-    SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+    SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                  ". In Wayland_primary_selection_offer_receive for '%s', buffer (%ld) at %p\n",
                  mime_type, *length, buffer);
     return buffer;
diff --git a/libs/SDL3/src/video/wayland/SDL_waylandevents.c b/libs/SDL3/src/video/wayland/SDL_waylandevents.c
index 9e8f7677f..816fa0a7c 100644
--- a/libs/SDL3/src/video/wayland/SDL_waylandevents.c
+++ b/libs/SDL3/src/video/wayland/SDL_waylandevents.c
@@ -1991,7 +1991,7 @@ static void data_offer_handle_offer(void *data, struct wl_data_offer *wl_data_of
 {
     SDL_WaylandDataOffer *offer = data;
     Wayland_data_offer_add_mime(offer, mime_type);
-    SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+    SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                  ". In wl_data_offer_listener . data_offer_handle_offer on data_offer 0x%08x for MIME '%s'\n",
                  (wl_data_offer ? WAYLAND_wl_proxy_get_id((struct wl_proxy *)wl_data_offer) : -1),
                  mime_type);
@@ -2000,7 +2000,7 @@ static void data_offer_handle_offer(void *data, struct wl_data_offer *wl_data_of
 static void data_offer_handle_source_actions(void *data, struct wl_data_offer *wl_data_offer,
                                              uint32_t source_actions)
 {
-    SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+    SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                  ". In wl_data_offer_listener . data_offer_handle_source_actions on data_offer 0x%08x for Source Actions '%d'\n",
                  (wl_data_offer ? WAYLAND_wl_proxy_get_id((struct wl_proxy *)wl_data_offer) : -1),
                  source_actions);
@@ -2009,7 +2009,7 @@ static void data_offer_handle_source_actions(void *data, struct wl_data_offer *w
 static void data_offer_handle_actions(void *data, struct wl_data_offer *wl_data_offer,
                                       uint32_t dnd_action)
 {
-    SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+    SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                  ". In wl_data_offer_listener . data_offer_handle_actions on data_offer 0x%08x for DND Actions '%d'\n",
                  (wl_data_offer ? WAYLAND_wl_proxy_get_id((struct wl_proxy *)wl_data_offer) : -1),
                  dnd_action);
@@ -2026,7 +2026,7 @@ static void primary_selection_offer_handle_offer(void *data, struct zwp_primary_
 {
     SDL_WaylandPrimarySelectionOffer *offer = data;
     Wayland_primary_selection_offer_add_mime(offer, mime_type);
-    SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+    SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                  ". In zwp_primary_selection_offer_v1_listener . primary_selection_offer_handle_offer on primary_selection_offer 0x%08x for MIME '%s'\n",
                  (zwp_primary_selection_offer_v1 ? WAYLAND_wl_proxy_get_id((struct wl_proxy *)zwp_primary_selection_offer_v1) : -1),
                  mime_type);
@@ -2046,7 +2046,7 @@ static void data_device_handle_data_offer(void *data, struct wl_data_device *wl_
         WAYLAND_wl_list_init(&(data_offer->mimes));
         wl_data_offer_set_user_data(id, data_offer);
         wl_data_offer_add_listener(id, &data_offer_listener, data_offer);
-        SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+        SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                      ". In wl_data_device_listener . data_device_handle_data_offer on data_offer 0x%08x\n",
                      (id ? WAYLAND_wl_proxy_get_id((struct wl_proxy *)id) : -1));
     }
@@ -2104,25 +2104,25 @@ static void data_device_handle_enter(void *data, struct wl_data_device *wl_data_
                 const float dx = (float)wl_fixed_to_double(x);
                 const float dy = (float)wl_fixed_to_double(y);
                 SDL_SendDropPosition(data_device->dnd_window, dx, dy);
-                SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+                SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                              ". In wl_data_device_listener . data_device_handle_enter on data_offer 0x%08x at %d x %d into window %d for serial %d\n",
                              WAYLAND_wl_proxy_get_id((struct wl_proxy *)id),
                              wl_fixed_to_int(x), wl_fixed_to_int(y), SDL_GetWindowID(data_device->dnd_window), serial);
             } else {
                 data_device->dnd_window = NULL;
-                SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+                SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                              ". In wl_data_device_listener . data_device_handle_enter on data_offer 0x%08x at %d x %d for serial %d\n",
                              WAYLAND_wl_proxy_get_id((struct wl_proxy *)id),
                              wl_fixed_to_int(x), wl_fixed_to_int(y), serial);
             }
         } else {
-            SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+            SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                          ". In wl_data_device_listener . data_device_handle_enter on data_offer 0x%08x at %d x %d for serial %d\n",
                          WAYLAND_wl_proxy_get_id((struct wl_proxy *)id),
                          wl_fixed_to_int(x), wl_fixed_to_int(y), serial);
         }
     } else {
-        SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+        SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                      ". In wl_data_device_listener . data_device_handle_enter on data_offer 0x%08x at %d x %d for serial %d\n",
                      -1, wl_fixed_to_int(x), wl_fixed_to_int(y), serial);
     }
@@ -2134,12 +2134,12 @@ static void data_device_handle_leave(void *data, struct wl_data_device *wl_data_
 
     if (data_device->drag_offer) {
         if (data_device->dnd_window) {
-            SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+            SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                          ". In wl_data_device_listener . data_device_handle_leave on data_offer 0x%08x from window %d for serial %d\n",
                          WAYLAND_wl_proxy_get_id((struct wl_proxy *)data_device->drag_offer->offer),
                          SDL_GetWindowID(data_device->dnd_window), data_device->drag_serial);
         } else {
-            SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+            SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                          ". In wl_data_device_listener . data_device_handle_leave on data_offer 0x%08x for serial %d\n",
                          WAYLAND_wl_proxy_get_id((struct wl_proxy *)data_device->drag_offer->offer),
                          data_device->drag_serial);
@@ -2147,7 +2147,7 @@ static void data_device_handle_leave(void *data, struct wl_data_device *wl_data_
         Wayland_data_offer_destroy(data_device->drag_offer);
         data_device->drag_offer = NULL;
     } else {
-        SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+        SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                      ". In wl_data_device_listener . data_device_handle_leave on data_offer 0x%08x for serial %d\n",
                      -1, -1);
     }
@@ -2169,13 +2169,13 @@ static void data_device_handle_motion(void *data, struct wl_data_device *wl_data
          *      hammer the DBus interface hundreds or even thousands of times per second.
          */
         SDL_SendDropPosition(data_device->dnd_window, dx, dy);
-        SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+        SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                      ". In wl_data_device_listener . data_device_handle_motion on data_offer 0x%08x at %d x %d in window %d serial %d\n",
                      WAYLAND_wl_proxy_get_id((struct wl_proxy *)data_device->drag_offer->offer),
                      wl_fixed_to_int(x), wl_fixed_to_int(y),
                      SDL_GetWindowID(data_device->dnd_window), data_device->drag_serial);
     } else {
-        SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+        SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                      ". In wl_data_device_listener . data_device_handle_motion on data_offer 0x%08x at %d x %d serial %d\n",
                      -1, wl_fixed_to_int(x), wl_fixed_to_int(y), -1);
     }
@@ -2186,7 +2186,7 @@ static void data_device_handle_drop(void *data, struct wl_data_device *wl_data_d
     SDL_WaylandDataDevice *data_device = data;
 
     if (data_device->drag_offer && data_device->dnd_window && (data_device->has_mime_file || data_device->has_mime_text)) {
-        SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+        SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                      ". In wl_data_device_listener . data_device_handle_drop on data_offer 0x%08x in window %d serial %d\n",
                      WAYLAND_wl_proxy_get_id((struct wl_proxy *)data_device->drag_offer->offer),
                      SDL_GetWindowID(data_device->dnd_window), data_device->drag_serial);
@@ -2268,7 +2268,7 @@ static void data_device_handle_drop(void *data, struct wl_data_device *wl_data_d
             wl_data_offer_finish(data_device->drag_offer->offer);
         }
     } else {
-        SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+        SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                      ". In wl_data_device_listener . data_device_handle_drop on data_offer 0x%08x serial %d\n",
                      -1, -1);
     }
@@ -2321,7 +2321,7 @@ static void data_device_handle_selection(void *data, struct wl_data_device *wl_d
         offer = wl_data_offer_get_user_data(id);
     }
 
-    SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+    SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                  ". In data_device_listener . data_device_handle_selection on data_offer 0x%08x\n",
                  (id ? WAYLAND_wl_proxy_get_id((struct wl_proxy *)id) : -1));
     if (data_device->selection_offer != offer) {
@@ -2352,7 +2352,7 @@ static void primary_selection_device_handle_offer(void *data, struct zwp_primary
         zwp_primary_selection_offer_v1_set_user_data(id, primary_selection_offer);
         zwp_primary_selection_offer_v1_add_listener(id, &primary_selection_offer_listener, primary_selection_offer);
     }
-    SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+    SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                  ". In zwp_primary_selection_device_v1_listener . primary_selection_device_handle_offer on primary_selection_offer 0x%08x\n",
                  (id ? WAYLAND_wl_proxy_get_id((struct wl_proxy *)id) : -1));
 }
@@ -2371,7 +2371,7 @@ static void primary_selection_device_handle_selection(void *data, struct zwp_pri
         Wayland_primary_selection_offer_destroy(primary_selection_device->selection_offer);
         primary_selection_device->selection_offer = offer;
     }
-    SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+    SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                  ". In zwp_primary_selection_device_v1_listener . primary_selection_device_handle_selection on primary_selection_offer 0x%08x\n",
                  (id ? WAYLAND_wl_proxy_get_id((struct wl_proxy *)id) : -1));
 
diff --git a/libs/SDL3/src/video/wayland/SDL_waylandvideo.c b/libs/SDL3/src/video/wayland/SDL_waylandvideo.c
index b57052ebc..13744a2cb 100644
--- a/libs/SDL3/src/video/wayland/SDL_waylandvideo.c
+++ b/libs/SDL3/src/video/wayland/SDL_waylandvideo.c
@@ -244,52 +244,210 @@ static const struct kde_output_order_v1_listener kde_output_order_listener = {
     handle_kde_output_order_done
 };
 
+// Sort the list of displays into a deterministic order
+static int SDLCALL Wayland_DisplayPositionCompare(const void *a, const void *b)
+{
+    const SDL_DisplayData *da = *(SDL_DisplayData **)a;
+    const SDL_DisplayData *db = *(SDL_DisplayData **)b;
+
+    const bool a_at_origin = da->x == 0 && da->y == 0;
+    const bool b_at_origin = db->x == 0 && db->y == 0;
+
+    // Sort the display at 0,0 to be beginning of the list, as that will be the fallback primary.
+    if (a_at_origin && !b_at_origin) {
+        return -1;
+    }
+    if (b_at_origin && !a_at_origin) {
+        return 1;
+    }
+    if (da->x < db->x) {
+        return -1;
+    }
+    if (da->x > db->x) {
+        return 1;
+    }
+    if (da->y < db->y) {
+        return -1;
+    }
+    if (da->y > db->y) {
+        return 1;
+    }
+
+    // If no position information is available, use the connector name.
+    if (da->wl_output_name && db->wl_output_name) {
+        return SDL_strcmp(da->wl_output_name, db->wl_output_name);
+    }
+
+    return 0;
+}
+
+/* Wayland doesn't have the native concept of a primary display, but there are clients that
+ * will base their resolution lists on, or automatically make themselves fullscreen on, the
+ * first listed output, which can lead to problems if the first listed output isn't
+ * necessarily the best display for this. This attempts to find a primary display, first by
+ * querying the GNOME DBus property, then trying to determine the 'best' display if that fails.
+ * If all displays are equal, the one at position 0,0 will become the primary.
+ *
+ * The primary is determined by the following criteria, in order:
+ * - Landscape is preferred over portrait
+ * - The highest native resolution
+ * - TODO: A higher HDR range is preferred
+ * - Higher refresh is preferred (ignoring small differences)
+ * - Lower scale values are preferred (larger display)
+ */
+static int Wayland_GetPrimaryDisplay(SDL_VideoData *vid)
+{
+    static const int REFRESH_DELTA = 4000;
+
+    // Query the DBus interface to see if the coordinates of the primary display are exposed.
+    int x, y;
+    if (Wayland_GetGNOMEPrimaryDisplayCoordinates(&x, &y)) {
+        for (int i = 0; i < vid->output_count; ++i) {
+            if (vid->output_list[i]->x == x && vid->output_list[i]->y == y) {
+                return i;
+            }
+        }
+    }
+
+    // Otherwise, choose the 'best' display.
+    int best_width = 0;
+    int best_height = 0;
+    double best_scale = 0.0;
+    int best_refresh = 0;
+    bool best_is_landscape = false;
+    int best_index = 0;
+
+    for (int i = 0; i < vid->output_count; ++i) {
+        const SDL_DisplayData *d = vid->output_list[i];
+        const bool is_landscape = d->orientation != SDL_ORIENTATION_PORTRAIT && d->orientation != SDL_ORIENTATION_PORTRAIT_FLIPPED;
+        bool have_new_best = false;
+
+        if (!best_is_landscape && is_landscape) { // Favor landscape over portrait displays.
+            have_new_best = true;
+        } else if (!best_is_landscape || is_landscape) { // Ignore portrait displays if a landscape was already found.
+            if (d->pixel_width > best_width || d->pixel_height > best_height) {
+                have_new_best = true;
+            } else if (d->pixel_width == best_width && d->pixel_height == best_height) {
+                if (d->refresh - best_refresh > REFRESH_DELTA) { // Favor a higher refresh rate, but ignore small differences (e.g. 59.97 vs 60.1)
+                    have_new_best = true;
+                } else if (d->scale_factor < best_scale && SDL_abs(d->refresh - best_refresh) <= REFRESH_DELTA) {
+                    // Prefer a lower scale display if the difference in refresh rate is small.
+                    have_new_best = true;
+                }
+            }
+        }
+
+        if (have_new_best) {
+            best_width = d->pixel_width;
+            best_height = d->pixel_height;
+            best_scale = d->scale_factor;
+            best_refresh = d->refresh;
+            best_is_landscape = is_landscape;
+            best_index = i;
+        }
+    }
+
+    return best_index;
+}
+
+static bool Wayland_SortOutputsByPriorityHint(SDL_VideoData *vid)
+{
+    const char *name_hint = SDL_GetHint(SDL_HINT_VIDEO_DISPLAY_PRIORITY);
+
+    if (name_hint) {
+        char *saveptr;
+        char *str = SDL_strdup(name_hint);
+        SDL_DisplayData **sorted_list = SDL_malloc(sizeof(SDL_DisplayData *) * vid->output_count);
+        int sorted_index = 0;
+
+        if (str && sorted_list) {
+            // Sort the requested displays to the front of the list.
+            const char *token = SDL_strtok_r(str, ",", &saveptr);
+            while (token) {
+                for (int i = 0; i < vid->output_count; ++i) {
+                    SDL_DisplayData *d = vid->output_list[i];
+                    if (d && d->wl_output_name && SDL_strcmp(token, d->wl_output_name) == 0) {
+                        sorted_list[sorted_index++] = d;
+                        vid->output_list[i] = NULL;
+                        break;
+                    }
+                }
+
+                token = SDL_strtok_r(NULL, ",", &saveptr);
+            }
+
+            // Append the remaining outputs to the end of the list.
+            for (int i = 0; i < vid->output_count; ++i) {
+                if (vid->output_list[i]) {
+                    sorted_list[sorted_index++] = vid->output_list[i];
+                }
+            }
+
+            // Copy the sorted list to the output list.
+            SDL_memcpy(vid->output_list, sorted_list, sizeof(SDL_DisplayData *) * vid->output_count);
+        }
+
+        SDL_free(str);
+        SDL_free(sorted_list);
+
+        return true;
+    }
+
+    return false;
+}
+
 static void Wayland_SortOutputs(SDL_VideoData *vid)
 {
-    SDL_DisplayData *d;
-    int p_x, p_y;
+    bool have_primary = false;
 
     /* KDE provides the kde-output-order-v1 protocol, which gives us the full preferred display
-     * ordering in the form of a list of wl_output.name strings (connector names).
+     * ordering in the form of a list of wl_output.name strings.
      */
     if (!WAYLAND_wl_list_empty(&vid->output_order)) {
-        struct wl_list sorted_list;
         SDL_WaylandConnectorName *c;
-
-        // Sort the outputs by connector name.
-        WAYLAND_wl_list_init(&sorted_list);
-        wl_list_for_each (c, &vid->output_order, link) {
-            wl_list_for_each (d, &vid->output_list, link) {
-                if (d->wl_output_name && SDL_strcmp(c->wl_output_name, d->wl_output_name) == 0) {
-                    // Remove from the current list and Append the next node to the end of the new list.
-                    WAYLAND_wl_list_remove(&d->link);
-                    WAYLAND_wl_list_insert(sorted_list.prev, &d->link);
-                    break;
+        SDL_DisplayData **sorted_list = SDL_malloc(sizeof(SDL_DisplayData *) * vid->output_count);
+        int sorted_index = 0;
+
+        if (sorted_list) {
+            // Sort the outputs by connector name.
+            wl_list_for_each (c, &vid->output_order, link) {
+                for (int i = 0; i < vid->output_count; ++i) {
+                    SDL_DisplayData *d = vid->output_list[i];
+                    if (d && d->wl_output_name && SDL_strcmp(c->wl_output_name, d->wl_output_name) == 0) {
+                        sorted_list[sorted_index++] = d;
+                        vid->output_list[i] = NULL;
+                        break;
+                    }
                 }
             }
-        }
 
-        if (!WAYLAND_wl_list_empty(&vid->output_list)) {
             /* If any displays were omitted during the sort, append them to the new list.
              * This shouldn't happen, but better safe than sorry.
              */
-            WAYLAND_wl_list_insert_list(sorted_list.prev, &vid->output_list);
+            for (int i = 0; i < vid->output_count; ++i) {
+                if (vid->output_list[i]) {
+                    sorted_list[sorted_index++] = vid->output_list[i];
+                }
+            }
+
+            // Copy the sorted list to the output list.
+            SDL_memcpy(vid->output_list, sorted_list, sizeof(SDL_DisplayData *) * vid->output_count);
+            SDL_free(sorted_list);
+
+            have_primary = true;
         }
+    } else {
+        // Sort by position or connector name, so the order of outputs is deterministic.
+        SDL_qsort(vid->output_list, vid->output_count, sizeof(SDL_DisplayData *), Wayland_DisplayPositionCompare);
+    }
 
-        // Set the output list to the sorted list.
-        WAYLAND_wl_list_init(&vid->output_list);
-        WAYLAND_wl_list_insert_list(&vid->output_list, &sorted_list);
-    } else if (Wayland_GetGNOMEPrimaryDisplayCoordinates(&p_x, &p_y)) {
-        /* GNOME doesn't expose the displays in any preferential order, so find the primary display coordinates and use them
-         * to manually sort the primary display to the front of the list so that it is always the first exposed by SDL.
-         * Otherwise, assume that the displays were already exposed in preferential order.
-         */
-        wl_list_for_each (d, &vid->output_list, link) {
-            if (d->x == p_x && d->y == p_y) {
-                WAYLAND_wl_list_remove(&d->link);
-                WAYLAND_wl_list_insert(&vid->output_list, &d->link);
-                break;
-            }
+    // Apply the ordering hint if specified, otherwise, try to find the primary display, if no preferred order is known.
+    if (!Wayland_SortOutputsByPriorityHint(vid) && !have_primary) {
+        const int primary_index = Wayland_GetPrimaryDisplay(vid);
+        if (primary_index) {
+            SDL_DisplayData *primary = vid->output_list[primary_index];
+            SDL_memmove(&vid->output_list[1], &vid->output_list[0], sizeof(SDL_DisplayData *) * primary_index);
+            vid->output_list[0] = primary;
         }
     }
 }
@@ -485,7 +643,6 @@ static SDL_VideoDevice *Wayland_CreateDevice(bool require_preferred_protocols)
     data->input = input;
     data->display_externally_owned = display_is_external;
     data->scale_to_display_enabled = SDL_GetHintBoolean(SDL_HINT_VIDEO_WAYLAND_SCALE_TO_DISPLAY, false);
-    WAYLAND_wl_list_init(&data->output_list);
     WAYLAND_wl_list_init(&data->output_order);
     WAYLAND_wl_list_init(&external_window_list);
 
@@ -1043,8 +1200,12 @@ static bool Wayland_add_display(SDL_VideoData *d, uint32_t id, uint32_t version)
     wl_output_add_listener(output, &output_listener, data);
     SDL_WAYLAND_register_output(output);
 
-    // Keep a list of outputs for deferred xdg-output initialization.
-    WAYLAND_wl_list_insert(d->output_list.prev, &data->link);
+    // Keep a list of outputs for sorting and deferred protocol initialization.
+    if (d->output_count == d->output_max) {
+        d->output_max += 4;
+        d->output_list = SDL_realloc(d->output_list, sizeof(SDL_DisplayData *) * d->output_max);
+    }
+    d->output_list[d->output_count++] = data;
 
     if (data->videodata->xdg_output_manager) {
         data->xdg_output = zxdg_output_manager_v1_get_xdg_output(data->videodata->xdg_output_manager, output);
@@ -1077,19 +1238,15 @@ static void Wayland_free_display(SDL_VideoDisplay *display)
             wl_output_destroy(display_data->output);
         }
 
-        // Unlink this display.
-        WAYLAND_wl_list_remove(&display_data->link);
-
         SDL_DelVideoDisplay(display->id, false);
     }
 }
 
 static void Wayland_FinalizeDisplays(SDL_VideoData *vid)
 {
-    SDL_DisplayData *d;
-
     Wayland_SortOutputs(vid);
-    wl_list_for_each (d, &vid->output_list, link) {
+    for(int i = 0; i < vid->output_count; ++i) {
+        SDL_DisplayData *d = vid->output_list[i];
         d->display = SDL_AddVideoDisplay(&d->placeholder, false);
         SDL_free(d->placeholder.name);
         SDL_zero(d->placeholder);
@@ -1098,10 +1255,10 @@ static void Wayland_FinalizeDisplays(SDL_VideoData *vid)
 
 static void Wayland_init_xdg_output(SDL_VideoData *d)
 {
-    SDL_DisplayData *node;
-    wl_list_for_each (node, &d->output_list, link) {
-        node->xdg_output = zxdg_output_manager_v1_get_xdg_output(node->videodata->xdg_output_manager, node->output);
-        zxdg_output_v1_add_listener(node->xdg_output, &xdg_output_listener, node);
+    for(int i = 0; i < d->output_count; ++i) {
+        SDL_DisplayData *disp = d->output_list[i];
+        disp->xdg_output = zxdg_output_manager_v1_get_xdg_output(disp->videodata->xdg_output_manager, disp->output);
+        zxdg_output_v1_add_listener(disp->xdg_output, &xdg_output_listener, disp);
     }
 }
 
@@ -1207,12 +1364,18 @@ static void display_handle_global(void *data, struct wl_registry *registry, uint
 static void display_remove_global(void *data, struct wl_registry *registry, uint32_t id)
 {
     SDL_VideoData *d = data;
-    SDL_DisplayData *node;
 
     // We don't get an interface, just an ID, so assume it's a wl_output :shrug:
-    wl_list_for_each (node, &d->output_list, link) {
-        if (node->registry_id == id) {
-            Wayland_free_display(SDL_GetVideoDisplay(node->display));
+    for (int i = 0; i < d->output_count; ++i) {
+        SDL_DisplayData *disp = d->output_list[i];
+        if (disp->registry_id == id) {
+            Wayland_free_display(SDL_GetVideoDisplay(disp->display));
+
+            if (i < d->output_count) {
+                SDL_memmove(&d->output_list[i], &d->output_list[i + 1], sizeof(SDL_DisplayData *) * (d->output_count - i - 1));
+            }
+
+            d->output_count--;
             break;
         }
     }
@@ -1355,6 +1518,7 @@ static void Wayland_VideoCleanup(SDL_VideoDevice *_this)
         SDL_VideoDisplay *display = _this->displays[i];
         Wayland_free_display(display);
     }
+    SDL_free(data->output_list);
 
     Wayland_display_destroy_input(data);
 
diff --git a/libs/SDL3/src/video/wayland/SDL_waylandvideo.h b/libs/SDL3/src/video/wayland/SDL_waylandvideo.h
index c9c75d130..8d6c8a862 100644
--- a/libs/SDL3/src/video/wayland/SDL_waylandvideo.h
+++ b/libs/SDL3/src/video/wayland/SDL_waylandvideo.h
@@ -88,7 +88,9 @@ struct SDL_VideoData
 
     struct xkb_context *xkb_context;
     struct SDL_WaylandInput *input;
-    struct wl_list output_list;
+    SDL_DisplayData **output_list;
+    int output_count;
+    int output_max;
     struct wl_list output_order;
 
     bool output_order_finalized;
@@ -115,7 +117,6 @@ struct SDL_DisplayData
     SDL_DisplayID display;
     SDL_VideoDisplay placeholder;
     int wl_output_done_count;
-    struct wl_list link;
 };
 
 // Needed here to get wl_surface declaration, fixes GitHub#4594
diff --git a/libs/SDL3/src/video/windows/SDL_windowsevents.c b/libs/SDL3/src/video/windows/SDL_windowsevents.c
index d383dc23c..fe505812d 100644
--- a/libs/SDL3/src/video/windows/SDL_windowsevents.c
+++ b/libs/SDL3/src/video/windows/SDL_windowsevents.c
@@ -1779,7 +1779,7 @@ LRESULT CALLBACK WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
             UINT i, num_inputs = LOWORD(wParam);
             bool isstack;
             PTOUCHINPUT inputs = SDL_small_alloc(TOUCHINPUT, num_inputs, &isstack);
-            if (data->videodata->GetTouchInputInfo((HTOUCHINPUT)lParam, num_inputs, inputs, sizeof(TOUCHINPUT))) {
+            if (inputs && data->videodata->GetTouchInputInfo((HTOUCHINPUT)lParam, num_inputs, inputs, sizeof(TOUCHINPUT))) {
                 RECT rect;
                 float x, y;
 
diff --git a/libs/SDL3/src/video/windows/SDL_windowsmodes.c b/libs/SDL3/src/video/windows/SDL_windowsmodes.c
index 221db107a..afa468304 100644
--- a/libs/SDL3/src/video/windows/SDL_windowsmodes.c
+++ b/libs/SDL3/src/video/windows/SDL_windowsmodes.c
@@ -513,7 +513,12 @@ static float WIN_GetSDRWhitePoint(SDL_VideoDevice *_this, HMONITOR hMonitor)
     float SDR_white_level = 1.0f;
 
     if (WIN_GetMonitorPathInfo(videodata, hMonitor, &path_info)) {
-        DISPLAYCONFIG_SDR_WHITE_LEVEL white_level;
+        /* workarounds for https://github.com/libsdl-org/SDL/issues/11193 */
+        struct SDL_DISPLAYCONFIG_SDR_WHITE_LEVEL {
+          DISPLAYCONFIG_DEVICE_INFO_HEADER header;
+          ULONG SDRWhiteLevel;
+        } white_level;
+        #define DISPLAYCONFIG_DEVICE_INFO_GET_SDR_WHITE_LEVEL 11
 
         SDL_zero(white_level);
         white_level.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_SDR_WHITE_LEVEL;
diff --git a/libs/SDL3/src/video/windows/SDL_windowswindow.c b/libs/SDL3/src/video/windows/SDL_windowswindow.c
index 3954dcc78..6dbb001a6 100644
--- a/libs/SDL3/src/video/windows/SDL_windowswindow.c
+++ b/libs/SDL3/src/video/windows/SDL_windowswindow.c
@@ -841,6 +841,9 @@ bool WIN_SetWindowIcon(SDL_VideoDevice *_this, SDL_Window *window, SDL_Surface *
     mask_len = (icon->h * (icon->w + 7) / 8);
     icon_len = sizeof(BITMAPINFOHEADER) + icon->h * icon->w * sizeof(Uint32) + mask_len;
     icon_bmp = SDL_small_alloc(BYTE, icon_len, &isstack);
+    if (!icon_bmp) {
+        return false;
+    }
 
     // Write the BITMAPINFO header
     bmi = (BITMAPINFOHEADER *)icon_bmp;
@@ -1788,16 +1791,16 @@ static STDMETHODIMP SDLDropTarget_DragEnter(SDLDropTarget *target,
                                             IDataObject *pDataObject, DWORD grfKeyState,
                                             POINTL pt, DWORD *pdwEffect)
 {
-    SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+    SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                  ". In DragEnter at %ld, %ld\n", pt.x, pt.y);
     *pdwEffect = DROPEFFECT_COPY;
     POINT pnt = { pt.x, pt.y };
     if (ScreenToClient(target->hwnd, &pnt)) {
-        SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+        SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                      ". In DragEnter at %ld, %ld => window %u at %ld, %ld\n", pt.x, pt.y, target->window->id, pnt.x, pnt.y);
         SDL_SendDropPosition(target->window, pnt.x, pnt.y);
     } else {
-        SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+        SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                      ". In DragEnter at %ld, %ld => nil, nil\n", pt.x, pt.y);
     }
     return S_OK;
@@ -1807,16 +1810,16 @@ static STDMETHODIMP SDLDropTarget_DragOver(SDLDropTarget *target,
                                            DWORD grfKeyState,
                                            POINTL pt, DWORD *pdwEffect)
 {
-    SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+    SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                  ". In DragOver at %ld, %ld\n", pt.x, pt.y);
     *pdwEffect = DROPEFFECT_COPY;
     POINT pnt = { pt.x, pt.y };
     if (ScreenToClient(target->hwnd, &pnt)) {
-        SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+        SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                      ". In DragOver at %ld, %ld => window %u at %ld, %ld\n", pt.x, pt.y, target->window->id, pnt.x, pnt.y);
         SDL_SendDropPosition(target->window, pnt.x, pnt.y);
     } else {
-        SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+        SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                      ". In DragOver at %ld, %ld => nil, nil\n", pt.x, pt.y);
     }
     return S_OK;
@@ -1824,7 +1827,7 @@ static STDMETHODIMP SDLDropTarget_DragOver(SDLDropTarget *target,
 
 static STDMETHODIMP SDLDropTarget_DragLeave(SDLDropTarget *target)
 {
-    SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+    SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                  ". In DragLeave\n");
     SDL_SendDropComplete(target->window);
     return S_OK;
@@ -1837,11 +1840,11 @@ static STDMETHODIMP SDLDropTarget_Drop(SDLDropTarget *target,
     *pdwEffect = DROPEFFECT_COPY;
     POINT pnt = { pt.x, pt.y };
     if (ScreenToClient(target->hwnd, &pnt)) {
-        SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+        SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                      ". In Drop at %ld, %ld => window %u at %ld, %ld\n", pt.x, pt.y, target->window->id, pnt.x, pnt.y);
         SDL_SendDropPosition(target->window, pnt.x, pnt.y);
     } else {
-        SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+        SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                      ". In Drop at %ld, %ld => nil, nil\n", pt.x, pt.y);
     }
 
@@ -1849,7 +1852,7 @@ static STDMETHODIMP SDLDropTarget_Drop(SDLDropTarget *target,
         IEnumFORMATETC *pEnumFormatEtc;
         HRESULT hres;
         hres = pDataObject->lpVtbl->EnumFormatEtc(pDataObject, DATADIR_GET, &pEnumFormatEtc);
-        SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+        SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                      ". In Drop for EnumFormatEtc, HRESULT is %08lx\n", hres);
         if (hres == S_OK) {
             FORMATETC fetc;
@@ -1857,10 +1860,10 @@ static STDMETHODIMP SDLDropTarget_Drop(SDLDropTarget *target,
                 char name[257] = { 0 };
                 const char *cfnm = SDLGetClipboardFormatName(fetc.cfFormat, name, 256);
                 if (cfnm) {
-                    SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+                    SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                                  ". In Drop, Supported format is %08x, '%s'\n", fetc.cfFormat, cfnm);
                 } else {
-                    SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+                    SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                                  ". In Drop, Supported format is %08x, Predefined\n", fetc.cfFormat);
                 }
             }
@@ -1876,18 +1879,18 @@ static STDMETHODIMP SDLDropTarget_Drop(SDLDropTarget *target,
         fetc.tymed = TYMED_HGLOBAL;
         const char *format_mime = "text/uri-list";
         if (SUCCEEDED(pDataObject->lpVtbl->QueryGetData(pDataObject, &fetc))) {
-            SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+            SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                          ". In Drop File for QueryGetData, format %08x '%s', success\n",
                          fetc.cfFormat, format_mime);
             STGMEDIUM med;
             HRESULT hres = pDataObject->lpVtbl->GetData(pDataObject, &fetc, &med);
-            SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+            SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                          ". In Drop File for      GetData, format %08x '%s', HRESULT is %08lx\n",
                          fetc.cfFormat, format_mime, hres);
             if (SUCCEEDED(hres)) {
                 const size_t bsize = GlobalSize(med.hGlobal);
                 const void *buffer = (void *)GlobalLock(med.hGlobal);
-                SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+                SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                              ". In Drop File for   GlobalLock, format %08x '%s', memory (%lu) %p\n",
                              fetc.cfFormat, format_mime, (unsigned long)bsize, buffer);
                 if (buffer) {
@@ -1898,7 +1901,7 @@ static STDMETHODIMP SDLDropTarget_Drop(SDLDropTarget *target,
                     char *token = SDL_strtok_r(text, "\r\n", &saveptr);
                     while (token != NULL) {
                         if (SDL_URIToLocal(token, token) >= 0) {
-                            SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+                            SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                                          ". In Drop File, file (%lu of %lu) '%s'\n",
                                          (unsigned long)SDL_strlen(token), (unsigned long)bsize, token);
                             SDL_SendDropFile(target->window, NULL, token);
@@ -1924,18 +1927,18 @@ static STDMETHODIMP SDLDropTarget_Drop(SDLDropTarget *target,
         fetc.tymed = TYMED_HGLOBAL;
         const char *format_mime = "text/plain;charset=utf-8";
         if (SUCCEEDED(pDataObject->lpVtbl->QueryGetData(pDataObject, &fetc))) {
-            SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+            SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                          ". In Drop Text for QueryGetData, format %08x '%s', success\n",
                          fetc.cfFormat, format_mime);
             STGMEDIUM med;
             HRESULT hres = pDataObject->lpVtbl->GetData(pDataObject, &fetc, &med);
-            SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+            SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                          ". In Drop Text for      GetData, format %08x '%s', HRESULT is %08lx\n",
                          fetc.cfFormat, format_mime, hres);
             if (SUCCEEDED(hres)) {
                 const size_t bsize = GlobalSize(med.hGlobal);
                 const void *buffer = (void *)GlobalLock(med.hGlobal);
-                SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+                SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                              ". In Drop Text for   GlobalLock, format %08x '%s', memory (%lu) %p\n",
                              fetc.cfFormat, format_mime, (unsigned long)bsize, buffer);
                 if (buffer) {
@@ -1945,7 +1948,7 @@ static STDMETHODIMP SDLDropTarget_Drop(SDLDropTarget *target,
                     char *saveptr = NULL;
                     char *token = SDL_strtok_r(text, "\r\n", &saveptr);
                     while (token != NULL) {
-                        SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+                        SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                                      ". In Drop Text, text (%lu of %lu) '%s'\n",
                                      (unsigned long)SDL_strlen(token), (unsigned long)bsize, token);
                         SDL_SendDropText(target->window, (char *)token);
@@ -1970,25 +1973,25 @@ static STDMETHODIMP SDLDropTarget_Drop(SDLDropTarget *target,
         fetc.tymed = TYMED_HGLOBAL;
         const char *format_mime = "CF_UNICODETEXT";
         if (SUCCEEDED(pDataObject->lpVtbl->QueryGetData(pDataObject, &fetc))) {
-            SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+            SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                          ". In Drop Text for QueryGetData, format %08x '%s', success\n",
                          fetc.cfFormat, format_mime);
             STGMEDIUM med;
             HRESULT hres = pDataObject->lpVtbl->GetData(pDataObject, &fetc, &med);
-            SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+            SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                          ". In Drop Text for      GetData, format %08x '%s', HRESULT is %08lx\n",
                          fetc.cfFormat, format_mime, hres);
             if (SUCCEEDED(hres)) {
                 const size_t bsize = GlobalSize(med.hGlobal);
                 const void *buffer = (void *)GlobalLock(med.hGlobal);
-                SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+                SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                              ". In Drop Text for   GlobalLock, format %08x '%s', memory (%lu) %p\n",
                              fetc.cfFormat, format_mime, (unsigned long)bsize, buffer);
                 if (buffer) {
                     buffer = WIN_StringToUTF8((const wchar_t *)buffer);
                     if (buffer) {
                         const size_t lbuffer = SDL_strlen((const char *)buffer);
-                        SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+                        SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                                      ". In Drop Text for StringToUTF8, format %08x '%s', memory (%lu) %p\n",
                                      fetc.cfFormat, format_mime, (unsigned long)lbuffer, buffer);
                         char *text = (char *)SDL_malloc(lbuffer + sizeof(Uint32));
@@ -1997,7 +2000,7 @@ static STDMETHODIMP SDLDropTarget_Drop(SDLDropTarget *target,
                         char *saveptr = NULL;
                         char *token = SDL_strtok_r(text, "\r\n", &saveptr);
                         while (token != NULL) {
-                            SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+                            SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                                          ". In Drop Text, text (%lu of %lu) '%s'\n",
                                          (unsigned long)SDL_strlen(token), (unsigned long)lbuffer, token);
                             SDL_SendDropText(target->window, (char *)token);
@@ -2024,18 +2027,18 @@ static STDMETHODIMP SDLDropTarget_Drop(SDLDropTarget *target,
         fetc.tymed = TYMED_HGLOBAL;
         const char *format_mime = "CF_TEXT";
         if (SUCCEEDED(pDataObject->lpVtbl->QueryGetData(pDataObject, &fetc))) {
-            SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+            SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                          ". In Drop Text for QueryGetData, format %08x '%s', success\n",
                          fetc.cfFormat, format_mime);
             STGMEDIUM med;
             HRESULT hres = pDataObject->lpVtbl->GetData(pDataObject, &fetc, &med);
-            SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+            SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                          ". In Drop Text for      GetData, format %08x '%s', HRESULT is %08lx\n",
                          fetc.cfFormat, format_mime, hres);
             if (SUCCEEDED(hres)) {
                 const size_t bsize = GlobalSize(med.hGlobal);
                 const void *buffer = (void *)GlobalLock(med.hGlobal);
-                SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+                SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                              ". In Drop Text for   GlobalLock, format %08x '%s', memory (%lu) %p\n",
                              fetc.cfFormat, format_mime, (unsigned long)bsize, buffer);
                 if (buffer) {
@@ -2045,7 +2048,7 @@ static STDMETHODIMP SDLDropTarget_Drop(SDLDropTarget *target,
                     char *saveptr = NULL;
                     char *token = SDL_strtok_r(text, "\r\n", &saveptr);
                     while (token != NULL) {
-                        SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+                        SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                                      ". In Drop Text, text (%lu of %lu) '%s'\n",
                                      (unsigned long)SDL_strlen(token), (unsigned long)bsize, token);
                         SDL_SendDropText(target->window, (char *)token);
@@ -2070,18 +2073,18 @@ static STDMETHODIMP SDLDropTarget_Drop(SDLDropTarget *target,
         fetc.tymed = TYMED_HGLOBAL;
         const char *format_mime = "CF_HDROP";
         if (SUCCEEDED(pDataObject->lpVtbl->QueryGetData(pDataObject, &fetc))) {
-            SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+            SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                          ". In Drop File for QueryGetData, format %08x '%s', success\n",
                          fetc.cfFormat, format_mime);
             STGMEDIUM med;
             HRESULT hres = pDataObject->lpVtbl->GetData(pDataObject, &fetc, &med);
-            SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+            SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                          ". In Drop File for      GetData, format %08x '%s', HRESULT is %08lx\n",
                          fetc.cfFormat, format_mime, hres);
             if (SUCCEEDED(hres)) {
                 const size_t bsize = GlobalSize(med.hGlobal);
                 HDROP drop = (HDROP)GlobalLock(med.hGlobal);
-                SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+                SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                              ". In Drop File for   GlobalLock, format %08x '%s', memory (%lu) %p\n",
                              fetc.cfFormat, format_mime, (unsigned long)bsize, drop);
                 UINT count = DragQueryFile(drop, 0xFFFFFFFF, NULL, 0);
@@ -2091,7 +2094,7 @@ static STDMETHODIMP SDLDropTarget_Drop(SDLDropTarget *target,
                     if (buffer) {
                         if (DragQueryFile(drop, i, buffer, size)) {
                             char *file = WIN_StringToUTF8(buffer);
-                            SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+                            SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                                          ". In Drop File, file (%lu of %lu) '%s'\n",
                                          (unsigned long)SDL_strlen(file), (unsigned long)bsize, file);
                             SDL_SendDropFile(target->window, NULL, file);
@@ -2137,7 +2140,7 @@ void WIN_AcceptDragAndDrop(SDL_Window *window, bool accept)
                 data->drop_target = drop_target;
                 SDLDropTarget_AddRef(drop_target);
                 RegisterDragDrop(data->hwnd, (LPDROPTARGET)drop_target);
-                SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+                SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                              ". In Accept Drag and Drop, window %u, enabled Full OLE IDropTarget\n",
                              window->id);
             }
@@ -2145,13 +2148,13 @@ void WIN_AcceptDragAndDrop(SDL_Window *window, bool accept)
             RevokeDragDrop(data->hwnd);
             SDLDropTarget_Release(data->drop_target);
             data->drop_target = NULL;
-            SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+            SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                          ". In Accept Drag and Drop, window %u, disabled Full OLE IDropTarget\n",
                          window->id);
         }
     } else {
         DragAcceptFiles(data->hwnd, accept ? TRUE : FALSE);
-        SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
+        SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
                      ". In Accept Drag and Drop, window %u, %s Fallback WM_DROPFILES\n",
                      window->id, (accept ? "enabled" : "disabled"));
     }
diff --git a/libs/SDL3/src/video/x11/SDL_x11events.c b/libs/SDL3/src/video/x11/SDL_x11events.c
index 8d13c22c1..f0afe172c 100644
--- a/libs/SDL3/src/video/x11/SDL_x11events.c
+++ b/libs/SDL3/src/video/x11/SDL_x11events.c
@@ -894,6 +894,13 @@ void X11_HandleButtonPress(SDL_VideoDevice *_this, SDL_WindowData *windowdata, S
 #ifdef DEBUG_XEVENTS
     SDL_Log("window 0x%lx: ButtonPress (X11 button = %d)\n", windowdata->xwindow, button);
 #endif
+
+    SDL_Mouse *mouse = SDL_GetMouse();
+    if ((!mouse->relative_mode || mouse->relative_mode_warp) && (x != mouse->x || y != mouse->y)) {
+        X11_ProcessHitTest(_this, windowdata, x, y, false);
+        SDL_SendMouseMotion(0, window, mouseID, false, x, y);
+    }
+
     if (X11_IsWheelEvent(display, button, &xticks, &yticks)) {
         SDL_SendMouseWheel(0, window, mouseID, (float)-xticks, (float)yticks, SDL_MOUSEWHEEL_NORMAL);
     } else {
diff --git a/libs/SDL3/src/video/x11/SDL_x11opengles.c b/libs/SDL3/src/video/x11/SDL_x11opengles.c
index ebb455c37..caa2d0c4e 100644
--- a/libs/SDL3/src/video/x11/SDL_x11opengles.c
+++ b/libs/SDL3/src/video/x11/SDL_x11opengles.c
@@ -59,9 +59,9 @@ XVisualInfo *X11_GLES_GetVisual(SDL_VideoDevice *_this, Display *display, int sc
 {
 
     XVisualInfo *egl_visualinfo = NULL;
-    EGLint visual_id;
+    EGLint visual_id = 0;
     XVisualInfo vi_in;
-    int out_count;
+    int out_count = 0;
 
     if (!_this->egl_data) {
         // The EGL library wasn't loaded, SDL_GetError() should have info
@@ -71,8 +71,24 @@ XVisualInfo *X11_GLES_GetVisual(SDL_VideoDevice *_this, Display *display, int sc
     if (_this->egl_data->eglGetConfigAttrib(_this->egl_data->egl_display,
                                             _this->egl_data->egl_config,
                                             EGL_NATIVE_VISUAL_ID,
-                                            &visual_id) == EGL_FALSE ||
-        !visual_id) {
+                                            &visual_id) == EGL_FALSE) {
+        visual_id = 0;
+    }
+    if (visual_id != 0) {
+        vi_in.screen = screen;
+        vi_in.visualid = visual_id;
+        egl_visualinfo = X11_XGetVisualInfo(display, VisualScreenMask | VisualIDMask, &vi_in, &out_count);
+        if (transparent && egl_visualinfo) {
+            Uint32 format = X11_GetPixelFormatFromVisualInfo(display, egl_visualinfo);
+            if (!SDL_ISPIXELFORMAT_ALPHA(format)) {
+                // not transparent!
+                X11_XFree(egl_visualinfo);
+                egl_visualinfo = NULL;
+            }
+        }
+    }
+    
+    if(!egl_visualinfo) {
         // Use the default visual when all else fails
         vi_in.screen = screen;
         egl_visualinfo = X11_XGetVisualInfo(display,
@@ -95,12 +111,7 @@ XVisualInfo *X11_GLES_GetVisual(SDL_VideoDevice *_this, Display *display, int sc
                 }
             }
         }
-    } else {
-        vi_in.screen = screen;
-        vi_in.visualid = visual_id;
-        egl_visualinfo = X11_XGetVisualInfo(display, VisualScreenMask | VisualIDMask, &vi_in, &out_count);
     }
-
     return egl_visualinfo;
 }
 
diff --git a/libs/SDL3/src/video/yuv2rgb/yuv_rgb_common.h b/libs/SDL3/src/video/yuv2rgb/yuv_rgb_common.h
index 774292b0c..a4ef8eaeb 100644
--- a/libs/SDL3/src/video/yuv2rgb/yuv_rgb_common.h
+++ b/libs/SDL3/src/video/yuv2rgb/yuv_rgb_common.h
@@ -7,6 +7,7 @@ typedef enum
 {
     YCBCR_601_FULL,
     YCBCR_601_LIMITED,
+    YCBCR_709_FULL,
     YCBCR_709_LIMITED,
     YCBCR_2020_NCL_FULL,
 } YCbCrType;
diff --git a/libs/SDL3/src/video/yuv2rgb/yuv_rgb_internal.h b/libs/SDL3/src/video/yuv2rgb/yuv_rgb_internal.h
index 23ae70566..d5939ed65 100644
--- a/libs/SDL3/src/video/yuv2rgb/yuv_rgb_internal.h
+++ b/libs/SDL3/src/video/yuv2rgb/yuv_rgb_internal.h
@@ -40,22 +40,26 @@ typedef struct
 // for ITU-R BT.2020 values are assuming RGB is encoded using full 10-bit range ([0-1]<->[0-1023])
 // all values are rounded to the fourth decimal
 
-static const YUV2RGBParam YUV2RGB[4] = {
+static const YUV2RGBParam YUV2RGB[] = {
 	// ITU-T T.871 (JPEG)
 	{/*.y_shift=*/ 0, /*.y_factor=*/ V(1.0), /*.v_r_factor=*/ V(1.402), /*.u_g_factor=*/ -V(0.3441), /*.v_g_factor=*/ -V(0.7141), /*.u_b_factor=*/ V(1.772)},
 	// ITU-R BT.601-7
 	{/*.y_shift=*/ 16, /*.y_factor=*/ V(1.1644), /*.v_r_factor=*/ V(1.596), /*.u_g_factor=*/ -V(0.3918), /*.v_g_factor=*/ -V(0.813), /*.u_b_factor=*/ V(2.0172)},
+	// ITU-R BT.709-6 full range
+	{/*.y_shift=*/ 0, /*.y_factor=*/ V(1.0), /*.v_r_factor=*/ V(1.581), /*.u_g_factor=*/ -V(0.1881), /*.v_g_factor=*/ -V(0.47), /*.u_b_factor=*/ V(1.8629)},
 	// ITU-R BT.709-6
 	{/*.y_shift=*/ 16, /*.y_factor=*/ V(1.1644), /*.v_r_factor=*/ V(1.7927), /*.u_g_factor=*/ -V(0.2132), /*.v_g_factor=*/ -V(0.5329), /*.u_b_factor=*/ V(2.1124)},
 	// ITU-R BT.2020 10-bit full range
 	{/*.y_shift=*/ 0, /*.y_factor=*/ V(1.0), /*.v_r_factor=*/ V(1.4760), /*.u_g_factor=*/ -V(0.1647), /*.v_g_factor=*/ -V(0.5719), /*.u_b_factor=*/ V(1.8832) }
 };
 
-static const RGB2YUVParam RGB2YUV[4] = {
+static const RGB2YUVParam RGB2YUV[] = {
 	// ITU-T T.871 (JPEG)
 	{/*.y_shift=*/ 0, /*.matrix=*/ {{V(0.299), V(0.587), V(0.114)}, {-V(0.1687), -V(0.3313), V(0.5)}, {V(0.5), -V(0.4187), -V(0.0813)}}},
 	// ITU-R BT.601-7
 	{/*.y_shift=*/ 16, /*.matrix=*/ {{V(0.2568), V(0.5041), V(0.0979)}, {-V(0.1482), -V(0.291), V(0.4392)}, {V(0.4392), -V(0.3678), -V(0.0714)}}},
+	// ITU-R BT.709-6 full range
+	{/*.y_shift=*/ 0, /*.matrix=*/ {{V(0.2126), V(0.7152), V(0.0722)}, {-V(0.1141), -V(0.3839), V(0.498)}, {V(0.498), -V(0.4524), -V(0.0457)}}},
 	// ITU-R BT.709-6
 	{/*.y_shift=*/ 16, /*.matrix=*/ {{V(0.1826), V(0.6142), V(0.062)}, {-V(0.1006), -V(0.3386), V(0.4392)}, {V(0.4392), -V(0.3989), -V(0.0403)}}},
 	// ITU-R BT.2020 10-bit full range
diff --git a/libs/SDL3/test/CMakeLists.txt b/libs/SDL3/test/CMakeLists.txt
index a9def98fe..dc66200cc 100644
--- a/libs/SDL3/test/CMakeLists.txt
+++ b/libs/SDL3/test/CMakeLists.txt
@@ -148,7 +148,7 @@ macro(add_sdl_test_executable TARGET)
         set_property(TARGET ${TARGET} PROPERTY SDL_NONINTERACTIVE_TIMEOUT "${AST_NONINTERACTIVE_TIMEOUT}")
     endif()
     if(AST_NEEDS_RESOURCES)
-        if(PSP OR PS2)
+        if(PSP OR PS2 OR N3DS)
             add_custom_command(TARGET ${TARGET} POST_BUILD
                 COMMAND ${CMAKE_COMMAND} ARGS -E make_directory $<TARGET_FILE_DIR:${TARGET}>/sdl-${TARGET}
                 COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${RESOURCE_FILES} $<TARGET_FILE_DIR:${TARGET}>/sdl-${TARGET})
@@ -528,12 +528,11 @@ if(PSP)
 endif()
 
 if(N3DS)
-    set(ROMFS_DIR "${CMAKE_CURRENT_BINARY_DIR}/romfs")
-    file(COPY ${RESOURCE_FILES} DESTINATION "${ROMFS_DIR}")
-
     foreach(APP ${SDL_TEST_EXECUTABLES})
         get_target_property(TARGET_BINARY_DIR ${APP} BINARY_DIR)
+        set(ROMFS_DIR "${TARGET_BINARY_DIR}/sdl-${APP}")
         set(SMDH_FILE "${TARGET_BINARY_DIR}/${APP}.smdh")
+        file(MAKE_DIRECTORY ${ROMFS_DIR})
         ctr_generate_smdh("${SMDH_FILE}"
             NAME "SDL-${APP}"
             DESCRIPTION "SDL3 Test suite"
diff --git a/libs/SDL3/test/LICENSE.txt b/libs/SDL3/test/LICENSE.txt
new file mode 100644
index 000000000..0cad4d3fd
--- /dev/null
+++ b/libs/SDL3/test/LICENSE.txt
@@ -0,0 +1,41 @@
+Source code in this directory, unless otherwise noted, falls under the
+following license, which is different (more permissive) than SDL's usual
+license.
+
+/*
+  Copyright (C) 1997-2024 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely.
+*/
+
+
+This directory contains sample.wav, which is a sample from Will Provost's
+song, The Living Proof:
+
+     From the album The Living Proof
+     Publisher: 5 Guys Named Will
+     Copyright 1996 Will Provost
+
+You can get a copy of the full song (and album!) from iTunes...
+
+    https://itunes.apple.com/us/album/the-living-proof/id4153978
+
+or Amazon...
+
+    http://www.amazon.com/The-Living-Proof-Will-Provost/dp/B00004R8RH
+
+Thanks to Will for permitting us to distribute this sample with SDL!
+
+
+
+The .bmp files used by testaudio.c were made by AlDraw:
+
+https://linktr.ee/AlexDraw
+
+These bitmaps may be distributed as public domain files!
diff --git a/libs/SDL3/test/README b/libs/SDL3/test/README
deleted file mode 100644
index 85429e24d..000000000
--- a/libs/SDL3/test/README
+++ /dev/null
@@ -1,18 +0,0 @@
-
-This directory contains sample.wav, which is a sample from Will Provost's
-song, The Living Proof:
-
-     From the album The Living Proof
-     Publisher: 5 Guys Named Will
-     Copyright 1996 Will Provost
-
-You can get a copy of the full song (and album!) from iTunes...
-
-    https://itunes.apple.com/us/album/the-living-proof/id4153978
-
-or Amazon...
-
-    http://www.amazon.com/The-Living-Proof-Will-Provost/dp/B00004R8RH
-
-Thanks to Will for permitting us to distribute this sample with SDL!
-
diff --git a/libs/SDL3/test/childprocess.c b/libs/SDL3/test/childprocess.c
index dede17717..333fc3c97 100644
--- a/libs/SDL3/test/childprocess.c
+++ b/libs/SDL3/test/childprocess.c
@@ -13,6 +13,7 @@ int main(int argc, char *argv[]) {
     bool stdin_to_stdout = false;
     bool read_stdin = false;
     bool stdin_to_stderr = false;
+    SDL_IOStream *log_stdin = NULL;
     int exit_code = 0;
 
     state = SDLTest_CommonCreateState(argv, 0);
@@ -45,6 +46,15 @@ int main(int argc, char *argv[]) {
                     fprintf(stderr, "%s", argv[i + 1]);
                     consumed = 2;
                 }
+            } else if (SDL_strcmp(argv[i], "--log-stdin") == 0) {
+                if (i + 1 < argc) {
+                    log_stdin = SDL_IOFromFile(argv[i + 1], "w");
+                    if (!log_stdin) {
+                        fprintf(stderr, "Couldn't open %s\n", argv[i + 1]);
+                        return 2;
+                    }
+                    consumed = 2;
+                }
             } else if (SDL_strcmp(argv[i], "--exit-code") == 0) {
                 if (i + 1 < argc) {
                     char *endptr = NULL;
@@ -75,6 +85,7 @@ int main(int argc, char *argv[]) {
                 "[--print-arguments]",
                 "[--print-environment]",
                 "[--stdin]",
+                "[--log-stdin FILE]",
                 "[--stdin-to-stdout]",
                 "[--stdout TEXT]",
                 "[--stdin-to-stderr]",
@@ -135,6 +146,10 @@ int main(int argc, char *argv[]) {
                 }
                 break;
             }
+            if (log_stdin) {
+                SDL_WriteIO(log_stdin, buffer, result);
+                SDL_FlushIO(log_stdin);
+            }
             if (stdin_to_stdout) {
                 fwrite(buffer, 1, result, stdout);
                 fflush(stdout);
@@ -145,6 +160,10 @@ int main(int argc, char *argv[]) {
         }
     }
 
+    if (log_stdin) {
+        SDL_CloseIO(log_stdin);
+    }
+
     SDLTest_CommonDestroyState(state);
 
     return exit_code;
diff --git a/libs/SDL3/test/testaudio-art.txt b/libs/SDL3/test/testaudio-art.txt
deleted file mode 100644
index f30a3d24e..000000000
--- a/libs/SDL3/test/testaudio-art.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-The .bmp files used by testaudio.c were made by AlDraw:
-
-https://linktr.ee/AlexDraw
-
-They may be distributed as public domain files!
-
-
-
diff --git a/libs/SDL3/test/testautomation_mouse.c b/libs/SDL3/test/testautomation_mouse.c
index 057822a57..9efa630fa 100644
--- a/libs/SDL3/test/testautomation_mouse.c
+++ b/libs/SDL3/test/testautomation_mouse.c
@@ -512,7 +512,8 @@ static int SDLCALL mouse_getMouseFocus(void *arg)
     float x, y;
     SDL_Window *window;
     SDL_Window *focusWindow;
-    const bool video_driver_is_wayland = !SDL_strcmp(SDL_GetCurrentVideoDriver(), "wayland");
+    const char *xdg_session = SDL_getenv("XDG_SESSION_TYPE");
+    const bool env_is_wayland = !SDL_strcmp(xdg_session ? xdg_session : "", "wayland");
 
     /* Get focus - focus non-deterministic */
     focusWindow = SDL_GetMouseFocus();
@@ -523,9 +524,12 @@ static int SDLCALL mouse_getMouseFocus(void *arg)
     if (!window) {
         return TEST_ABORTED;
     }
+    
+    /* Delay a brief period to allow the window to actually appear on the desktop. */
+    SDL_Delay(100);
 
-    /* Wayland explicitly disallows warping the mouse pointer, so this test must be skipped. */
-    if (!video_driver_is_wayland) {
+    /* Warping the pointer when it is outside the window on a Wayland desktop usually doesn't work, so this test will be skipped. */
+    if (!env_is_wayland) {
         /* Mouse to random position inside window */
         x = (float)SDLTest_RandomIntegerInRange(1, w - 1);
         y = (float)SDLTest_RandomIntegerInRange(1, h - 1);
@@ -549,7 +553,7 @@ static int SDLCALL mouse_getMouseFocus(void *arg)
         SDL_WarpMouseInWindow(window, x, y);
         SDLTest_AssertPass("SDL_WarpMouseInWindow(...,%.f,%.f)", x, y);
     } else {
-        SDLTest_Log("Skipping mouse warp focus tests: Wayland does not support warping the mouse pointer");
+        SDLTest_Log("Skipping mouse warp focus tests: warping the mouse pointer when outside the window is unreliable on Wayland/XWayland");
     }
 
     /* Clean up test window */
diff --git a/libs/SDL3/test/testautomation_rect.c b/libs/SDL3/test/testautomation_rect.c
index 5c278e295..34673705a 100644
--- a/libs/SDL3/test/testautomation_rect.c
+++ b/libs/SDL3/test/testautomation_rect.c
@@ -93,6 +93,17 @@ static int SDLCALL rect_testIntersectRectAndLineFloat(void *arg)
     intersected = SDL_GetRectAndLineIntersectionFloat(&rect, &x1, &y1, &x2, &y2);
     validateIntersectRectAndLineFloatResults(intersected, true, &rect, x1, y1, x2, y2, 2.5f, 6.0f, 2.75f, 6.0f);
 
+    x1 = 456.0f;
+    y1 = 592.0f;
+    x2 = 160.0f;
+    y2 = 670.0f;
+    rect.x = 300.0f;
+    rect.y = 592.0f;
+    rect.w = 64.0f;
+    rect.h = 64.0f;
+    intersected = SDL_GetRectAndLineIntersectionFloat(&rect, &x1, &y1, &x2, &y2);
+    validateIntersectRectAndLineFloatResults(intersected, true, &rect, x1, y1, x2, y2, 364.0f, 616.243225f, 300.0f, 633.108093f);
+
     return TEST_COMPLETED;
 }
 
diff --git a/libs/SDL3/test/testautomation_stdlib.c b/libs/SDL3/test/testautomation_stdlib.c
index b3ed82ab7..a2ac67198 100644
--- a/libs/SDL3/test/testautomation_stdlib.c
+++ b/libs/SDL3/test/testautomation_stdlib.c
@@ -358,7 +358,7 @@ static int SDLCALL stdlib_snprintf(void *arg)
         "Check result value, expected: %d, got: %d", (int)SDL_strlen(expected), result);
 
     if (sizeof(void *) >= 8) {
-        result = SDL_snprintf(text, sizeof(text), "%p", (void *)0x1ba07bddf60L);
+        result = SDL_snprintf(text, sizeof(text), "%p", (void *)SDL_SINT64_C(0x1ba07bddf60));
         expected = "0x1ba07bddf60";
         expected2 = "000001BA07BDDF60";
         expected3 = "000001ba07bddf60";
@@ -913,9 +913,11 @@ static int SDLCALL stdlib_aligned_alloc(void *arg)
         }
         SDLTest_AssertCheck(ptr != NULL, "Check output, expected non-NULL, got: %p", ptr);
         SDLTest_AssertCheck((((size_t)ptr) % alignment) == 0, "Check output, expected aligned pointer, actual offset: %"SIZE_FORMAT, (((size_t)ptr) % alignment));
-        SDLTest_AssertPass("Filling memory to alignment value");
-        SDL_memset(ptr, 0xAA, alignment);
-        SDL_aligned_free(ptr);
+        if (ptr != NULL) {
+            SDLTest_AssertPass("Filling memory to alignment value");
+            SDL_memset(ptr, 0xAA, alignment);
+            SDL_aligned_free(ptr);
+        }
     }
 
     return TEST_COMPLETED;
diff --git a/libs/SDL3/test/testdrawchessboard.c b/libs/SDL3/test/testdrawchessboard.c
index c6a33548b..06429a265 100644
--- a/libs/SDL3/test/testdrawchessboard.c
+++ b/libs/SDL3/test/testdrawchessboard.c
@@ -12,7 +12,10 @@
    This file is created by : Nitin Jain (nitin.j4\samsung.com)
 */
 
-/* Sample program:  Draw a Chess Board  by using SDL_CreateSoftwareRenderer API */
+/* Sample program:  Draw a Chess Board  by using the SDL render API */
+
+/* This allows testing SDL_CreateSoftwareRenderer with the window surface API. Undefine it to use the accelerated renderer instead. */
+#define USE_SOFTWARE_RENDERER
 
 #include <SDL3/SDL.h>
 #include <SDL3/SDL_main.h>
@@ -24,9 +27,11 @@
 
 static SDL_Window *window;
 static SDL_Renderer *renderer;
-static SDL_Surface *surface;
 static int done;
 
+#ifdef USE_SOFTWARE_RENDERER
+static SDL_Surface *surface;
+#endif
 
 static void DrawChessBoard(void)
 {
@@ -57,7 +62,6 @@ static void DrawChessBoard(void)
             }
         }
     }
-    SDL_RenderPresent(renderer);
 }
 
 static void loop(void)
@@ -65,6 +69,7 @@ static void loop(void)
     SDL_Event e;
     while (SDL_PollEvent(&e)) {
 
+#ifdef USE_SOFTWARE_RENDERER
         /* Re-create when window surface has been resized */
         if (e.type == SDL_EVENT_WINDOW_PIXEL_SIZE_CHANGED) {
 
@@ -76,6 +81,7 @@ static void loop(void)
             SDL_SetRenderDrawColor(renderer, 0xFF, 0xFF, 0xFF, 0xFF);
             SDL_RenderClear(renderer);
         }
+#endif
 
         if (e.type == SDL_EVENT_QUIT) {
             done = 1;
@@ -94,11 +100,19 @@ static void loop(void)
         }
     }
 
+    /* Clear the rendering surface with the specified color */
+    SDL_SetRenderDrawColor(renderer, 0xFF, 0xFF, 0xFF, 0xFF);
+    SDL_RenderClear(renderer);
+
     DrawChessBoard();
 
+    SDL_RenderPresent(renderer);
+
+#ifdef USE_SOFTWARE_RENDERER
     /* Got everything on rendering surface,
        now Update the drawing image on window screen */
     SDL_UpdateWindowSurface(window);
+#endif
 }
 
 int main(int argc, char *argv[])
@@ -128,17 +142,17 @@ int main(int argc, char *argv[])
         SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Window creation fail : %s\n", SDL_GetError());
         return 1;
     }
+#ifdef USE_SOFTWARE_RENDERER
     surface = SDL_GetWindowSurface(window);
     renderer = SDL_CreateSoftwareRenderer(surface);
+#else
+    renderer = SDL_CreateRenderer(window, NULL);
+#endif
     if (!renderer) {
         SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Render creation for surface fail : %s\n", SDL_GetError());
         return 1;
     }
 
-    /* Clear the rendering surface with the specified color */
-    SDL_SetRenderDrawColor(renderer, 0xFF, 0xFF, 0xFF, 0xFF);
-    SDL_RenderClear(renderer);
-
     /* Draw the Image on rendering surface */
     done = 0;
 #ifdef SDL_PLATFORM_EMSCRIPTEN
diff --git a/libs/SDL3/test/testprocess.c b/libs/SDL3/test/testprocess.c
index 5f47010e1..425b44515 100644
--- a/libs/SDL3/test/testprocess.c
+++ b/libs/SDL3/test/testprocess.c
@@ -667,6 +667,8 @@ static int process_testMultiprocessStdinToStdout(void *arg)
     const char *process_args[] = {
         data->childprocess_path,
         "--stdin-to-stdout",
+        "--log-stdin",
+        NULL,
         NULL,
     };
     SDL_Process *process1 = NULL;
@@ -680,6 +682,7 @@ static int process_testMultiprocessStdinToStdout(void *arg)
     size_t total_read = 0;
     bool finished;
 
+    process_args[3] = "child1-stdin.txt";
     process1 = SDL_CreateProcess(process_args, true);
     SDLTest_AssertCheck(process1 != NULL, "SDL_CreateProcess()");
     if (!process1) {
@@ -692,6 +695,7 @@ static int process_testMultiprocessStdinToStdout(void *arg)
     SDL_SetPointerProperty(props, SDL_PROP_PROCESS_CREATE_STDIN_POINTER, SDL_GetPointerProperty(SDL_GetProcessProperties(process1), SDL_PROP_PROCESS_STDOUT_POINTER, NULL));
     SDL_SetNumberProperty(props, SDL_PROP_PROCESS_CREATE_STDOUT_NUMBER, SDL_PROCESS_STDIO_APP);
     SDLTest_AssertPass("About to call SDL_CreateProcessWithProperties");
+    process_args[3] = "child2-stdin.txt";
     process2 = SDL_CreateProcessWithProperties(props);
     SDL_DestroyProperties(props);
     SDLTest_AssertCheck(process2 != NULL, "SDL_CreateProcess()");
diff --git a/libs/SDL3/test/testshape.c b/libs/SDL3/test/testshape.c
index b42c7e8ae..c4f0988b3 100644
--- a/libs/SDL3/test/testshape.c
+++ b/libs/SDL3/test/testshape.c
@@ -60,7 +60,12 @@ int main(int argc, char *argv[])
             goto quit;
         }
     } else {
-        shape = SDL_LoadBMP_IO(SDL_IOFromConstMem(glass_bmp, sizeof(glass_bmp)), true);
+        SDL_IOStream *stream = SDL_IOFromConstMem(glass_bmp, sizeof(glass_bmp));
+        if (!stream) {
+            SDL_Log("Couldn't create iostream for glass.bmp: %s\n", SDL_GetError());
+            goto quit;
+        }
+        shape = SDL_LoadBMP_IO(stream, true);
         if (!shape) {
             SDL_Log("Couldn't load glass.bmp: %s\n", SDL_GetError());
             goto quit;
diff --git a/libs/SDL3/test/testtimer.c b/libs/SDL3/test/testtimer.c
index c98983c52..bdf7e908f 100644
--- a/libs/SDL3/test/testtimer.c
+++ b/libs/SDL3/test/testtimer.c
@@ -178,7 +178,7 @@ int main(int argc, char *argv[])
     /* Wait for the results to be seen */
     SDL_Delay(1 * 1000);
 
-    /* Check accuracy of precise delay */
+    /* Check accuracy of nanosecond delay */
     {
         Uint64 desired_delay = SDL_NS_PER_SECOND / 60;
         Uint64 actual_delay;
@@ -188,7 +188,7 @@ int main(int argc, char *argv[])
         SDL_DelayNS(1);
         now = SDL_GetTicksNS();
         actual_delay = (now - start);
-        SDL_Log("Minimum precise delay: %" SDL_PRIu64 " ns\n", actual_delay);
+        SDL_Log("Minimum nanosecond delay: %" SDL_PRIu64 " ns\n", actual_delay);
 
         SDL_Log("Timing 100 frames at 60 FPS\n");
         for (i = 0; i < 100; ++i) {
@@ -206,6 +206,34 @@ int main(int argc, char *argv[])
     /* Wait for the results to be seen */
     SDL_Delay(1 * 1000);
 
+    /* Check accuracy of precise delay */
+    {
+        Uint64 desired_delay = SDL_NS_PER_SECOND / 60;
+        Uint64 actual_delay;
+        Uint64 total_overslept = 0;
+
+        start = SDL_GetTicksNS();
+        SDL_DelayPrecise(1);
+        now = SDL_GetTicksNS();
+        actual_delay = (now - start);
+        SDL_Log("Minimum precise delay: %" SDL_PRIu64 " ns\n", actual_delay);
+
+        SDL_Log("Timing 100 frames at 60 FPS\n");
+        for (i = 0; i < 100; ++i) {
+            start = SDL_GetTicksNS();
+            SDL_DelayPrecise(desired_delay);
+            now = SDL_GetTicksNS();
+            actual_delay = (now - start);
+            if (actual_delay > desired_delay) {
+                total_overslept += (actual_delay - desired_delay);
+            }
+        }
+        SDL_Log("Overslept %.2f ms\n", (double)total_overslept / SDL_NS_PER_MS);
+    }
+
+    /* Wait for the results to be seen */
+    SDL_Delay(1 * 1000);
+
     /* Test multiple timers */
     SDL_Log("Testing multiple timers...\n");
     t1 = SDL_AddTimer(100, callback, (void *)1);
diff --git a/libs/SDL3/test/testyuv.c b/libs/SDL3/test/testyuv.c
index 2406ce784..35279af88 100644
--- a/libs/SDL3/test/testyuv.c
+++ b/libs/SDL3/test/testyuv.c
@@ -104,7 +104,7 @@ static bool verify_yuv_data(Uint32 format, SDL_Colorspace colorspace, const Uint
     return result;
 }
 
-static int run_automated_tests(int pattern_size, int extra_pitch)
+static bool run_automated_tests(int pattern_size, int extra_pitch)
 {
     const Uint32 formats[] = {
         SDL_PIXELFORMAT_YV12,
@@ -125,7 +125,7 @@ static int run_automated_tests(int pattern_size, int extra_pitch)
     SDL_Colorspace colorspace;
     const int tight_tolerance = 20;
     const int loose_tolerance = 333;
-    int result = -1;
+    bool result = false;
 
     if (!pattern || !yuv1 || !yuv2) {
         SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't allocate test surfaces");
@@ -230,7 +230,7 @@ static int run_automated_tests(int pattern_size, int extra_pitch)
         goto done;
     }
 
-    result = 0;
+    result = true;
 
 done:
     SDL_free(yuv1);
@@ -239,6 +239,129 @@ static int run_automated_tests(int pattern_size, int extra_pitch)
     return result;
 }
 
+static bool run_colorspace_test(void)
+{
+    bool result = false;
+    SDL_Window *window;
+    SDL_Renderer *renderer;
+    struct {
+        const char *name;
+        SDL_Colorspace colorspace;
+    } colorspaces[] = {
+#define COLORSPACE(X) { #X, X }
+        COLORSPACE(SDL_COLORSPACE_JPEG),
+#if 0 /* We don't support converting color primaries here */
+        COLORSPACE(SDL_COLORSPACE_BT601_LIMITED),
+        COLORSPACE(SDL_COLORSPACE_BT601_FULL),
+#endif
+        COLORSPACE(SDL_COLORSPACE_BT709_LIMITED),
+        COLORSPACE(SDL_COLORSPACE_BT709_FULL)
+#undef COLORSPACE
+    };
+    SDL_Surface *rgb = NULL;
+    SDL_Surface *yuv = NULL;
+    SDL_Texture *texture = NULL;
+    int allowed_error = 2;
+    int i;
+
+    if (!SDL_CreateWindowAndRenderer("testyuv", 320, 240, 0, &window, &renderer)) {
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create window and renderer: %s\n", SDL_GetError());
+        goto done;
+    }
+
+    rgb = SDL_CreateSurface(32, 32, SDL_PIXELFORMAT_XRGB8888);
+    if (!rgb) {
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create RGB surface: %s\n", SDL_GetError());
+        goto done;
+    }
+    SDL_FillSurfaceRect(rgb, NULL, SDL_MapSurfaceRGB(rgb, 255, 0, 0));
+
+    for (i = 0; i < SDL_arraysize(colorspaces); ++i) {
+        bool next = false;
+        Uint8 r, g, b, a;
+
+        SDL_Log("Checking colorspace %s\n", colorspaces[i].name);
+
+        yuv = SDL_ConvertSurfaceAndColorspace(rgb, SDL_PIXELFORMAT_NV12, NULL, colorspaces[i].colorspace, 0);
+        if (!yuv) {
+            SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create YUV surface: %s\n", SDL_GetError());
+            goto done;
+        }
+
+        if (!SDL_ReadSurfacePixel(yuv, 0, 0, &r, &g, &b, &a)) {
+            SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't read YUV surface: %s\n", SDL_GetError());
+            goto done;
+        }
+
+        if (SDL_abs((int)r - 255) > allowed_error ||
+            SDL_abs((int)g - 0) > allowed_error ||
+            SDL_abs((int)b - 0) > allowed_error) {
+            SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Failed color conversion, expected 255,0,0, got %d,%d,%d\n", r, g, b);
+        }
+
+        texture = SDL_CreateTextureFromSurface(renderer, yuv);
+        if (!texture) {
+            SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create YUV texture: %s\n", SDL_GetError());
+            goto done;
+        }
+
+        SDL_DestroySurface(yuv);
+        yuv = NULL;
+
+        SDL_RenderTexture(renderer, texture, NULL, NULL);
+        yuv = SDL_RenderReadPixels(renderer, NULL);
+
+        if (!SDL_ReadSurfacePixel(yuv, 0, 0, &r, &g, &b, &a)) {
+            SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't read YUV surface: %s\n", SDL_GetError());
+            goto done;
+        }
+
+        if (SDL_abs((int)r - 255) > allowed_error ||
+            SDL_abs((int)g - 0) > allowed_error ||
+            SDL_abs((int)b - 0) > allowed_error) {
+            SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Failed renderer color conversion, expected 255,0,0, got %d,%d,%d\n", r, g, b);
+        }
+
+        while (!next) {
+            SDL_Event event;
+            while (SDL_PollEvent(&event)) {
+                switch (event.type) {
+                case SDL_EVENT_KEY_DOWN:
+                    if (event.key.key == SDLK_ESCAPE) {
+                        result = true;
+                        goto done;
+                    }
+                    if (event.key.key == SDLK_SPACE) {
+                        next = true;
+                    }
+                    break;
+                case SDL_EVENT_QUIT:
+                    result = true;
+                    goto done;
+                }
+            }
+
+            SDL_RenderTexture(renderer, texture, NULL, NULL);
+            SDL_SetRenderDrawColor(renderer, 255, 255, 255, 255);
+            SDL_RenderDebugText(renderer, 4, 4, colorspaces[i].name);
+            SDL_RenderPresent(renderer);
+            SDL_Delay(10);
+        }
+
+        SDL_DestroyTexture(texture);
+        texture = NULL;
+    }
+
+    result = true;
+
+done:
+    SDL_DestroySurface(rgb);
+    SDL_DestroySurface(yuv);
+    SDL_DestroyTexture(texture);
+    SDL_Quit();
+    return result;
+}
+
 int main(int argc, char **argv)
 {
     struct
@@ -297,6 +420,7 @@ int main(int argc, char **argv)
     Uint64 then, now;
     int i, iterations = 100;
     bool should_run_automated_tests = false;
+    bool should_run_colorspace_test = false;
     SDLTest_CommonState *state;
 
     /* Initialize test framework */
@@ -377,6 +501,9 @@ int main(int argc, char **argv)
             } else if (SDL_strcmp(argv[i], "--automated") == 0) {
                 should_run_automated_tests = true;
                 consumed = 1;
+            } else if (SDL_strcmp(argv[i], "--colorspace-test") == 0) {
+                should_run_colorspace_test = true;
+                consumed = 1;
             } else if (!filename) {
                 filename = argv[i];
                 consumed = 1;
@@ -388,7 +515,7 @@ int main(int argc, char **argv)
                 "[--yv12|--iyuv|--yuy2|--uyvy|--yvyu|--nv12|--nv21]",
                 "[--rgb555|--rgb565|--rgb24|--argb|--abgr|--rgba|--bgra]",
                 "[--monochrome] [--luminance N%]",
-                "[--automated]",
+                "[--automated] [--colorspace-test]",
                 "[sample.bmp]",
                 NULL,
             };
@@ -407,13 +534,20 @@ int main(int argc, char **argv)
                         automated_test_params[i].pattern_size,
                         automated_test_params[i].extra_pitch,
                         automated_test_params[i].enable_intrinsics ? "enabled" : "disabled");
-            if (run_automated_tests(automated_test_params[i].pattern_size, automated_test_params[i].extra_pitch) < 0) {
+            if (!run_automated_tests(automated_test_params[i].pattern_size, automated_test_params[i].extra_pitch)) {
                 return 2;
             }
         }
         return 0;
     }
 
+    if (should_run_colorspace_test) {
+        if (!run_colorspace_test()) {
+            return 2;
+        }
+        return 0;
+    }
+
     filename = GetResourceFilename(filename, "testyuv.bmp");
     bmp = SDL_LoadBMP(filename);
     original = SDL_ConvertSurface(bmp, SDL_PIXELFORMAT_RGB24);