Updated SDL2 to 2.30.10

HexaEngine · Dec 8, 2024 · 078f403 · 078f403
1 parent 822221f
commit 078f403
Show file tree

Hide file tree

Showing 35 changed files with 31,713 additions and 32,283 deletions.
diff --git a/Generator/Program.cs b/Generator/Program.cs
@@ -47,7 +47,7 @@
     .Setup<CsCodeGenerator>("sdl2/generator.json")
     .AddPrePatch(new NamingPatch(["SDL"], NamingPatchOptions.None))
     .AddPrePatch(new EnumNamePatch())
-    .Generate(["sdl2/include/main.h"], "../../../../Hexa.NET.SDL2/Generated", [.. Directory.GetFiles("include")])
+    .Generate(["sdl2/include/main.h"], "../../../../Hexa.NET.SDL2/Generated", [.. Directory.GetFiles("sdl2/include")])
 
     // SDL 3
     .Setup<CsCodeGenerator>("sdl3/generator.json")

diff --git a/Generator/sdl2/include/SDL_audio.h b/Generator/sdl2/include/SDL_audio.h
@@ -594,7 +594,7 @@ extern DECLSPEC int SDLCALL SDL_GetDefaultAudioInfo(char **name,
  *   frames_ (with stereo output, two samples--left and right--would make a
  *   single sample frame). This number should be a power of two, and may be
  *   adjusted by the audio driver to a value more suitable for the hardware.
- *   Good values seem to range between 512 and 8096 inclusive, depending on
+ *   Good values seem to range between 512 and 4096 inclusive, depending on
  *   the application and CPU speed. Smaller values reduce latency, but can
  *   lead to underflow if the application is doing heavy processing and cannot
  *   fill the audio buffer in time. Note that the number of sample frames is

diff --git a/Generator/sdl2/include/SDL_cpuinfo.h b/Generator/sdl2/include/SDL_cpuinfo.h
@@ -53,9 +53,11 @@ _m_prefetch(void *__P)
 #ifndef __MMX__
 #define __MMX__
 #endif
+/*
 #ifndef __3dNOW__
 #define __3dNOW__
 #endif
+*/
 #endif
 #ifndef __SSE__
 #define __SSE__

diff --git a/Generator/sdl2/include/SDL_stdinc.h b/Generator/sdl2/include/SDL_stdinc.h
@@ -255,9 +255,9 @@ typedef uint64_t Uint64;
 #ifndef SDL_PRIs64
 #if defined(__WIN32__) || defined(__GDK__)
 #define SDL_PRIs64 "I64d"
-#elif defined(PRIs64)
-#define SDL_PRIs64 PRIs64
-#elif defined(__LP64__) && !defined(__APPLE__)
+#elif defined(PRId64)
+#define SDL_PRIs64 PRId64
+#elif defined(__LP64__) && !defined(__APPLE__) && !defined(__EMSCRIPTEN__)
 #define SDL_PRIs64 "ld"
 #else
 #define SDL_PRIs64 "lld"

diff --git a/Generator/sdl2/include/SDL_version.h b/Generator/sdl2/include/SDL_version.h
@@ -59,7 +59,7 @@ typedef struct SDL_version
 */
 #define SDL_MAJOR_VERSION   2
 #define SDL_MINOR_VERSION   30
-#define SDL_PATCHLEVEL      8
+#define SDL_PATCHLEVEL      10
 
 /**
  * Macro to determine SDL version program was compiled against.

diff --git a/Generator/sdl2/include/SDL_vulkan.h b/Generator/sdl2/include/SDL_vulkan.h
@@ -52,6 +52,10 @@ extern "C" {
 VK_DEFINE_HANDLE(VkInstance)
 VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkSurfaceKHR)
 
+/* Make sure to undef to avoid issues in case of later vulkan include */
+#undef VK_DEFINE_HANDLE
+#undef VK_DEFINE_NON_DISPATCHABLE_HANDLE
+
 #endif /* !NO_SDL_VULKAN_TYPEDEFS */
 
 typedef VkInstance SDL_vulkanInstance;

diff --git a/Hexa.NET.SDL2/Generated/Constants/Constants.000.cs b/Hexa.NET.SDL2/Generated/Constants/Constants.000.cs
@@ -692,7 +692,7 @@ public unsafe partial class SDL
 
 		public const int SDL_MINOR_VERSION = 30;
 
-		public const int SDL_PATCHLEVEL = 8;
+		public const int SDL_PATCHLEVEL = 10;
 
 		public const uint SDL_INIT_TIMER = 0x00000001u;