From 6f3ca6c22a7f373e75387306db7329d1ff2ab25a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 7 Jul 2023 01:36:49 +0300
Subject: [PATCH 1/5] Disable Mono interpreter on release mode

---
 osu.Framework.iOS.props | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/osu.Framework.iOS.props b/osu.Framework.iOS.props
index 4effbe4d72..47a1552dca 100644
--- a/osu.Framework.iOS.props
+++ b/osu.Framework.iOS.props
@@ -1,15 +1,20 @@
 <Project>
   <PropertyGroup>
     <CodesignKey>iPhone Developer</CodesignKey>
-    <!-- Mono Interpreter resolves many AOT issues occuring on runtime,
-         and will be enabled by default on .NET 8+: https://github.com/dotnet/maui/issues/13019 -->
-    <UseInterpreter>true</UseInterpreter>
     <NullabilityInfoContextSupport>true</NullabilityInfoContextSupport>
     <!-- MT7091 occurs when referencing a .framework bundle that consists of a static library.
          It only warns about not copying the library to the app bundle to save space,
          so there's nothing to be worried about. -->
     <NoWarn>$(NoWarn);MT7091</NoWarn>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
+    <!-- On debug configurations, we need Mono interpreter for faster compilation. -->
+    <UseInterpreter>true</UseInterpreter>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)' == 'Release'">
+    <!-- On release configurations, we need AOT compiler for optimal performance. -->
+    <UseInterpreter>false</UseInterpreter>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Platform)' == 'iPhone'">
     <RuntimeIdentifier>ios-arm64</RuntimeIdentifier>
   </PropertyGroup>

From 06b8cd3ebe5c91046a9018792cd18dc26b65a2fb Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 7 Jul 2023 01:40:56 +0300
Subject: [PATCH 2/5] Fix SDL library not found exception with AOT enabled

Depends on https://github.com/ppy/SDL2-CS/pull/169
---
 osu.Framework.iOS/GameApplication.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Framework.iOS/GameApplication.cs b/osu.Framework.iOS/GameApplication.cs
index c0b8ff0b3f..9e95e0804f 100644
--- a/osu.Framework.iOS/GameApplication.cs
+++ b/osu.Framework.iOS/GameApplication.cs
@@ -32,6 +32,7 @@ public static void Main(Game target)
 
             game = target;
 
+            SDL.PrepareLibraryForIOS();
             SDL.SDL_UIKitRunApp(0, IntPtr.Zero, main);
         }
 

From 3df1db116bc9a702b1f5bc14947728d274d65075 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 7 Jul 2023 03:07:00 +0300
Subject: [PATCH 3/5] Fix iOS main run loop method requiring JIT compilation

---
 osu.Framework.iOS/IOSWindow.cs       | 12 +++++++++++-
 osu.Framework/Platform/SDL2Window.cs | 11 +++++++----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/osu.Framework.iOS/IOSWindow.cs b/osu.Framework.iOS/IOSWindow.cs
index ad4f5d389f..1e0e404ff3 100644
--- a/osu.Framework.iOS/IOSWindow.cs
+++ b/osu.Framework.iOS/IOSWindow.cs
@@ -5,6 +5,7 @@
 using System.Diagnostics;
 using System.Drawing;
 using ObjCRuntime;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Platform;
 using SDL2;
@@ -60,7 +61,16 @@ protected override void RunMainLoop()
             // frame rate with multi-threaded mode turned on, but it is going to give them worse input latency
             // and higher power usage.
             SDL.SDL_iPhoneSetEventPump(SDL.SDL_bool.SDL_FALSE);
-            SDL.SDL_iPhoneSetAnimationCallback(SDLWindowHandle, 1, _ => RunFrame(), IntPtr.Zero);
+            SDL.SDL_iPhoneSetAnimationCallback(SDLWindowHandle, 1, runFrame, ObjectHandle.Handle);
+        }
+
+        [ObjCRuntime.MonoPInvokeCallback(typeof(SDL.SDL_iPhoneAnimationCallback))]
+        private static void runFrame(IntPtr userdata)
+        {
+            var handle = new ObjectHandle<IOSWindow>(userdata);
+
+            if (handle.GetTarget(out IOSWindow window))
+                window.RunFrame();
         }
 
         private void updateSafeArea()
diff --git a/osu.Framework/Platform/SDL2Window.cs b/osu.Framework/Platform/SDL2Window.cs
index 553745cda3..ee987ac999 100644
--- a/osu.Framework/Platform/SDL2Window.cs
+++ b/osu.Framework/Platform/SDL2Window.cs
@@ -174,11 +174,14 @@ internal SDL.SDL_SysWMinfo GetWindowSystemInformation()
         [UsedImplicitly]
         private SDL.SDL_EventFilter? eventFilterDelegate;
 
-        private ObjectHandle<SDL2Window> objectHandle;
+        /// <summary>
+        /// Represents a handle to this <see cref="SDL2Window"/> instance, used for unmanaged callbacks.
+        /// </summary>
+        protected ObjectHandle<SDL2Window> ObjectHandle { get; private set; }
 
         protected SDL2Window(GraphicsSurfaceType surfaceType)
         {
-            objectHandle = new ObjectHandle<SDL2Window>(this, GCHandleType.Normal);
+            ObjectHandle = new ObjectHandle<SDL2Window>(this, GCHandleType.Normal);
 
             if (SDL.SDL_Init(SDL.SDL_INIT_VIDEO | SDL.SDL_INIT_GAMECONTROLLER) < 0)
             {
@@ -250,7 +253,7 @@ public virtual void Create()
         /// </summary>
         public void Run()
         {
-            SDL.SDL_SetEventFilter(eventFilterDelegate = eventFilter, objectHandle.Handle);
+            SDL.SDL_SetEventFilter(eventFilterDelegate = eventFilter, ObjectHandle.Handle);
 
             RunMainLoop();
         }
@@ -614,7 +617,7 @@ public void Dispose()
             Close();
             SDL.SDL_Quit();
 
-            objectHandle.Dispose();
+            ObjectHandle.Dispose();
         }
     }
 }

From 507375ed0dee916c8733297ad8776db86cef3af9 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 7 Jul 2023 03:49:18 +0300
Subject: [PATCH 4/5] Update packages

---
 osu.Framework/osu.Framework.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Framework/osu.Framework.csproj b/osu.Framework/osu.Framework.csproj
index af1fe63ae4..3f6375c101 100644
--- a/osu.Framework/osu.Framework.csproj
+++ b/osu.Framework/osu.Framework.csproj
@@ -27,7 +27,7 @@
     <PackageReference Include="ppy.ManagedBass" Version="2022.1216.0" />
     <PackageReference Include="ppy.ManagedBass.Fx" Version="2022.1216.0" />
     <PackageReference Include="ppy.ManagedBass.Mix" Version="2022.1216.0" />
-    <PackageReference Include="ppy.Veldrid" Version="4.9.3-gf4e09bb395" />
+    <PackageReference Include="ppy.Veldrid" Version="4.9.3-g9f8aa2931a" />
     <PackageReference Include="ppy.Veldrid.SPIRV" Version="1.0.15-g3e4b9f196a" />
     <PackageReference Include="SharpFNT" Version="2.0.0" />
     <!-- Preview version of ImageSharp causes NU5104. -->
@@ -38,7 +38,7 @@
     <PackageReference Include="JetBrains.Annotations" Version="2022.3.1" />
     <PackageReference Include="ppy.osuTK.NS20" Version="1.0.211" />
     <PackageReference Include="StbiSharp" Version="1.1.0" />
-    <PackageReference Include="ppy.SDL2-CS" Version="1.0.669-alpha" />
+    <PackageReference Include="ppy.SDL2-CS" Version="1.0.671-alpha" />
     <PackageReference Include="ppy.osu.Framework.SourceGeneration" Version="2023.619.0" />
 
     <!-- DO NOT use ProjectReference for native packaging project.

From 659edfb03db774b7351939f56ac892b8e41b4edf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Jul 2023 09:58:07 +0900
Subject: [PATCH 5/5] Slight reword

---
 osu.Framework.iOS.props | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Framework.iOS.props b/osu.Framework.iOS.props
index 47a1552dca..48a6515a87 100644
--- a/osu.Framework.iOS.props
+++ b/osu.Framework.iOS.props
@@ -8,11 +8,11 @@
     <NoWarn>$(NoWarn);MT7091</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
-    <!-- On debug configurations, we need Mono interpreter for faster compilation. -->
+    <!-- On debug configurations, we use Mono interpreter for faster compilation. -->
     <UseInterpreter>true</UseInterpreter>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)' == 'Release'">
-    <!-- On release configurations, we need AOT compiler for optimal performance. -->
+    <!-- On release configurations, we use AOT compiler for optimal performance. -->
     <UseInterpreter>false</UseInterpreter>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Platform)' == 'iPhone'">