From 4831863919ebbc421984db31f2953e9ae459f207 Mon Sep 17 00:00:00 2001 From: Susko3 Date: Thu, 24 Oct 2024 01:13:18 +0100 Subject: [PATCH] Update SDL and bindings --- External/SDL | 2 +- SDL3-CS/SDL3/ClangSharp/SDL_events.g.cs | 1 + SDL3-CS/SDL3/ClangSharp/SDL_video.g.cs | 66 ++++++++++++++----------- SDL3-CS/SDL3/SDL_video.cs | 35 +++++++++++++ 4 files changed, 73 insertions(+), 31 deletions(-) diff --git a/External/SDL b/External/SDL index 92520c1..d0cf2c1 160000 --- a/External/SDL +++ b/External/SDL @@ -1 +1 @@ -Subproject commit 92520c1d9bffedcd558e8076691bc348285320df +Subproject commit d0cf2c19d1a3aa59b50198634da6854ef597de88 diff --git a/SDL3-CS/SDL3/ClangSharp/SDL_events.g.cs b/SDL3-CS/SDL3/ClangSharp/SDL_events.g.cs index 5d5c7dc..99b24ba 100644 --- a/SDL3-CS/SDL3/ClangSharp/SDL_events.g.cs +++ b/SDL3-CS/SDL3/ClangSharp/SDL_events.g.cs @@ -139,6 +139,7 @@ namespace SDL SDL_EVENT_CAMERA_DEVICE_DENIED, SDL_EVENT_RENDER_TARGETS_RESET = 0x2000, SDL_EVENT_RENDER_DEVICE_RESET, + SDL_EVENT_RENDER_DEVICE_LOST, SDL_EVENT_PRIVATE0 = 0x4000, SDL_EVENT_PRIVATE1, SDL_EVENT_PRIVATE2, diff --git a/SDL3-CS/SDL3/ClangSharp/SDL_video.g.cs b/SDL3-CS/SDL3/ClangSharp/SDL_video.g.cs index c8fa8c8..bdebf6a 100644 --- a/SDL3-CS/SDL3/ClangSharp/SDL_video.g.cs +++ b/SDL3-CS/SDL3/ClangSharp/SDL_video.g.cs @@ -84,7 +84,7 @@ namespace SDL { } - public enum SDL_GLattr + public enum SDL_GLAttr { SDL_GL_RED_SIZE, SDL_GL_GREEN_SIZE, @@ -116,33 +116,6 @@ namespace SDL SDL_GL_EGL_PLATFORM, } - public enum SDL_GLprofile - { - SDL_GL_CONTEXT_PROFILE_CORE = 0x0001, - SDL_GL_CONTEXT_PROFILE_COMPATIBILITY = 0x0002, - SDL_GL_CONTEXT_PROFILE_ES = 0x0004, - } - - public enum SDL_GLcontextFlag - { - SDL_GL_CONTEXT_DEBUG_FLAG = 0x0001, - SDL_GL_CONTEXT_FORWARD_COMPATIBLE_FLAG = 0x0002, - SDL_GL_CONTEXT_ROBUST_ACCESS_FLAG = 0x0004, - SDL_GL_CONTEXT_RESET_ISOLATION_FLAG = 0x0008, - } - - public enum SDL_GLcontextReleaseFlag - { - SDL_GL_CONTEXT_RELEASE_BEHAVIOR_NONE = 0x0000, - SDL_GL_CONTEXT_RELEASE_BEHAVIOR_FLUSH = 0x0001, - } - - public enum SDL_GLContextResetNotification - { - SDL_GL_CONTEXT_RESET_NO_NOTIFICATION = 0x0000, - SDL_GL_CONTEXT_RESET_LOSE_CONTEXT = 0x0001, - } - public enum SDL_HitTestResult { SDL_HITTEST_NORMAL, @@ -511,11 +484,11 @@ namespace SDL [DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] [return: NativeTypeName("bool")] - public static extern SDLBool SDL_GL_SetAttribute(SDL_GLattr attr, int value); + public static extern SDLBool SDL_GL_SetAttribute(SDL_GLAttr attr, int value); [DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] [return: NativeTypeName("bool")] - public static extern SDLBool SDL_GL_GetAttribute(SDL_GLattr attr, int* value); + public static extern SDLBool SDL_GL_GetAttribute(SDL_GLAttr attr, int* value); [DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] [return: NativeTypeName("SDL_GLContext")] @@ -653,6 +626,39 @@ namespace SDL [NativeTypeName("#define SDL_WINDOWPOS_CENTERED SDL_WINDOWPOS_CENTERED_DISPLAY(0)")] public const uint SDL_WINDOWPOS_CENTERED = (0x2FFF0000U | (0)); + [NativeTypeName("#define SDL_GL_CONTEXT_PROFILE_CORE 0x0001")] + public const int SDL_GL_CONTEXT_PROFILE_CORE = 0x0001; + + [NativeTypeName("#define SDL_GL_CONTEXT_PROFILE_COMPATIBILITY 0x0002")] + public const int SDL_GL_CONTEXT_PROFILE_COMPATIBILITY = 0x0002; + + [NativeTypeName("#define SDL_GL_CONTEXT_PROFILE_ES 0x0004")] + public const int SDL_GL_CONTEXT_PROFILE_ES = 0x0004; + + [NativeTypeName("#define SDL_GL_CONTEXT_DEBUG_FLAG 0x0001")] + public const int SDL_GL_CONTEXT_DEBUG_FLAG = 0x0001; + + [NativeTypeName("#define SDL_GL_CONTEXT_FORWARD_COMPATIBLE_FLAG 0x0002")] + public const int SDL_GL_CONTEXT_FORWARD_COMPATIBLE_FLAG = 0x0002; + + [NativeTypeName("#define SDL_GL_CONTEXT_ROBUST_ACCESS_FLAG 0x0004")] + public const int SDL_GL_CONTEXT_ROBUST_ACCESS_FLAG = 0x0004; + + [NativeTypeName("#define SDL_GL_CONTEXT_RESET_ISOLATION_FLAG 0x0008")] + public const int SDL_GL_CONTEXT_RESET_ISOLATION_FLAG = 0x0008; + + [NativeTypeName("#define SDL_GL_CONTEXT_RELEASE_BEHAVIOR_NONE 0x0000")] + public const int SDL_GL_CONTEXT_RELEASE_BEHAVIOR_NONE = 0x0000; + + [NativeTypeName("#define SDL_GL_CONTEXT_RELEASE_BEHAVIOR_FLUSH 0x0001")] + public const int SDL_GL_CONTEXT_RELEASE_BEHAVIOR_FLUSH = 0x0001; + + [NativeTypeName("#define SDL_GL_CONTEXT_RESET_NO_NOTIFICATION 0x0000")] + public const int SDL_GL_CONTEXT_RESET_NO_NOTIFICATION = 0x0000; + + [NativeTypeName("#define SDL_GL_CONTEXT_RESET_LOSE_CONTEXT 0x0001")] + public const int SDL_GL_CONTEXT_RESET_LOSE_CONTEXT = 0x0001; + [NativeTypeName("#define SDL_PROP_DISPLAY_HDR_ENABLED_BOOLEAN \"SDL.display.HDR_enabled\"")] public static ReadOnlySpan SDL_PROP_DISPLAY_HDR_ENABLED_BOOLEAN => "SDL.display.HDR_enabled"u8; diff --git a/SDL3-CS/SDL3/SDL_video.cs b/SDL3-CS/SDL3/SDL_video.cs index 37d99d1..0b952ab 100644 --- a/SDL3-CS/SDL3/SDL_video.cs +++ b/SDL3-CS/SDL3/SDL_video.cs @@ -41,6 +41,41 @@ namespace SDL SDL_WINDOW_NOT_FOCUSABLE = SDL3.SDL_WINDOW_NOT_FOCUSABLE, } + [Flags] + [Typedef] + public enum SDL_GLProfile + { + SDL_GL_CONTEXT_PROFILE_CORE = SDL3.SDL_GL_CONTEXT_PROFILE_CORE, + SDL_GL_CONTEXT_PROFILE_COMPATIBILITY = SDL3.SDL_GL_CONTEXT_PROFILE_COMPATIBILITY, + SDL_GL_CONTEXT_PROFILE_ES = SDL3.SDL_GL_CONTEXT_PROFILE_ES, + } + + [Flags] + [Typedef] + public enum SDL_GLContextFlag + { + SDL_GL_CONTEXT_DEBUG_FLAG = SDL3.SDL_GL_CONTEXT_DEBUG_FLAG, + SDL_GL_CONTEXT_FORWARD_COMPATIBLE_FLAG = SDL3.SDL_GL_CONTEXT_FORWARD_COMPATIBLE_FLAG, + SDL_GL_CONTEXT_ROBUST_ACCESS_FLAG = SDL3.SDL_GL_CONTEXT_ROBUST_ACCESS_FLAG, + SDL_GL_CONTEXT_RESET_ISOLATION_FLAG = SDL3.SDL_GL_CONTEXT_RESET_ISOLATION_FLAG, + } + + [Flags] + [Typedef] + public enum SDL_GLContextReleaseFlag + { + SDL_GL_CONTEXT_RELEASE_BEHAVIOR_NONE = SDL3.SDL_GL_CONTEXT_RELEASE_BEHAVIOR_NONE, + SDL_GL_CONTEXT_RELEASE_BEHAVIOR_FLUSH = SDL3.SDL_GL_CONTEXT_RELEASE_BEHAVIOR_FLUSH, + } + + [Flags] + [Typedef] + public enum SDL_GLContextResetNotification + { + SDL_GL_CONTEXT_RESET_NO_NOTIFICATION = SDL3.SDL_GL_CONTEXT_RESET_NO_NOTIFICATION, + SDL_GL_CONTEXT_RESET_LOSE_CONTEXT = SDL3.SDL_GL_CONTEXT_RESET_LOSE_CONTEXT, + } + public static partial class SDL3 { [Macro]