Skip to content

Commit 871f25e

Browse files
Perkseydotnet-bot
andauthored
[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 <9011267+dotnet-bot@users.noreply.github.com>
1 parent 1b87a6b commit 871f25e

36 files changed

+4943
-2488
lines changed

.silktouch/91c9aa14a031651f.stout

3.01 KB
Binary file not shown.

eng/submodules/sdl

Submodule sdl updated 1382 files

sources/SDL/Native/android/SDL3.jar

887 Bytes
Binary file not shown.

sources/SDL/Native/android/proguard.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
int messageboxShowMessageBox(int, java.lang.String, java.lang.String, int[], int[], java.lang.String[], int[]);
3737
void minimizeWindow();
3838
boolean openURL(java.lang.String);
39+
void onNativePen(int, int, int , float , float , float);
3940
void requestPermission(java.lang.String, int);
4041
boolean showToast(java.lang.String, int, int, int, int);
4142
boolean sendMessage(int, int);

sources/SDL/Native/build-android.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ if [ ! -z "$GITHUB_ACTIONS" ]; then
99
# NDK already installed: https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md
1010
sdkmanager=( /usr/local/lib/android/sdk/cmdline-tools/*/bin/sdkmanager )
1111
${sdkmanager[-1]} --install "platforms;android-19"
12+
sudo add-apt-repository ppa:deadsnakes/ppa
13+
sudo apt update
1214
sudo apt install python3.11 ninja-build
1315
python="python3.11"
1416
fi
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

sources/SDL/Native/version.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
3.1.6-preview
2-
1+
3.2.4

sources/SDL/SDL/SDL3/BlendMode.gen.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ public enum BlendMode : uint
1717
AddPremultiplied = 0x00000020U,
1818
Mod = 0x00000004U,
1919
Mul = 0x00000008U,
20-
Invalid = 0x7FFFFFFFU
20+
Invalid = 0x7FFFFFFFU,
2121
}

sources/SDL/SDL/SDL3/ClipboardEvent.gen.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public unsafe partial struct ClipboardEvent
2121
public byte Owner;
2222

2323
[NativeTypeName("Sint32")]
24-
public int NMimeTypes;
24+
public int NumMimeTypes;
2525

2626
[NativeTypeName("const char **")]
2727
public sbyte** MimeTypes;

sources/SDL/SDL/SDL3/Event.gen.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,9 @@ public partial struct Event
116116
[FieldOffset(0)]
117117
public PenAxisEvent Paxis;
118118

119+
[FieldOffset(0)]
120+
public RenderEvent Render;
121+
119122
[FieldOffset(0)]
120123
public DropEvent Drop;
121124

sources/SDL/SDL/SDL3/EventType.gen.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ public enum EventType : uint
9494
FingerDown = 0x700,
9595
FingerUp,
9696
FingerMotion,
97+
FingerCanceled,
9798
ClipboardUpdate = 0x900,
9899
DropFile = 0x1000,
99100
DropText,
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
// Ported from SDL.h and corresponding dependencies of SDL3.
4+
// Original source is Copyright (C) 1997-2024 Sam Lantinga. Licensed under the zlib license.
5+
using System.Runtime.CompilerServices;
6+
using System.Runtime.InteropServices;
7+
8+
namespace Silk.NET.SDL;
9+
10+
[NativeTypeName("unsigned int")]
11+
public enum FileDialogType : uint
12+
{
13+
Openfile,
14+
Savefile,
15+
Openfolder,
16+
}

sources/SDL/SDL/SDL3/GPUSwapchainComposition.gen.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ public enum GPUSwapchainComposition : uint
1313
Sdr,
1414
SdrLinear,
1515
HdrExtendedLinear,
16-
Hdr10St2048,
16+
Hdr10St2084,
1717
}

sources/SDL/SDL/SDL3/GamepadBinding.gen.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ public partial struct GamepadBinding
1111
{
1212
public GamepadBindingType InputType;
1313

14-
[NativeTypeName("__AnonymousRecord_SDL_gamepad_L247_C5")]
14+
[NativeTypeName("__AnonymousRecord_SDL_gamepad_L265_C5")]
1515
public GamepadBindingInput Input;
1616
public GamepadBindingType OutputType;
1717

18-
[NativeTypeName("__AnonymousRecord_SDL_gamepad_L267_C5")]
18+
[NativeTypeName("__AnonymousRecord_SDL_gamepad_L285_C5")]
1919
public GamepadBindingOutput Output;
2020
}

sources/SDL/SDL/SDL3/GamepadBindingInput.gen.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ public partial struct GamepadBindingInput
1515
public int Button;
1616

1717
[FieldOffset(0)]
18-
[NativeTypeName("__AnonymousRecord_SDL_gamepad_L251_C9")]
18+
[NativeTypeName("__AnonymousRecord_SDL_gamepad_L269_C9")]
1919
public GamepadBindingInputAxis Axis;
2020

2121
[FieldOffset(0)]
22-
[NativeTypeName("__AnonymousRecord_SDL_gamepad_L258_C9")]
22+
[NativeTypeName("__AnonymousRecord_SDL_gamepad_L276_C9")]
2323
public GamepadBindingInputHat Hat;
2424
}

sources/SDL/SDL/SDL3/GamepadBindingOutput.gen.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ public partial struct GamepadBindingOutput
1515
public GamepadButton Button;
1616

1717
[FieldOffset(0)]
18-
[NativeTypeName("__AnonymousRecord_SDL_gamepad_L271_C9")]
18+
[NativeTypeName("__AnonymousRecord_SDL_gamepad_L289_C9")]
1919
public GamepadBindingOutputAxis Axis;
2020
}

0 commit comments

Comments
 (0)