Merge pull request #266 from Susko3/fix-SDL_mixer-friendly-overloads

Fix SDL_mixer friendly overloads not generating

External/SDL

@@ -1 +1 @@
-Subproject commit a882afafe55501711593d96f8f0f59f0e3adf3ee
+Subproject commit 8e644111c2220e654f53de4ea0aa3afdfc7813c5

External/SDL_image

@@ -1 +1 @@
-Subproject commit 07f8eeba01705497a8bc1d7892b4bef54820afc7
+Subproject commit 13ec6e9be1d69d2a989ec1fc4f09e8743ef3932d

External/SDL_mixer

@@ -1 +1 @@
-Subproject commit 4182794ea45fe28568728670c6f1583855d0e85c
+Subproject commit 7d6e46ad28cc33ad1e87a46df739a7cba47f57fa

External/SDL_ttf

@@ -1 +1 @@
-Subproject commit cb303d4eb7838122b04b2d6f41c45faff0598374
+Subproject commit d929bc0d84bfaf3a71ec7f6be27aeb466380c1a0

SDL3-CS.SourceGeneration/UnfriendlyMethodFinder.cs

@@ -15,7 +15,7 @@ namespace SDL.SourceGeneration
     {
         public readonly Dictionary<string, List<GeneratedMethod>> Methods = new Dictionary<string, List<GeneratedMethod>>();
 
-        private static readonly string[] sdlPrefixes = ["SDL_", "TTF_", "IMG_", "Mix_"];
+        private static readonly string[] sdlPrefixes = ["SDL_", "TTF_", "IMG_", "MIX_"];
 
         /// <summary>
         /// Checks whether the method is from any SDL library.

SDL3-CS.Tests/TestError.cs

@@ -0,0 +1,25 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using NUnit.Framework;
+
+namespace SDL.Tests
+{
+    [TestFixture]
+    public class TestError
+    {
+        [Test]
+        public void TestUnsupported()
+        {
+            Assert.That((bool)SDL3.SDL_Unsupported(), Is.False);
+            Assert.That(SDL3.SDL_GetError(), Is.EqualTo("That operation is not supported"));
+        }
+
+        [Test]
+        public void TestInvalidParam()
+        {
+            Assert.That((bool)SDL3.SDL_InvalidParamError("test"), Is.False);
+            Assert.That(SDL3.SDL_GetError(), Is.EqualTo("Parameter 'test' is invalid"));
+        }
+    }
+}

SDL3-CS.Tests/TestMixer.cs

@@ -0,0 +1,41 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using NUnit.Framework;
+using static SDL.SDL3_mixer;
+using static SDL.SDL3;
+
+namespace SDL.Tests
+{
+    [TestFixture]
+    public class TestMixer
+    {
+        [Test]
+        public unsafe void TestBasic()
+        {
+            SDL_Init(0);
+
+            bool init = MIX_Init();
+
+            try
+            {
+                Assert.That(init, Is.True, SDL_GetError);
+                Assert.That(MIX_Version(), Is.EqualTo(SDL_MIXER_VERSION));
+
+                Assume.That(MIX_GetNumAudioDecoders() > 0);
+                string? name = MIX_GetAudioDecoder(0);
+                Assert.That(name, Is.Not.Null, SDL_GetError);
+
+                Assume.That(@"C:\Windows\Media\Windows Logon.wav", Does.Exist);
+                var decoder = MIX_CreateAudioDecoder(@"C:\Windows\Media\Windows Logon.wav", 0);
+                Assert.That(decoder != null, SDL_GetError);
+                MIX_DestroyAudioDecoder(decoder);
+            }
+            finally
+            {
+                MIX_Quit();
+                SDL_Quit();
+            }
+        }
+    }
+}

SDL3-CS/SDL3/ClangSharp/SDL_hints.g.cs

@@ -496,6 +496,9 @@ namespace SDL
         [NativeTypeName("#define SDL_HINT_MAC_SCROLL_MOMENTUM \"SDL_MAC_SCROLL_MOMENTUM\"")]
         public static ReadOnlySpan<byte> SDL_HINT_MAC_SCROLL_MOMENTUM => "SDL_MAC_SCROLL_MOMENTUM"u8;
 
+        [NativeTypeName("#define SDL_HINT_MAC_PRESS_AND_HOLD \"SDL_MAC_PRESS_AND_HOLD\"")]
+        public static ReadOnlySpan<byte> SDL_HINT_MAC_PRESS_AND_HOLD => "SDL_MAC_PRESS_AND_HOLD"u8;
+
         [NativeTypeName("#define SDL_HINT_MAIN_CALLBACK_RATE \"SDL_MAIN_CALLBACK_RATE\"")]
         public static ReadOnlySpan<byte> SDL_HINT_MAIN_CALLBACK_RATE => "SDL_MAIN_CALLBACK_RATE"u8;
 

SDL3-CS/SDL3/ClangSharp/SDL_pen.g.cs

@@ -72,5 +72,8 @@ namespace SDL
 
         [NativeTypeName("#define SDL_PEN_INPUT_ERASER_TIP (1u << 30)")]
         public const uint SDL_PEN_INPUT_ERASER_TIP = (1U << 30);
+
+        [NativeTypeName("#define SDL_PEN_INPUT_IN_PROXIMITY (1u << 31)")]
+        public const uint SDL_PEN_INPUT_IN_PROXIMITY = (1U << 31);
     }
 }

SDL3-CS/SDL3/ClangSharp/SDL_video.g.cs

@@ -692,6 +692,9 @@ namespace SDL
         [NativeTypeName("#define SDL_PROP_DISPLAY_WAYLAND_WL_OUTPUT_POINTER \"SDL.display.wayland.wl_output\"")]
         public static ReadOnlySpan<byte> SDL_PROP_DISPLAY_WAYLAND_WL_OUTPUT_POINTER => "SDL.display.wayland.wl_output"u8;
 
+        [NativeTypeName("#define SDL_PROP_DISPLAY_WINDOWS_HMONITOR_POINTER \"SDL.display.windows.hmonitor\"")]
+        public static ReadOnlySpan<byte> SDL_PROP_DISPLAY_WINDOWS_HMONITOR_POINTER => "SDL.display.windows.hmonitor"u8;
+
         [NativeTypeName("#define SDL_PROP_WINDOW_CREATE_ALWAYS_ON_TOP_BOOLEAN \"SDL.window.create.always_on_top\"")]
         public static ReadOnlySpan<byte> SDL_PROP_WINDOW_CREATE_ALWAYS_ON_TOP_BOOLEAN => "SDL.window.create.always_on_top"u8;
 
@@ -779,6 +782,9 @@ namespace SDL
         [NativeTypeName("#define SDL_PROP_WINDOW_CREATE_COCOA_VIEW_POINTER \"SDL.window.create.cocoa.view\"")]
         public static ReadOnlySpan<byte> SDL_PROP_WINDOW_CREATE_COCOA_VIEW_POINTER => "SDL.window.create.cocoa.view"u8;
 
+        [NativeTypeName("#define SDL_PROP_WINDOW_CREATE_WINDOWSCENE_POINTER \"SDL.window.create.uikit.windowscene\"")]
+        public static ReadOnlySpan<byte> SDL_PROP_WINDOW_CREATE_WINDOWSCENE_POINTER => "SDL.window.create.uikit.windowscene"u8;
+
         [NativeTypeName("#define SDL_PROP_WINDOW_CREATE_WAYLAND_SURFACE_ROLE_CUSTOM_BOOLEAN \"SDL.window.create.wayland.surface_role_custom\"")]
         public static ReadOnlySpan<byte> SDL_PROP_WINDOW_CREATE_WAYLAND_SURFACE_ROLE_CUSTOM_BOOLEAN => "SDL.window.create.wayland.surface_role_custom"u8;
 

SDL3-CS/SDL3/SDL_error.cs

@@ -8,14 +8,14 @@ namespace SDL
         [Macro]
         public static unsafe SDLBool SDL_Unsupported()
         {
-            fixed (byte* fmt = "That operation is not supported"u8)
+            fixed (byte* fmt = "That operation is not supported\0"u8)
                 return SDL_SetError(fmt, __arglist());
         }
 
         [Macro]
         public static unsafe SDLBool SDL_InvalidParamError([NativeTypeName("const char *")] byte* param)
         {
-            fixed (byte* fmt = "Parameter '%s' is invalid"u8)
+            fixed (byte* fmt = "Parameter '%s' is invalid\0"u8)
                 return SDL_SetError(fmt, __arglist(param));
         }
     }

SDL3-CS/SDL3/SDL_pen.cs

@@ -19,6 +19,7 @@ namespace SDL
         SDL_PEN_INPUT_BUTTON_4 = SDL3.SDL_PEN_INPUT_BUTTON_4,
         SDL_PEN_INPUT_BUTTON_5 = SDL3.SDL_PEN_INPUT_BUTTON_5,
         SDL_PEN_INPUT_ERASER_TIP = SDL3.SDL_PEN_INPUT_ERASER_TIP,
+        SDL_PEN_INPUT_IN_PROXIMITY = SDL3.SDL_PEN_INPUT_IN_PROXIMITY,
     }
 
     public static partial class SDL3

SDL3-CS/SDL3/SDL_video.cs

@@ -28,8 +28,10 @@ namespace SDL
         SDL_WINDOW_INPUT_FOCUS = SDL3.SDL_WINDOW_INPUT_FOCUS,
         SDL_WINDOW_MOUSE_FOCUS = SDL3.SDL_WINDOW_MOUSE_FOCUS,
         SDL_WINDOW_EXTERNAL = SDL3.SDL_WINDOW_EXTERNAL,
+        SDL_WINDOW_MODAL = SDL3.SDL_WINDOW_MODAL,
         SDL_WINDOW_HIGH_PIXEL_DENSITY = SDL3.SDL_WINDOW_HIGH_PIXEL_DENSITY,
         SDL_WINDOW_MOUSE_CAPTURE = SDL3.SDL_WINDOW_MOUSE_CAPTURE,
+        SDL_WINDOW_MOUSE_RELATIVE_MODE = SDL3.SDL_WINDOW_MOUSE_RELATIVE_MODE,
         SDL_WINDOW_ALWAYS_ON_TOP = SDL3.SDL_WINDOW_ALWAYS_ON_TOP,
         SDL_WINDOW_UTILITY = SDL3.SDL_WINDOW_UTILITY,
         SDL_WINDOW_TOOLTIP = SDL3.SDL_WINDOW_TOOLTIP,

SDL3-CS/generate_bindings.py

@@ -312,7 +312,6 @@ def run_clangsharp(command, header: Header):
         "--file", header.input_file(),
         "--output", header.output_file(),
         "--libraryPath", header.base,
-        
         "--methodClassName", header.base,
     ]
 
@@ -374,6 +373,8 @@ def get_string_returning_functions(sdl_api):
     yield "TTF_GetFontFamilyName"
     yield "TTF_GetFontStyleName"
 
+    yield "MIX_GetAudioDecoder"
+
 
 def should_skip(solo_headers: list[Header], header: Header):
     if len(solo_headers) == 0:

SDL3_mixer-CS/SDL3_mixer/ClangSharp/SDL_mixer.g.cs

@@ -79,9 +79,9 @@ namespace SDL
         [DllImport("SDL3_mixer", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
         public static extern int MIX_GetNumAudioDecoders();
 
-        [DllImport("SDL3_mixer", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
+        [DllImport("SDL3_mixer", CallingConvention = CallingConvention.Cdecl, EntryPoint = "MIX_GetAudioDecoder", ExactSpelling = true)]
         [return: NativeTypeName("const char *")]
-        public static extern byte* MIX_GetAudioDecoder(int index);
+        public static extern byte* Unsafe_MIX_GetAudioDecoder(int index);
 
         [DllImport("SDL3_mixer", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
         public static extern MIX_Mixer* MIX_CreateMixerDevice(SDL_AudioDeviceID devid, [NativeTypeName("const SDL_AudioSpec *")] SDL_AudioSpec* spec);

native/ios/SDL3.xcframework/Info.plist

@@ -7,50 +7,17 @@
 		<dict>
 			<key>BinaryPath</key>
 			<string>SDL3.framework/SDL3</string>
-			<key>DebugSymbolsPath</key>
-			<string>dSYMs</string>
 			<key>LibraryIdentifier</key>
-			<string>tvos-arm64</string>
+			<string>tvos-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>SDL3.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>tvos</string>
-		</dict>
-		<dict>
-			<key>BinaryPath</key>
-			<string>SDL3.framework/Versions/A/SDL3</string>
-			<key>DebugSymbolsPath</key>
-			<string>dSYMs</string>
-			<key>LibraryIdentifier</key>
-			<string>macos-arm64_x86_64</string>
-			<key>LibraryPath</key>
-			<string>SDL3.framework</string>
-			<key>SupportedArchitectures</key>
-			<array>
-				<string>arm64</string>
-				<string>x86_64</string>
-			</array>
-			<key>SupportedPlatform</key>
-			<string>macos</string>
-		</dict>
-		<dict>
-			<key>BinaryPath</key>
-			<string>SDL3.framework/SDL3</string>
-			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
-			<key>LibraryPath</key>
-			<string>SDL3.framework</string>
-			<key>SupportedArchitectures</key>
-			<array>
-				<string>arm64</string>
-				<string>x86_64</string>
-			</array>
-			<key>SupportedPlatform</key>
-			<string>ios</string>
 			<key>SupportedPlatformVariant</key>
 			<string>simulator</string>
 		</dict>
@@ -72,9 +39,11 @@
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
-			<string>SDL3.framework/SDL3</string>
+			<string>SDL3.framework/Versions/A/SDL3</string>
+			<key>DebugSymbolsPath</key>
+			<string>dSYMs</string>
 			<key>LibraryIdentifier</key>
-			<string>tvos-arm64_x86_64-simulator</string>
+			<string>macos-arm64_x86_64</string>
 			<key>LibraryPath</key>
 			<string>SDL3.framework</string>
 			<key>SupportedArchitectures</key>
@@ -83,7 +52,38 @@
 				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
+			<string>macos</string>
+		</dict>
+		<dict>
+			<key>BinaryPath</key>
+			<string>SDL3.framework/SDL3</string>
+			<key>DebugSymbolsPath</key>
+			<string>dSYMs</string>
+			<key>LibraryIdentifier</key>
+			<string>tvos-arm64</string>
+			<key>LibraryPath</key>
+			<string>SDL3.framework</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+			</array>
+			<key>SupportedPlatform</key>
 			<string>tvos</string>
+		</dict>
+		<dict>
+			<key>BinaryPath</key>
+			<string>SDL3.framework/SDL3</string>
+			<key>LibraryIdentifier</key>
+			<string>ios-arm64_x86_64-simulator</string>
+			<key>LibraryPath</key>
+			<string>SDL3.framework</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+				<string>x86_64</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>ios</string>
 			<key>SupportedPlatformVariant</key>
 			<string>simulator</string>
 		</dict>

native/ios/SDL3_image.xcframework/Info.plist

@@ -4,34 +4,6 @@
 <dict>
 	<key>AvailableLibraries</key>
 	<array>
-		<dict>
-			<key>BinaryPath</key>
-			<string>SDL3_image.framework/SDL3_image</string>
-			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
-			<key>LibraryPath</key>
-			<string>SDL3_image.framework</string>
-			<key>SupportedArchitectures</key>
-			<array>
-				<string>arm64</string>
-			</array>
-			<key>SupportedPlatform</key>
-			<string>ios</string>
-		</dict>
-		<dict>
-			<key>BinaryPath</key>
-			<string>SDL3_image.framework/SDL3_image</string>
-			<key>LibraryIdentifier</key>
-			<string>tvos-arm64</string>
-			<key>LibraryPath</key>
-			<string>SDL3_image.framework</string>
-			<key>SupportedArchitectures</key>
-			<array>
-				<string>arm64</string>
-			</array>
-			<key>SupportedPlatform</key>
-			<string>tvos</string>
-		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>SDL3_image.framework/SDL3_image</string>
@@ -49,6 +21,20 @@
 			<key>SupportedPlatformVariant</key>
 			<string>simulator</string>
 		</dict>
+		<dict>
+			<key>BinaryPath</key>
+			<string>SDL3_image.framework/SDL3_image</string>
+			<key>LibraryIdentifier</key>
+			<string>ios-arm64</string>
+			<key>LibraryPath</key>
+			<string>SDL3_image.framework</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>ios</string>
+		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>SDL3_image.framework/SDL3_image</string>
@@ -81,6 +67,20 @@
 			<key>SupportedPlatform</key>
 			<string>macos</string>
 		</dict>
+		<dict>
+			<key>BinaryPath</key>
+			<string>SDL3_image.framework/SDL3_image</string>
+			<key>LibraryIdentifier</key>
+			<string>tvos-arm64</string>
+			<key>LibraryPath</key>
+			<string>SDL3_image.framework</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>tvos</string>
+		</dict>
 	</array>
 	<key>CFBundlePackageType</key>
 	<string>XFWK</string>

native/ios/SDL3_mixer.xcframework/Info.plist

@@ -4,6 +4,40 @@
 <dict>
 	<key>AvailableLibraries</key>
 	<array>
+		<dict>
+			<key>BinaryPath</key>
+			<string>SDL3_mixer.framework/SDL3_mixer</string>
+			<key>LibraryIdentifier</key>
+			<string>tvos-arm64_x86_64-simulator</string>
+			<key>LibraryPath</key>
+			<string>SDL3_mixer.framework</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+				<string>x86_64</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>tvos</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
+		</dict>
+		<dict>
+			<key>BinaryPath</key>
+			<string>SDL3_mixer.framework/SDL3_mixer</string>
+			<key>LibraryIdentifier</key>
+			<string>ios-arm64_x86_64-simulator</string>
+			<key>LibraryPath</key>
+			<string>SDL3_mixer.framework</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+				<string>x86_64</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
+		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>SDL3_mixer.framework/Versions/A/SDL3_mixer</string>
@@ -33,23 +67,6 @@
 			<key>SupportedPlatform</key>
 			<string>ios</string>
 		</dict>
-		<dict>
-			<key>BinaryPath</key>
-			<string>SDL3_mixer.framework/SDL3_mixer</string>
-			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
-			<key>LibraryPath</key>
-			<string>SDL3_mixer.framework</string>
-			<key>SupportedArchitectures</key>
-			<array>
-				<string>arm64</string>
-				<string>x86_64</string>
-			</array>
-			<key>SupportedPlatform</key>
-			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
-		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>SDL3_mixer.framework/SDL3_mixer</string>
@@ -64,23 +81,6 @@
 			<key>SupportedPlatform</key>
 			<string>tvos</string>
 		</dict>
-		<dict>
-			<key>BinaryPath</key>
-			<string>SDL3_mixer.framework/SDL3_mixer</string>
-			<key>LibraryIdentifier</key>
-			<string>tvos-arm64_x86_64-simulator</string>
-			<key>LibraryPath</key>
-			<string>SDL3_mixer.framework</string>
-			<key>SupportedArchitectures</key>
-			<array>
-				<string>arm64</string>
-				<string>x86_64</string>
-			</array>
-			<key>SupportedPlatform</key>
-			<string>tvos</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
-		</dict>
 	</array>
 	<key>CFBundlePackageType</key>
 	<string>XFWK</string>

native/ios/SDL3_ttf.xcframework/Info.plist

@@ -6,18 +6,17 @@
 	<array>
 		<dict>
 			<key>BinaryPath</key>
-			<string>SDL3_ttf.framework/Versions/A/SDL3_ttf</string>
+			<string>SDL3_ttf.framework/SDL3_ttf</string>
 			<key>LibraryIdentifier</key>
-			<string>macos-arm64_x86_64</string>
+			<string>tvos-arm64</string>
 			<key>LibraryPath</key>
 			<string>SDL3_ttf.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>macos</string>
+			<string>tvos</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
@@ -35,17 +34,18 @@
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
-			<string>SDL3_ttf.framework/SDL3_ttf</string>
+			<string>SDL3_ttf.framework/Versions/A/SDL3_ttf</string>
 			<key>LibraryIdentifier</key>
-			<string>tvos-arm64</string>
+			<string>macos-arm64_x86_64</string>
 			<key>LibraryPath</key>
 			<string>SDL3_ttf.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>tvos</string>
+			<string>macos</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>