Update to latest SDL3-CS friendly overload and null-terminated UTF8 conversion

osu.Framework/Platform/SDL/SDL3Clipboard.cs

@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System.Text;
 using SDL;
 using SixLabors.ImageSharp;
 
@@ -14,7 +13,7 @@
         // assume that empty text means no text.
         public override string? GetText() => SDL3.SDL_HasClipboardText() == SDL_bool.SDL_TRUE ? SDL3.SDL_GetClipboardText() : null;
 
-        public override void SetText(string text) => SDL3.SDL_SetClipboardText(Encoding.UTF8.GetBytes(text));
+        public override void SetText(string text) => SDL3.SDL_SetClipboardText(text);
 
         public override Image<TPixel>? GetImage<TPixel>()
         {

osu.Framework/Platform/SDL/SDL3GraphicsSurface.cs

@@ -7,7 +7,6 @@
 using System.Linq;
 using System.Reflection;
 using System.Runtime.InteropServices;
-using System.Text;
 using osuTK.Graphics;
 using osuTK.Graphics.ES30;
 using SDL;
@@ -141,7 +140,7 @@
             // Prevent logging calls to SDL_GL_GetProcAddress() that fail on systems which don't have the requested symbol (typically macOS).
             SDL3.SDL_LogSetPriority(error_category, SDL_LogPriority.SDL_LOG_PRIORITY_INFO);
 
-            IntPtr ret = SDL3.SDL_GL_GetProcAddress(Encoding.UTF8.GetBytes(symbol));
+            IntPtr ret = SDL3.SDL_GL_GetProcAddress(symbol);
 
             // Reset the logging behaviour.
             SDL3.SDL_LogSetPriority(error_category, oldPriority);

osu.Framework/Platform/SDL3Window.cs

@@ -5,7 +5,6 @@
 using System.IO;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using System.Text;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Configuration;
@@ -70,7 +69,7 @@
             set
             {
                 title = value;
-                ScheduleCommand(() => SDL3.SDL_SetWindowTitle(SDLWindowHandle, Encoding.UTF8.GetBytes(title)));
+                ScheduleCommand(() => SDL3.SDL_SetWindowTitle(SDLWindowHandle, title));
             }
         }
 
@@ -202,7 +201,7 @@
             // so we deactivate it on startup.
             SDL3.SDL_StopTextInput();
 
-            SDLWindowHandle = SDL3.SDL_CreateWindow(Encoding.UTF8.GetBytes(title), Size.Width, Size.Height, flags);
+            SDLWindowHandle = SDL3.SDL_CreateWindow(title, Size.Width, Size.Height, flags);
 
             if (SDLWindowHandle == null)
                 throw new InvalidOperationException($"Failed to create SDL window. SDL Error: {SDL3.SDL_GetError()}");
@@ -275,7 +274,7 @@
         /// </remarks>
         protected virtual void HandleEventFromFilter(SDL_Event evt)
         {
-            switch (evt.type)
+            switch (evt.Type)
             {
                 case SDL_EventType.SDL_EVENT_TERMINATING:
                     handleQuitEvent(evt.quit);
@@ -297,7 +296,7 @@
 
         protected void HandleEventFromWatch(SDL_Event evt)
         {
-            switch (evt.type)
+            switch (evt.Type)
             {
                 case SDL_EventType.SDL_EVENT_WINDOW_RESIZED:
                     // polling via SDL_PollEvent blocks on resizes (https://stackoverflow.com/a/50858339)
@@ -450,8 +449,7 @@
 
             do
             {
-                fixed (SDL_Event* buf = events)
-                    eventsRead = SDL3.SDL_PeepEvents(buf, events_per_peep, SDL_eventaction.SDL_GETEVENT, SDL_EventType.SDL_EVENT_FIRST, SDL_EventType.SDL_EVENT_LAST);
+                eventsRead = SDL3.SDL_PeepEvents(events, SDL_eventaction.SDL_GETEVENT, SDL_EventType.SDL_EVENT_FIRST, SDL_EventType.SDL_EVENT_LAST);
                 for (int i = 0; i < eventsRead; i++)
                     HandleEvent(events[i]);
             } while (eventsRead == events_per_peep);
@@ -462,19 +460,19 @@
         /// </summary>
         protected virtual void HandleEvent(SDL_Event e)
         {
-            if (e.type >= SDL_EventType.SDL_EVENT_DISPLAY_FIRST && e.type <= SDL_EventType.SDL_EVENT_DISPLAY_LAST)
+            if (e.Type >= SDL_EventType.SDL_EVENT_DISPLAY_FIRST && e.Type <= SDL_EventType.SDL_EVENT_DISPLAY_LAST)
             {
                 handleDisplayEvent(e.display);
                 return;
             }
 
-            if (e.type >= SDL_EventType.SDL_EVENT_WINDOW_FIRST && e.type <= SDL_EventType.SDL_EVENT_WINDOW_LAST)
+            if (e.Type >= SDL_EventType.SDL_EVENT_WINDOW_FIRST && e.Type <= SDL_EventType.SDL_EVENT_WINDOW_LAST)
             {
                 handleWindowEvent(e.window);
                 return;
             }
 
-            switch (e.type)
+            switch (e.Type)
             {
                 case SDL_EventType.SDL_EVENT_QUIT:
                     handleQuitEvent(e.quit);

osu.Framework/Platform/Windows/WindowsWindow.cs

@@ -93,7 +93,7 @@
 
         protected override void HandleEventFromFilter(SDL_Event evt)
         {
-            switch (evt.type)
+            switch (evt.Type)
             {
                 case SDL_EventType.SDL_EVENT_WINDOW_FOCUS_LOST:
                     warpCursorFromFocusLoss();