Skip to content

Commit

Permalink
Bump ext/SDL from 80e1c75 to 8ba850b (#410)
Browse files Browse the repository at this point in the history 
* Bump ext/SDL from `80e1c75` to `8ba850b`

Bumps [ext/SDL](https://github.com/libsdl-org/SDL) from `80e1c75` to `8ba850b`.
- [Release notes](https://github.com/libsdl-org/SDL/releases)
- [Commits](libsdl-org/SDL@80e1c75...8ba850b)

---
updated-dependencies:
- dependency-name: ext/SDL
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

* Update C# bindings

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: lithiumtoast <[email protected]>
  • Loading branch information
@dependabot @lithiumtoast
dependabot[bot] and lithiumtoast authored Jul 11, 2023
1 parent e975744 commit 621f366
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 10 deletions.
2 changes: 1 addition & 1 deletion ext/SDL
Submodule SDL updated 41 files
+332 −437 VisualC-GDK/tests/testgamepad/testgamepad.vcxproj
+51 −54 VisualC-GDK/tests/testgamepad/testgamepad.vcxproj.filters
+1 −74 VisualC/tests/gamepadmap/gamepadmap.vcxproj
+1 −74 VisualC/tests/testgamepad/testgamepad.vcxproj
+4 −6 include/SDL3/SDL_audio.h
+14 −0 include/SDL3/SDL_gamepad.h
+7 −4 include/SDL3/SDL_rwops.h
+3 −2 include/SDL3/SDL_surface.h
+16 −10 src/audio/SDL_wave.c
+59 −5 src/core/linux/SDL_evdev.c
+1 −0 src/dynapi/SDL_dynapi.sym
+1 −0 src/dynapi/SDL_dynapi_overrides.h
+6 −5 src/dynapi/SDL_dynapi_procs.h
+3 −3 src/file/SDL_rwops.c
+10 −0 src/joystick/SDL_gamepad.c
+87 −77 src/joystick/hidapi/SDL_hidapi_ps4.c
+1 −1 src/video/SDL_bmp.c
+2 −3 src/video/SDL_pixels.c
+2 −2 test/CMakeLists.txt
+ − test/axis.bmp
+ − test/button.bmp
+848 −0 test/gamepad_axis.h
+39 −0 test/gamepad_axis_arrow.h
+40,590 −0 test/gamepad_back.h
+180 −0 test/gamepad_battery_empty.h
+180 −0 test/gamepad_battery_full.h
+180 −0 test/gamepad_battery_low.h
+180 −0 test/gamepad_battery_medium.h
+180 −0 test/gamepad_battery_unknown.h
+180 −0 test/gamepad_battery_wired.h
+848 −0 test/gamepad_button.h
+63 −0 test/gamepad_button_small.h
+13,624 −0 test/gamepad_front.h
+314 −0 test/gamepad_touchpad.h
+ − test/gamepadmap.bmp
+59 −101 test/gamepadmap.c
+ − test/gamepadmap_back.bmp
+998 −0 test/gamepadutils.c
+56 −0 test/gamepadutils.h
+24 −0 test/testevdev.c
+103 −144 test/testgamepad.c
4 changes: 2 additions & 2 deletions src/cs/production/SDL/Generated/AssemblyAttributes.gen.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// To disable generating this file set `isEnabledGenerateAssemblyAttributes` to `false` in the config file for generating C# code.
// <auto-generated>
// This code was generated by the following tool on 2023-07-09 20:30:05 GMT+00:00:
// https://github.com/bottlenoselabs/c2cs (v6.0.1.0)
// This code was generated by the following tool on 2023-07-11 03:47:18 GMT+00:00:
// https://github.com/bottlenoselabs/c2cs (v6.0.3.0)
//
// Changes to this file may cause incorrect behavior and will be lost if the code is regenerated.
// </auto-generated>
Expand Down
18 changes: 11 additions & 7 deletions src/cs/production/SDL/Generated/SDL.gen.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

// <auto-generated>
// This code was generated by the following tool on 2023-07-09 20:30:05 GMT+00:00:
// https://github.com/bottlenoselabs/c2cs (v6.0.1.0)
// This code was generated by the following tool on 2023-07-11 03:47:18 GMT+00:00:
// https://github.com/bottlenoselabs/c2cs (v6.0.3.0)
//
// Changes to this file may cause incorrect behavior and will be lost if the code is regenerated.
// </auto-generated>
Expand Down Expand Up @@ -747,6 +747,10 @@ public static unsafe partial class SDL
[DllImport(LibraryName, EntryPoint = "SDL_GetGamepadInstanceGUID", CallingConvention = CallingConvention.Cdecl)]
public static extern SDL_JoystickGUID SDL_GetGamepadInstanceGUID(SDL_JoystickID instance_id);

[CNode(Kind = "Function")]
[DllImport(LibraryName, EntryPoint = "SDL_GetGamepadInstanceID", CallingConvention = CallingConvention.Cdecl)]
public static extern SDL_JoystickID SDL_GetGamepadInstanceID(SDL_Gamepad* gamepad);

[CNode(Kind = "Function")]
[DllImport(LibraryName, EntryPoint = "SDL_GetGamepadInstanceMapping", CallingConvention = CallingConvention.Cdecl)]
public static extern CString SDL_GetGamepadInstanceMapping(SDL_JoystickID instance_id);
Expand Down Expand Up @@ -1757,15 +1761,15 @@ public static unsafe partial class SDL

[CNode(Kind = "Function")]
[DllImport(LibraryName, EntryPoint = "SDL_LoadBMP_RW", CallingConvention = CallingConvention.Cdecl)]
public static extern SDL_Surface* SDL_LoadBMP_RW(SDL_RWops* src, int freesrc);
public static extern SDL_Surface* SDL_LoadBMP_RW(SDL_RWops* src, CBool freesrc);

[CNode(Kind = "Function")]
[DllImport(LibraryName, EntryPoint = "SDL_LoadFile", CallingConvention = CallingConvention.Cdecl)]
public static extern void* SDL_LoadFile(CString file, ulong* datasize);

[CNode(Kind = "Function")]
[DllImport(LibraryName, EntryPoint = "SDL_LoadFile_RW", CallingConvention = CallingConvention.Cdecl)]
public static extern void* SDL_LoadFile_RW(SDL_RWops* src, ulong* datasize, int freesrc);
public static extern void* SDL_LoadFile_RW(SDL_RWops* src, ulong* datasize, CBool freesrc);

[CNode(Kind = "Function")]
[DllImport(LibraryName, EntryPoint = "SDL_LoadFunction", CallingConvention = CallingConvention.Cdecl)]
Expand All @@ -1777,7 +1781,7 @@ public static unsafe partial class SDL

[CNode(Kind = "Function")]
[DllImport(LibraryName, EntryPoint = "SDL_LoadWAV_RW", CallingConvention = CallingConvention.Cdecl)]
public static extern SDL_AudioSpec* SDL_LoadWAV_RW(SDL_RWops* src, int freesrc, SDL_AudioSpec* spec, byte** audio_buf, uint* audio_len);
public static extern SDL_AudioSpec* SDL_LoadWAV_RW(SDL_RWops* src, CBool freesrc, SDL_AudioSpec* spec, byte** audio_buf, uint* audio_len);

[CNode(Kind = "Function")]
[DllImport(LibraryName, EntryPoint = "SDL_LockAudioDevice", CallingConvention = CallingConvention.Cdecl)]
Expand Down Expand Up @@ -2017,15 +2021,15 @@ public static unsafe partial class SDL

[CNode(Kind = "Function")]
[DllImport(LibraryName, EntryPoint = "SDL_RWFromConstMem", CallingConvention = CallingConvention.Cdecl)]
public static extern SDL_RWops* SDL_RWFromConstMem(void* mem, int size);
public static extern SDL_RWops* SDL_RWFromConstMem(void* mem, ulong size);

[CNode(Kind = "Function")]
[DllImport(LibraryName, EntryPoint = "SDL_RWFromFile", CallingConvention = CallingConvention.Cdecl)]
public static extern SDL_RWops* SDL_RWFromFile(CString file, CString mode);

[CNode(Kind = "Function")]
[DllImport(LibraryName, EntryPoint = "SDL_RWFromMem", CallingConvention = CallingConvention.Cdecl)]
public static extern SDL_RWops* SDL_RWFromMem(void* mem, int size);
public static extern SDL_RWops* SDL_RWFromMem(void* mem, ulong size);

[CNode(Kind = "Function")]
[DllImport(LibraryName, EntryPoint = "SDL_RWclose", CallingConvention = CallingConvention.Cdecl)]
Expand Down

0 comments on commit 621f366

Please sign in to comment.