Merge pull request #6468 from Susko3/uikit-framebuffer-sdl3

Implement getting OpenGL iOS main framebuffer on SDL3
ppy · Dec 21, 2024 · 1022955 · 1022955
2 parents beb2fa2 + 35b5cf9
commit 1022955
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/osu.Framework/Platform/SDL3/SDL3GraphicsSurface.cs b/osu.Framework/Platform/SDL3/SDL3GraphicsSurface.cs
@@ -156,14 +156,10 @@ private IntPtr getProcAddress(string symbol)
                 if (window.SDLWindowHandle == null)
                     return null;
 
-                // TODO: Migrate to SDL3 when https://github.com/libsdl-org/SDL/issues/9430 is resolved
-                // var wmInfo = window.GetWindowSystemInformation();
-                //
-                // switch (wmInfo.subsystem)
-                // {
-                //     case SDL_SYSWM_TYPE.SDL_SYSWM_UIKIT:
-                //         return (int)wmInfo.info.uikit.framebuffer;
-                // }
+                var props = SDL_GetWindowProperties(window.SDLWindowHandle);
+
+                if (SDL_HasProperty(props, SDL_PROP_WINDOW_UIKIT_OPENGL_FRAMEBUFFER_NUMBER))
+                    return (int)SDL_GetNumberProperty(props, SDL_PROP_WINDOW_UIKIT_OPENGL_FRAMEBUFFER_NUMBER, 0);
 
                 return null;
             }