[3.0] Update to SDL 3.2.4 (#2423)

* Update to SDL 3.2.4 * Fix android build * Fix android build harder * Update native binaries for cc027fc * Note to self: need to fix build checks for native lib commits --------- Co-authored-by: The Silk.NET Automaton <[email protected]>
dotnet · Feb 11, 2025 · 871f25e · 871f25e
1 parent 1b87a6b
commit 871f25e
Show file tree

Hide file tree

Showing 36 changed files with 4,943 additions and 2,488 deletions.
diff --git a/.silktouch/91c9aa14a031651f.stout b/.silktouch/91c9aa14a031651f.stout
diff --git a/eng/submodules/sdl b/eng/submodules/sdl
diff --git a/sources/SDL/Native/android/SDL3.jar b/sources/SDL/Native/android/SDL3.jar
diff --git a/sources/SDL/Native/android/proguard.txt b/sources/SDL/Native/android/proguard.txt
@@ -36,6 +36,7 @@
     int messageboxShowMessageBox(int, java.lang.String, java.lang.String, int[], int[], java.lang.String[], int[]);
     void minimizeWindow();
     boolean openURL(java.lang.String);
+    void onNativePen(int, int, int , float , float , float);
     void requestPermission(java.lang.String, int);
     boolean showToast(java.lang.String, int, int, int, int);
     boolean sendMessage(int, int);

diff --git a/sources/SDL/Native/build-android.sh b/sources/SDL/Native/build-android.sh
@@ -9,6 +9,8 @@ if [ ! -z "$GITHUB_ACTIONS" ]; then
   # NDK already installed: https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md
   sdkmanager=( /usr/local/lib/android/sdk/cmdline-tools/*/bin/sdkmanager )
   ${sdkmanager[-1]} --install "platforms;android-19"
+  sudo add-apt-repository ppa:deadsnakes/ppa
+  sudo apt update
   sudo apt install python3.11 ninja-build
   python="python3.11"
 fi

diff --git a/sources/SDL/Native/runtimes/android-arm/native/libSDL3.so b/sources/SDL/Native/runtimes/android-arm/native/libSDL3.so
diff --git a/sources/SDL/Native/runtimes/android-arm64/native/libSDL3.so b/sources/SDL/Native/runtimes/android-arm64/native/libSDL3.so
diff --git a/sources/SDL/Native/runtimes/android-x64/native/libSDL3.so b/sources/SDL/Native/runtimes/android-x64/native/libSDL3.so
diff --git a/sources/SDL/Native/runtimes/android-x86/native/libSDL3.so b/sources/SDL/Native/runtimes/android-x86/native/libSDL3.so
diff --git a/sources/SDL/Native/runtimes/ios/native/libSDL3.a b/sources/SDL/Native/runtimes/ios/native/libSDL3.a
diff --git a/sources/SDL/Native/runtimes/iossimulator/native/libSDL3.a b/sources/SDL/Native/runtimes/iossimulator/native/libSDL3.a
diff --git a/sources/SDL/Native/runtimes/linux-arm/native/libSDL3.so b/sources/SDL/Native/runtimes/linux-arm/native/libSDL3.so
diff --git a/sources/SDL/Native/runtimes/linux-arm64/native/libSDL3.so b/sources/SDL/Native/runtimes/linux-arm64/native/libSDL3.so
diff --git a/sources/SDL/Native/runtimes/linux-x64/native/libSDL3.so b/sources/SDL/Native/runtimes/linux-x64/native/libSDL3.so
diff --git a/sources/SDL/Native/runtimes/osx/native/libSDL3.dylib b/sources/SDL/Native/runtimes/osx/native/libSDL3.dylib
diff --git a/sources/SDL/Native/runtimes/tvos/native/libSDL3.a b/sources/SDL/Native/runtimes/tvos/native/libSDL3.a
diff --git a/sources/SDL/Native/runtimes/win-arm64/native/SDL3.dll b/sources/SDL/Native/runtimes/win-arm64/native/SDL3.dll
diff --git a/sources/SDL/Native/runtimes/win-x64/native/SDL3.dll b/sources/SDL/Native/runtimes/win-x64/native/SDL3.dll
diff --git a/sources/SDL/Native/version.txt b/sources/SDL/Native/version.txt
@@ -1,2 +1 @@
-3.1.6-preview
-
+3.2.4
diff --git a/sources/SDL/SDL/SDL3/BlendMode.gen.cs b/sources/SDL/SDL/SDL3/BlendMode.gen.cs
@@ -17,5 +17,5 @@ public enum BlendMode : uint
     AddPremultiplied = 0x00000020U,
     Mod = 0x00000004U,
     Mul = 0x00000008U,
-    Invalid = 0x7FFFFFFFU
+    Invalid = 0x7FFFFFFFU,
 }
diff --git a/sources/SDL/SDL/SDL3/ClipboardEvent.gen.cs b/sources/SDL/SDL/SDL3/ClipboardEvent.gen.cs
@@ -21,7 +21,7 @@ public unsafe partial struct ClipboardEvent
     public byte Owner;
 
     [NativeTypeName("Sint32")]
-    public int NMimeTypes;
+    public int NumMimeTypes;
 
     [NativeTypeName("const char **")]
     public sbyte** MimeTypes;

diff --git a/sources/SDL/SDL/SDL3/Event.gen.cs b/sources/SDL/SDL/SDL3/Event.gen.cs
@@ -116,6 +116,9 @@ public partial struct Event
     [FieldOffset(0)]
     public PenAxisEvent Paxis;
 
+    [FieldOffset(0)]
+    public RenderEvent Render;
+
     [FieldOffset(0)]
     public DropEvent Drop;
 

diff --git a/sources/SDL/SDL/SDL3/EventType.gen.cs b/sources/SDL/SDL/SDL3/EventType.gen.cs
@@ -94,6 +94,7 @@ public enum EventType : uint
     FingerDown = 0x700,
     FingerUp,
     FingerMotion,
+    FingerCanceled,
     ClipboardUpdate = 0x900,
     DropFile = 0x1000,
     DropText,

diff --git a/sources/SDL/SDL/SDL3/FileDialogType.gen.cs b/sources/SDL/SDL/SDL3/FileDialogType.gen.cs
@@ -0,0 +1,16 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// Ported from SDL.h and corresponding dependencies of SDL3.
+// Original source is Copyright (C) 1997-2024 Sam Lantinga. Licensed under the zlib license.
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+namespace Silk.NET.SDL;
+
+[NativeTypeName("unsigned int")]
+public enum FileDialogType : uint
+{
+    Openfile,
+    Savefile,
+    Openfolder,
+}
diff --git a/sources/SDL/SDL/SDL3/GPUSwapchainComposition.gen.cs b/sources/SDL/SDL/SDL3/GPUSwapchainComposition.gen.cs
@@ -13,5 +13,5 @@ public enum GPUSwapchainComposition : uint
     Sdr,
     SdrLinear,
     HdrExtendedLinear,
-    Hdr10St2048,
+    Hdr10St2084,
 }
diff --git a/sources/SDL/SDL/SDL3/GamepadBinding.gen.cs b/sources/SDL/SDL/SDL3/GamepadBinding.gen.cs
@@ -11,10 +11,10 @@ public partial struct GamepadBinding
 {
     public GamepadBindingType InputType;
 
-    [NativeTypeName("__AnonymousRecord_SDL_gamepad_L247_C5")]
+    [NativeTypeName("__AnonymousRecord_SDL_gamepad_L265_C5")]
     public GamepadBindingInput Input;
     public GamepadBindingType OutputType;
 
-    [NativeTypeName("__AnonymousRecord_SDL_gamepad_L267_C5")]
+    [NativeTypeName("__AnonymousRecord_SDL_gamepad_L285_C5")]
     public GamepadBindingOutput Output;
 }
diff --git a/sources/SDL/SDL/SDL3/GamepadBindingInput.gen.cs b/sources/SDL/SDL/SDL3/GamepadBindingInput.gen.cs
@@ -15,10 +15,10 @@ public partial struct GamepadBindingInput
     public int Button;
 
     [FieldOffset(0)]
-    [NativeTypeName("__AnonymousRecord_SDL_gamepad_L251_C9")]
+    [NativeTypeName("__AnonymousRecord_SDL_gamepad_L269_C9")]
     public GamepadBindingInputAxis Axis;
 
     [FieldOffset(0)]
-    [NativeTypeName("__AnonymousRecord_SDL_gamepad_L258_C9")]
+    [NativeTypeName("__AnonymousRecord_SDL_gamepad_L276_C9")]
     public GamepadBindingInputHat Hat;
 }
diff --git a/sources/SDL/SDL/SDL3/GamepadBindingOutput.gen.cs b/sources/SDL/SDL/SDL3/GamepadBindingOutput.gen.cs
@@ -15,6 +15,6 @@ public partial struct GamepadBindingOutput
     public GamepadButton Button;
 
     [FieldOffset(0)]
-    [NativeTypeName("__AnonymousRecord_SDL_gamepad_L271_C9")]
+    [NativeTypeName("__AnonymousRecord_SDL_gamepad_L289_C9")]
     public GamepadBindingOutputAxis Axis;
 }