Skip to content

Commit 87f9535

Browse files
smoogipoosmoogipoo
authored
Merge pull request #268 from Happypig375/patch-1
Update all to latest main
2 parents 3767eb2 + e8913bf commit 87f9535

15 files changed

Lines changed: 195 additions & 34 deletions

File tree

‎External/SDL‎

Submodule SDL updated 1352 files

‎External/SDL_image‎

Submodule SDL_image updated 149 files

‎External/SDL_mixer‎

Submodule SDL_mixer updated 159 files

‎External/SDL_ttf‎

Submodule SDL_ttf updated 31 files

‎SDL3-CS/SDL3/ClangSharp/SDL_gamepad.g.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,12 +118,12 @@ public partial struct SDL_GamepadBinding
118118
{
119119
public SDL_GamepadBindingType input_type;
120120

121-
[NativeTypeName("__AnonymousRecord_SDL_gamepad_L267_C5")]
121+
[NativeTypeName("__AnonymousRecord_SDL_gamepad_L270_C5")]
122122
public _input_e__Union input;
123123

124124
public SDL_GamepadBindingType output_type;
125125

126-
[NativeTypeName("__AnonymousRecord_SDL_gamepad_L287_C5")]
126+
[NativeTypeName("__AnonymousRecord_SDL_gamepad_L290_C5")]
127127
public _output_e__Union output;
128128

129129
[StructLayout(LayoutKind.Explicit)]
@@ -133,11 +133,11 @@ public partial struct _input_e__Union
133133
public int button;
134134

135135
[FieldOffset(0)]
136-
[NativeTypeName("__AnonymousRecord_SDL_gamepad_L271_C9")]
136+
[NativeTypeName("__AnonymousRecord_SDL_gamepad_L274_C9")]
137137
public _axis_e__Struct axis;
138138

139139
[FieldOffset(0)]
140-
[NativeTypeName("__AnonymousRecord_SDL_gamepad_L278_C9")]
140+
[NativeTypeName("__AnonymousRecord_SDL_gamepad_L281_C9")]
141141
public _hat_e__Struct hat;
142142

143143
public partial struct _axis_e__Struct
@@ -164,7 +164,7 @@ public partial struct _output_e__Union
164164
public SDL_GamepadButton button;
165165

166166
[FieldOffset(0)]
167-
[NativeTypeName("__AnonymousRecord_SDL_gamepad_L291_C9")]
167+
[NativeTypeName("__AnonymousRecord_SDL_gamepad_L294_C9")]
168168
public _axis_e__Struct axis;
169169

170170
public partial struct _axis_e__Struct

‎SDL3-CS/SDL3/ClangSharp/SDL_gpu.g.cs‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1549,12 +1549,60 @@ public static unsafe partial class SDL3
15491549
[NativeTypeName("#define SDL_PROP_GPU_DEVICE_CREATE_D3D12_SEMANTIC_NAME_STRING \"SDL.gpu.device.create.d3d12.semantic\"")]
15501550
public static ReadOnlySpan<byte> SDL_PROP_GPU_DEVICE_CREATE_D3D12_SEMANTIC_NAME_STRING => "SDL.gpu.device.create.d3d12.semantic"u8;
15511551

1552+
[NativeTypeName("#define SDL_PROP_GPU_DEVICE_CREATE_D3D12_AGILITY_SDK_VERSION_NUMBER \"SDL.gpu.device.create.d3d12.agility_sdk_version\"")]
1553+
public static ReadOnlySpan<byte> SDL_PROP_GPU_DEVICE_CREATE_D3D12_AGILITY_SDK_VERSION_NUMBER => "SDL.gpu.device.create.d3d12.agility_sdk_version"u8;
1554+
1555+
[NativeTypeName("#define SDL_PROP_GPU_DEVICE_CREATE_D3D12_AGILITY_SDK_PATH_STRING \"SDL.gpu.device.create.d3d12.agility_sdk_path\"")]
1556+
public static ReadOnlySpan<byte> SDL_PROP_GPU_DEVICE_CREATE_D3D12_AGILITY_SDK_PATH_STRING => "SDL.gpu.device.create.d3d12.agility_sdk_path"u8;
1557+
15521558
[NativeTypeName("#define SDL_PROP_GPU_DEVICE_CREATE_VULKAN_REQUIRE_HARDWARE_ACCELERATION_BOOLEAN \"SDL.gpu.device.create.vulkan.requirehardwareacceleration\"")]
15531559
public static ReadOnlySpan<byte> SDL_PROP_GPU_DEVICE_CREATE_VULKAN_REQUIRE_HARDWARE_ACCELERATION_BOOLEAN => "SDL.gpu.device.create.vulkan.requirehardwareacceleration"u8;
15541560

15551561
[NativeTypeName("#define SDL_PROP_GPU_DEVICE_CREATE_VULKAN_OPTIONS_POINTER \"SDL.gpu.device.create.vulkan.options\"")]
15561562
public static ReadOnlySpan<byte> SDL_PROP_GPU_DEVICE_CREATE_VULKAN_OPTIONS_POINTER => "SDL.gpu.device.create.vulkan.options"u8;
15571563

1564+
[NativeTypeName("#define SDL_PROP_GPU_DEVICE_CREATE_METAL_ALLOW_MACFAMILY1_BOOLEAN \"SDL.gpu.device.create.metal.allowmacfamily1\"")]
1565+
public static ReadOnlySpan<byte> SDL_PROP_GPU_DEVICE_CREATE_METAL_ALLOW_MACFAMILY1_BOOLEAN => "SDL.gpu.device.create.metal.allowmacfamily1"u8;
1566+
1567+
[NativeTypeName("#define SDL_PROP_GPU_DEVICE_CREATE_XR_ENABLE_BOOLEAN \"SDL.gpu.device.create.xr.enable\"")]
1568+
public static ReadOnlySpan<byte> SDL_PROP_GPU_DEVICE_CREATE_XR_ENABLE_BOOLEAN => "SDL.gpu.device.create.xr.enable"u8;
1569+
1570+
[NativeTypeName("#define SDL_PROP_GPU_DEVICE_CREATE_XR_INSTANCE_POINTER \"SDL.gpu.device.create.xr.instance_out\"")]
1571+
public static ReadOnlySpan<byte> SDL_PROP_GPU_DEVICE_CREATE_XR_INSTANCE_POINTER => "SDL.gpu.device.create.xr.instance_out"u8;
1572+
1573+
[NativeTypeName("#define SDL_PROP_GPU_DEVICE_CREATE_XR_SYSTEM_ID_POINTER \"SDL.gpu.device.create.xr.system_id_out\"")]
1574+
public static ReadOnlySpan<byte> SDL_PROP_GPU_DEVICE_CREATE_XR_SYSTEM_ID_POINTER => "SDL.gpu.device.create.xr.system_id_out"u8;
1575+
1576+
[NativeTypeName("#define SDL_PROP_GPU_DEVICE_CREATE_XR_VERSION_NUMBER \"SDL.gpu.device.create.xr.version\"")]
1577+
public static ReadOnlySpan<byte> SDL_PROP_GPU_DEVICE_CREATE_XR_VERSION_NUMBER => "SDL.gpu.device.create.xr.version"u8;
1578+
1579+
[NativeTypeName("#define SDL_PROP_GPU_DEVICE_CREATE_XR_FORM_FACTOR_NUMBER \"SDL.gpu.device.create.xr.form_factor\"")]
1580+
public static ReadOnlySpan<byte> SDL_PROP_GPU_DEVICE_CREATE_XR_FORM_FACTOR_NUMBER => "SDL.gpu.device.create.xr.form_factor"u8;
1581+
1582+
[NativeTypeName("#define SDL_PROP_GPU_DEVICE_CREATE_XR_EXTENSION_COUNT_NUMBER \"SDL.gpu.device.create.xr.extensions.count\"")]
1583+
public static ReadOnlySpan<byte> SDL_PROP_GPU_DEVICE_CREATE_XR_EXTENSION_COUNT_NUMBER => "SDL.gpu.device.create.xr.extensions.count"u8;
1584+
1585+
[NativeTypeName("#define SDL_PROP_GPU_DEVICE_CREATE_XR_EXTENSION_NAMES_POINTER \"SDL.gpu.device.create.xr.extensions.names\"")]
1586+
public static ReadOnlySpan<byte> SDL_PROP_GPU_DEVICE_CREATE_XR_EXTENSION_NAMES_POINTER => "SDL.gpu.device.create.xr.extensions.names"u8;
1587+
1588+
[NativeTypeName("#define SDL_PROP_GPU_DEVICE_CREATE_XR_LAYER_COUNT_NUMBER \"SDL.gpu.device.create.xr.layers.count\"")]
1589+
public static ReadOnlySpan<byte> SDL_PROP_GPU_DEVICE_CREATE_XR_LAYER_COUNT_NUMBER => "SDL.gpu.device.create.xr.layers.count"u8;
1590+
1591+
[NativeTypeName("#define SDL_PROP_GPU_DEVICE_CREATE_XR_LAYER_NAMES_POINTER \"SDL.gpu.device.create.xr.layers.names\"")]
1592+
public static ReadOnlySpan<byte> SDL_PROP_GPU_DEVICE_CREATE_XR_LAYER_NAMES_POINTER => "SDL.gpu.device.create.xr.layers.names"u8;
1593+
1594+
[NativeTypeName("#define SDL_PROP_GPU_DEVICE_CREATE_XR_APPLICATION_NAME_STRING \"SDL.gpu.device.create.xr.application.name\"")]
1595+
public static ReadOnlySpan<byte> SDL_PROP_GPU_DEVICE_CREATE_XR_APPLICATION_NAME_STRING => "SDL.gpu.device.create.xr.application.name"u8;
1596+
1597+
[NativeTypeName("#define SDL_PROP_GPU_DEVICE_CREATE_XR_APPLICATION_VERSION_NUMBER \"SDL.gpu.device.create.xr.application.version\"")]
1598+
public static ReadOnlySpan<byte> SDL_PROP_GPU_DEVICE_CREATE_XR_APPLICATION_VERSION_NUMBER => "SDL.gpu.device.create.xr.application.version"u8;
1599+
1600+
[NativeTypeName("#define SDL_PROP_GPU_DEVICE_CREATE_XR_ENGINE_NAME_STRING \"SDL.gpu.device.create.xr.engine.name\"")]
1601+
public static ReadOnlySpan<byte> SDL_PROP_GPU_DEVICE_CREATE_XR_ENGINE_NAME_STRING => "SDL.gpu.device.create.xr.engine.name"u8;
1602+
1603+
[NativeTypeName("#define SDL_PROP_GPU_DEVICE_CREATE_XR_ENGINE_VERSION_NUMBER \"SDL.gpu.device.create.xr.engine.version\"")]
1604+
public static ReadOnlySpan<byte> SDL_PROP_GPU_DEVICE_CREATE_XR_ENGINE_VERSION_NUMBER => "SDL.gpu.device.create.xr.engine.version"u8;
1605+
15581606
[NativeTypeName("#define SDL_PROP_GPU_DEVICE_NAME_STRING \"SDL.gpu.device.name\"")]
15591607
public static ReadOnlySpan<byte> SDL_PROP_GPU_DEVICE_NAME_STRING => "SDL.gpu.device.name"u8;
15601608

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

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,9 +184,6 @@ public static unsafe partial class SDL3
184184
[NativeTypeName("#define SDL_HINT_EMSCRIPTEN_KEYBOARD_ELEMENT \"SDL_EMSCRIPTEN_KEYBOARD_ELEMENT\"")]
185185
public static ReadOnlySpan<byte> SDL_HINT_EMSCRIPTEN_KEYBOARD_ELEMENT => "SDL_EMSCRIPTEN_KEYBOARD_ELEMENT"u8;
186186

187-
[NativeTypeName("#define SDL_HINT_EMSCRIPTEN_FILL_DOCUMENT \"SDL_EMSCRIPTEN_FILL_DOCUMENT\"")]
188-
public static ReadOnlySpan<byte> SDL_HINT_EMSCRIPTEN_FILL_DOCUMENT => "SDL_EMSCRIPTEN_FILL_DOCUMENT"u8;
189-
190187
[NativeTypeName("#define SDL_HINT_ENABLE_SCREEN_KEYBOARD \"SDL_ENABLE_SCREEN_KEYBOARD\"")]
191188
public static ReadOnlySpan<byte> SDL_HINT_ENABLE_SCREEN_KEYBOARD => "SDL_ENABLE_SCREEN_KEYBOARD"u8;
192189

@@ -238,6 +235,9 @@ public static unsafe partial class SDL3
238235
[NativeTypeName("#define SDL_HINT_HIDAPI_LIBUSB \"SDL_HIDAPI_LIBUSB\"")]
239236
public static ReadOnlySpan<byte> SDL_HINT_HIDAPI_LIBUSB => "SDL_HIDAPI_LIBUSB"u8;
240237

238+
[NativeTypeName("#define SDL_HINT_HIDAPI_LIBUSB_GAMECUBE \"SDL_HIDAPI_LIBUSB_GAMECUBE\"")]
239+
public static ReadOnlySpan<byte> SDL_HINT_HIDAPI_LIBUSB_GAMECUBE => "SDL_HIDAPI_LIBUSB_GAMECUBE"u8;
240+
241241
[NativeTypeName("#define SDL_HINT_HIDAPI_LIBUSB_WHITELIST \"SDL_HIDAPI_LIBUSB_WHITELIST\"")]
242242
public static ReadOnlySpan<byte> SDL_HINT_HIDAPI_LIBUSB_WHITELIST => "SDL_HIDAPI_LIBUSB_WHITELIST"u8;
243243

@@ -247,6 +247,9 @@ public static unsafe partial class SDL3
247247
[NativeTypeName("#define SDL_HINT_GPU_DRIVER \"SDL_GPU_DRIVER\"")]
248248
public static ReadOnlySpan<byte> SDL_HINT_GPU_DRIVER => "SDL_GPU_DRIVER"u8;
249249

250+
[NativeTypeName("#define SDL_HINT_OPENXR_LIBRARY \"SDL_OPENXR_LIBRARY\"")]
251+
public static ReadOnlySpan<byte> SDL_HINT_OPENXR_LIBRARY => "SDL_OPENXR_LIBRARY"u8;
252+
250253
[NativeTypeName("#define SDL_HINT_HIDAPI_ENUMERATE_ONLY_CONTROLLERS \"SDL_HIDAPI_ENUMERATE_ONLY_CONTROLLERS\"")]
251254
public static ReadOnlySpan<byte> SDL_HINT_HIDAPI_ENUMERATE_ONLY_CONTROLLERS => "SDL_HIDAPI_ENUMERATE_ONLY_CONTROLLERS"u8;
252255

@@ -370,6 +373,9 @@ public static unsafe partial class SDL3
370373
[NativeTypeName("#define SDL_HINT_JOYSTICK_HIDAPI_FLYDIGI \"SDL_JOYSTICK_HIDAPI_FLYDIGI\"")]
371374
public static ReadOnlySpan<byte> SDL_HINT_JOYSTICK_HIDAPI_FLYDIGI => "SDL_JOYSTICK_HIDAPI_FLYDIGI"u8;
372375

376+
[NativeTypeName("#define SDL_HINT_JOYSTICK_HIDAPI_GAMESIR \"SDL_JOYSTICK_HIDAPI_GAMESIR\"")]
377+
public static ReadOnlySpan<byte> SDL_HINT_JOYSTICK_HIDAPI_GAMESIR => "SDL_JOYSTICK_HIDAPI_GAMESIR"u8;
378+
373379
[NativeTypeName("#define SDL_HINT_JOYSTICK_HIDAPI_SWITCH \"SDL_JOYSTICK_HIDAPI_SWITCH\"")]
374380
public static ReadOnlySpan<byte> SDL_HINT_JOYSTICK_HIDAPI_SWITCH => "SDL_JOYSTICK_HIDAPI_SWITCH"u8;
375381

@@ -514,6 +520,9 @@ public static unsafe partial class SDL3
514520
[NativeTypeName("#define SDL_HINT_MOUSE_DEFAULT_SYSTEM_CURSOR \"SDL_MOUSE_DEFAULT_SYSTEM_CURSOR\"")]
515521
public static ReadOnlySpan<byte> SDL_HINT_MOUSE_DEFAULT_SYSTEM_CURSOR => "SDL_MOUSE_DEFAULT_SYSTEM_CURSOR"u8;
516522

523+
[NativeTypeName("#define SDL_HINT_MOUSE_DPI_SCALE_CURSORS \"SDL_MOUSE_DPI_SCALE_CURSORS\"")]
524+
public static ReadOnlySpan<byte> SDL_HINT_MOUSE_DPI_SCALE_CURSORS => "SDL_MOUSE_DPI_SCALE_CURSORS"u8;
525+
517526
[NativeTypeName("#define SDL_HINT_MOUSE_EMULATE_WARP_WITH_RELATIVE \"SDL_MOUSE_EMULATE_WARP_WITH_RELATIVE\"")]
518527
public static ReadOnlySpan<byte> SDL_HINT_MOUSE_EMULATE_WARP_WITH_RELATIVE => "SDL_MOUSE_EMULATE_WARP_WITH_RELATIVE"u8;
519528

@@ -556,6 +565,9 @@ public static unsafe partial class SDL3
556565
[NativeTypeName("#define SDL_HINT_OPENGL_ES_DRIVER \"SDL_OPENGL_ES_DRIVER\"")]
557566
public static ReadOnlySpan<byte> SDL_HINT_OPENGL_ES_DRIVER => "SDL_OPENGL_ES_DRIVER"u8;
558567

568+
[NativeTypeName("#define SDL_HINT_OPENGL_FORCE_SRGB_CAPABLE \"SDL_OPENGL_FORCE_SRGB_CAPABLE\"")]
569+
public static ReadOnlySpan<byte> SDL_HINT_OPENGL_FORCE_SRGB_CAPABLE => "SDL_OPENGL_FORCE_SRGB_CAPABLE"u8;
570+
559571
[NativeTypeName("#define SDL_HINT_OPENVR_LIBRARY \"SDL_OPENVR_LIBRARY\"")]
560572
public static ReadOnlySpan<byte> SDL_HINT_OPENVR_LIBRARY => "SDL_OPENVR_LIBRARY"u8;
561573

‎SDL3-CS/SDL3/ClangSharp/SDL_joystick.g.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,10 @@ public static unsafe partial class SDL3
170170
[DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
171171
public static extern void SDL_LockJoysticks();
172172

173+
[DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
174+
[return: NativeTypeName("bool")]
175+
public static extern SDLBool SDL_TryLockJoysticks();
176+
173177
[DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
174178
public static extern void SDL_UnlockJoysticks();
175179

‎SDL3-CS/SDL3/ClangSharp/SDL_render.g.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@ public static unsafe partial class SDL3
480480
public static extern SDLBool SDL_GetDefaultTextureScaleMode(SDL_Renderer* renderer, SDL_ScaleMode* scale_mode);
481481

482482
[DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
483-
public static extern SDL_GPURenderState* SDL_CreateGPURenderState(SDL_Renderer* renderer, SDL_GPURenderStateCreateInfo* createinfo);
483+
public static extern SDL_GPURenderState* SDL_CreateGPURenderState(SDL_Renderer* renderer, [NativeTypeName("const SDL_GPURenderStateCreateInfo *")] SDL_GPURenderStateCreateInfo* createinfo);
484484

485485
[DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
486486
[return: NativeTypeName("bool")]
@@ -691,6 +691,9 @@ public static unsafe partial class SDL3
691691
[NativeTypeName("#define SDL_PROP_TEXTURE_CREATE_VULKAN_TEXTURE_NUMBER \"SDL.texture.create.vulkan.texture\"")]
692692
public static ReadOnlySpan<byte> SDL_PROP_TEXTURE_CREATE_VULKAN_TEXTURE_NUMBER => "SDL.texture.create.vulkan.texture"u8;
693693

694+
[NativeTypeName("#define SDL_PROP_TEXTURE_CREATE_VULKAN_LAYOUT_NUMBER \"SDL.texture.create.vulkan.layout\"")]
695+
public static ReadOnlySpan<byte> SDL_PROP_TEXTURE_CREATE_VULKAN_LAYOUT_NUMBER => "SDL.texture.create.vulkan.layout"u8;
696+
694697
[NativeTypeName("#define SDL_PROP_TEXTURE_CREATE_GPU_TEXTURE_POINTER \"SDL.texture.create.gpu.texture\"")]
695698
public static ReadOnlySpan<byte> SDL_PROP_TEXTURE_CREATE_GPU_TEXTURE_POINTER => "SDL.texture.create.gpu.texture"u8;
696699

‎SDL3-CS/SDL3/ClangSharp/SDL_surface.g.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,5 +332,8 @@ public static unsafe partial class SDL3
332332

333333
[NativeTypeName("#define SDL_PROP_SURFACE_HOTSPOT_Y_NUMBER \"SDL.surface.hotspot.y\"")]
334334
public static ReadOnlySpan<byte> SDL_PROP_SURFACE_HOTSPOT_Y_NUMBER => "SDL.surface.hotspot.y"u8;
335+
336+
[NativeTypeName("#define SDL_PROP_SURFACE_ROTATION_FLOAT \"SDL.surface.rotation\"")]
337+
public static ReadOnlySpan<byte> SDL_PROP_SURFACE_ROTATION_FLOAT => "SDL.surface.rotation"u8;
335338
}
336339
}

0 commit comments

Comments
 (0)