Enable Vulkan support and fix Android JNI surface logic

osu.Android/OsuGameActivity.cs

@@ -16,6 +16,7 @@
 using osu.Game.Database;
 using Debug = System.Diagnostics.Debug;
 using Uri = Android.Net.Uri;
+using osu.Framework.Extensions;
 
 namespace osu.Android
 {
@@ -83,6 +84,15 @@ protected override void OnCreate(Bundle? savedInstanceState)
             // first use because the internal Platform.CurrentActivity is null.
             Microsoft.Maui.ApplicationModel.Platform.Init(this, savedInstanceState);
 
+            try
+            {
+                global::Java.Lang.JavaSystem.LoadLibrary("osu_native");
+            }
+            catch (Exception e)
+            {
+                global::Android.Util.Log.Error("OsuGameActivity", $"Failed to load native library: {e}");
+            }
+
 
 
             // OnNewIntent() only fires for an activity if it's *re-launched* while it's on top of the activity stack.
@@ -195,5 +205,42 @@ await Task.WhenAll(uris.Select(async uri =>
 
             if (game != null) await game.Import(tasks.ToArray()).ConfigureAwait(false);
         }, TaskCreationOptions.LongRunning);
+
+        public global::Android.Views.Surface? GetSurface()
+        {
+            var rootView = Window?.DecorView;
+            if (rootView == null) return null;
+            return findSurfaceView(rootView)?.Holder?.Surface;
+        }
+
+        public IntPtr GetSurfaceGlobalRef()
+        {
+            var tcs = new TaskCompletionSource<IntPtr>();
+            RunOnUiThread(() =>
+            {
+                var surface = GetSurface();
+                if (surface != null && surface.Handle != IntPtr.Zero)
+                    tcs.SetResult(global::Android.Runtime.JNIEnv.NewGlobalRef(surface.Handle));
+                else
+                    tcs.SetResult(IntPtr.Zero);
+            });
+            tcs.Task.WaitSafely();
+            return tcs.Task.GetResultSafely();
+        }
+
+        private global::Android.Views.SurfaceView? findSurfaceView(global::Android.Views.View? view)
+        {
+            if (view == null) return null;
+            if (view is global::Android.Views.SurfaceView sv) return sv;
+            if (view is global::Android.Views.ViewGroup vg)
+            {
+                for (int i = 0; i < vg.ChildCount; i++)
+                {
+                    var found = findSurfaceView(vg.GetChildAt(i));
+                    if (found != null) return found;
+                }
+            }
+            return null;
+        }
     }
 }

osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs

@@ -35,7 +35,7 @@ private void load(FrameworkConfigManager config, OsuConfigManager osuConfig, IDi
                     Current = renderer,
                     Items = host.GetPreferredRenderersForCurrentPlatform().Order()
 #pragma warning disable CS0612 // Type or member is obsolete
-                                .Where(t => t != RendererType.Vulkan && t != RendererType.OpenGLLegacy),
+                                .Where(t => t != RendererType.OpenGLLegacy),
 #pragma warning restore CS0612 // Type or member is obsolete
                 })
                 {

osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs

@@ -226,16 +226,17 @@
 
         private void onListingReceived(Room[] result)
         {
-            Dictionary<long, Room> localRoomsById = roomListing.Rooms.ToDictionary(r => r.RoomID!.Value);
-            Dictionary<long, Room> resultRoomsById = result.ToDictionary(r => r.RoomID!.Value);
+            Dictionary<long, Room> localRoomsById = roomListing.Rooms.Where(r => r.RoomID != null).ToDictionary(r => r.RoomID!.Value);
+            Dictionary<long, Room> resultRoomsById = result.Where(r => r.RoomID != null).ToDictionary(r => r.RoomID!.Value);
 
             // Remove all local rooms no longer in the result set.
-            roomListing.Rooms.RemoveAll(r => !resultRoomsById.ContainsKey(r.RoomID!.Value));
+            roomListing.Rooms.RemoveAll(r => r.RoomID == null || !resultRoomsById.ContainsKey(r.RoomID.Value));
 
             // Add or update local rooms with the result set.
             foreach (var r in result)
             {
-                if (localRoomsById.TryGetValue(r.RoomID!.Value, out Room? existingRoom))
+                if (r.RoomID == null) continue;
+                if (localRoomsById.TryGetValue(r.RoomID.Value, out Room? existingRoom))
                     existingRoom.CopyFrom(r);
                 else
                     roomListing.Rooms.Add(r);