Skip to content

[3.0] Update to SDL 3.2.4 #2423

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 5 commits into from
Feb 11, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified .silktouch/91c9aa14a031651f.stout
Binary file not shown.
2 changes: 1 addition & 1 deletion eng/submodules/sdl
Submodule sdl updated 1382 files
Binary file modified sources/SDL/Native/android/SDL3.jar
Binary file not shown.
1 change: 1 addition & 0 deletions sources/SDL/Native/android/proguard.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 2 additions & 0 deletions sources/SDL/Native/build-android.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file modified sources/SDL/Native/runtimes/android-arm/native/libSDL3.so
Binary file not shown.
Binary file modified sources/SDL/Native/runtimes/android-arm64/native/libSDL3.so
Binary file not shown.
Binary file modified sources/SDL/Native/runtimes/android-x64/native/libSDL3.so
Binary file not shown.
Binary file modified sources/SDL/Native/runtimes/android-x86/native/libSDL3.so
Binary file not shown.
Binary file modified sources/SDL/Native/runtimes/ios/native/libSDL3.a
Binary file not shown.
Binary file modified sources/SDL/Native/runtimes/iossimulator/native/libSDL3.a
Binary file not shown.
Binary file modified sources/SDL/Native/runtimes/linux-arm/native/libSDL3.so
Binary file not shown.
Binary file modified sources/SDL/Native/runtimes/linux-arm64/native/libSDL3.so
Binary file not shown.
Binary file modified sources/SDL/Native/runtimes/linux-x64/native/libSDL3.so
Binary file not shown.
Binary file modified sources/SDL/Native/runtimes/osx/native/libSDL3.dylib
Binary file not shown.
Binary file modified sources/SDL/Native/runtimes/tvos/native/libSDL3.a
Binary file not shown.
Binary file modified sources/SDL/Native/runtimes/win-arm64/native/SDL3.dll
Binary file not shown.
Binary file modified sources/SDL/Native/runtimes/win-x64/native/SDL3.dll
Binary file not shown.
3 changes: 1 addition & 2 deletions sources/SDL/Native/version.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
3.1.6-preview

3.2.4
2 changes: 1 addition & 1 deletion sources/SDL/SDL/SDL3/BlendMode.gen.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ public enum BlendMode : uint
AddPremultiplied = 0x00000020U,
Mod = 0x00000004U,
Mul = 0x00000008U,
Invalid = 0x7FFFFFFFU
Invalid = 0x7FFFFFFFU,
}
2 changes: 1 addition & 1 deletion sources/SDL/SDL/SDL3/ClipboardEvent.gen.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 3 additions & 0 deletions sources/SDL/SDL/SDL3/Event.gen.cs
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,9 @@ public partial struct Event
[FieldOffset(0)]
public PenAxisEvent Paxis;

[FieldOffset(0)]
public RenderEvent Render;

[FieldOffset(0)]
public DropEvent Drop;

Expand Down
1 change: 1 addition & 0 deletions sources/SDL/SDL/SDL3/EventType.gen.cs
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ public enum EventType : uint
FingerDown = 0x700,
FingerUp,
FingerMotion,
FingerCanceled,
ClipboardUpdate = 0x900,
DropFile = 0x1000,
DropText,
Expand Down
16 changes: 16 additions & 0 deletions sources/SDL/SDL/SDL3/FileDialogType.gen.cs
Original file line number Diff line number Diff line change
@@ -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,
}
2 changes: 1 addition & 1 deletion sources/SDL/SDL/SDL3/GPUSwapchainComposition.gen.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ public enum GPUSwapchainComposition : uint
Sdr,
SdrLinear,
HdrExtendedLinear,
Hdr10St2048,
Hdr10St2084,
}
4 changes: 2 additions & 2 deletions sources/SDL/SDL/SDL3/GamepadBinding.gen.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
4 changes: 2 additions & 2 deletions sources/SDL/SDL/SDL3/GamepadBindingInput.gen.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
2 changes: 1 addition & 1 deletion sources/SDL/SDL/SDL3/GamepadBindingOutput.gen.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Loading
Loading