Update to SDL 3.2.6 and SDL 2.32.2

Author: JunaMeinhold

Generator/Generator.csproj

@@ -8,7 +8,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="HexaGen" Version="1.1.15-rc25" />
+		<PackageReference Include="HexaGen" Version="1.1.15-rc30" />
 	</ItemGroup>
 
 	<ItemGroup>

Generator/Program.cs

@@ -39,12 +39,13 @@
 }
 
 BatchGenerator.Create()
+#if true
     // SDL 2
     .Setup<CsCodeGenerator>("sdl2/generator.json")
     .AddPrePatch(new NamingPatch(["SDL"], NamingPatchOptions.None))
     .AddPrePatch(new EnumNamePatch())
     .Generate(["sdl2/include/main.h"], "../../../../Hexa.NET.SDL2/Generated", filesSdl2)
-
+#endif
     // SDL 3
     .Setup<CsCodeGenerator>("sdl3/generator.json")
     .AddPrePatch(new NamingPatch(["SDL"], NamingPatchOptions.None))

Generator/sdl2/generator.json

@@ -7,6 +7,7 @@
   "GenerateSizeOfStructs": false,
   "GeneratePlaceholderComments": false,
   "GenerateMetadata": false,
+  "UseCustomContext": true,
   "ImportType": "FunctionTable",
   "IncludeFolders": [
     "C:\\VulkanSDK\\1.3.250.0\\Include\\"
@@ -92,4 +93,4 @@
   "IgnoredFunctions": [
     "SDL_ReportAssertion"
   ]
-}
+}

Generator/sdl2/include/SDL_hints.h

@@ -1423,6 +1423,27 @@ extern "C" {
  */
 #define SDL_HINT_JOYSTICK_DEVICE "SDL_JOYSTICK_DEVICE"
 
+
+/**
+ * A variable containing a list of devices and their desired number of haptic
+ * (force feedback) enabled axis.
+ *
+ * The format of the string is a comma separated list of USB VID/PID pairs in
+ * hexadecimal form plus the number of desired axes, e.g.
+ *
+ * `0xAAAA/0xBBBB/1,0xCCCC/0xDDDD/3`
+ *
+ * This hint supports a "wildcard" device that will set the number of haptic
+ * axes on all initialized haptic devices which were not defined explicitly in
+ * this hint.
+ *
+ * `0xFFFF/0xFFFF/1`
+ *
+ * This hint should be set before a controller is opened. The number of haptic
+ * axes won't exceed the number of real axes found on the device.
+ */
+#define SDL_HINT_JOYSTICK_HAPTIC_AXES "SDL_JOYSTICK_HAPTIC_AXES"
+
 /**
  * A variable controlling whether joysticks on Linux will always treat 'hat'
  * axis inputs (ABS_HAT0X - ABS_HAT3Y) as 8-way digital hats without checking

Generator/sdl2/include/SDL_keyboard.h

@@ -255,7 +255,7 @@ extern DECLSPEC SDL_Keycode SDLCALL SDL_GetKeyFromName(const char *name);
  * On some platforms using this function activates the screen keyboard.
  *
  * On desktop platforms, SDL_StartTextInput() is implicitly called on SDL
- * window creation which will cause events SDL_TextInputEvent and
+ * video subsystem initialization which will cause SDL_TextInputEvent and
  * SDL_TextEditingEvent to begin emitting.
  *
  * \since This function is available since SDL 2.0.0.

Generator/sdl2/include/SDL_version.h

@@ -58,7 +58,7 @@ typedef struct SDL_version
 */
 #define SDL_MAJOR_VERSION   2
 #define SDL_MINOR_VERSION   32
-#define SDL_PATCHLEVEL      0
+#define SDL_PATCHLEVEL      2
 
 /**
  * Macro to determine SDL version program was compiled against.

Generator/sdl2/include/main.h

@@ -78,4 +78,4 @@
 #include "SDL_types.h"
 #include "SDL_version.h"
 #include "SDL_video.h"
-#include "SDL_vulkan.h"
+#include "SDL_vulkan.h"

Generator/sdl3/generator.json

@@ -7,6 +7,7 @@
   "GenerateSizeOfStructs": false,
   "GeneratePlaceholderComments": false,
   "GenerateMetadata": true,
+  "UseCustomContext": true,
   "IncludeFolders": [
     "C:\\VulkanSDK\\1.3.250.0\\Include\\"
   ],

Generator/sdl3/include/SDL.h

@@ -20,7 +20,7 @@
 */
 
 /**
- * Main include header for the SDL library, version 3.2.4
+ * Main include header for the SDL library, version 3.2.6
  *
  * It is almost always best to include just this one header instead of
  * picking out individual headers included here. There are exceptions to

Generator/sdl3/include/SDL_assert.h

@@ -149,6 +149,8 @@ extern "C" {
     #define SDL_TriggerBreakpoint() __asm__ __volatile__ ( "bkpt #22\n\t" )
 #elif defined(_WIN32) && ((defined(__GNUC__) || defined(__clang__)) && (defined(__arm64__) || defined(__aarch64__)) )
     #define SDL_TriggerBreakpoint() __asm__ __volatile__ ( "brk #0xF000\n\t" )
+#elif defined(__GNUC__) || defined(__clang__)
+    #define SDL_TriggerBreakpoint() __builtin_trap()  /* older gcc may not support SDL_HAS_BUILTIN(__builtin_trap) above */
 #elif defined(__386__) && defined(__WATCOMC__)
     #define SDL_TriggerBreakpoint() { _asm { int 0x03 } }
 #elif defined(HAVE_SIGNAL_H) && !defined(__WATCOMC__)