Merge branch 'master' into chat-report

.github/workflows/ci.yml

@@ -13,17 +13,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       # FIXME: Tools won't run in .NET 6.0 unless you install 3.1.x LTS side by side.
       # https://itnext.io/how-to-support-multiple-net-sdks-in-github-actions-workflows-b988daa884e
       - name: Install .NET 3.1.x LTS
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v3
         with:
           dotnet-version: "3.1.x"
 
       - name: Install .NET 6.0.x
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v3
         with:
           dotnet-version: "6.0.x"
 
@@ -77,10 +77,10 @@ jobs:
     timeout-minutes: 60
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Install .NET 6.0.x
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v3
         with:
           dotnet-version: "6.0.x"
 
@@ -94,7 +94,7 @@ jobs:
       # Attempt to upload results even if test fails.
       # https://docs.github.com/en/actions/reference/context-and-expression-syntax-for-github-actions#always
       - name: Upload Test Results
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         if: ${{ always() }}
         with:
           name: osu-test-results-${{matrix.os.prettyname}}-${{matrix.threadingMode}}
@@ -106,10 +106,10 @@ jobs:
     timeout-minutes: 60
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Install .NET 6.0.x
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v3
         with:
           dotnet-version: "6.0.x"
 
@@ -125,10 +125,10 @@ jobs:
     timeout-minutes: 60
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Install .NET 6.0.x
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v3
         with:
           dotnet-version: "6.0.x"
 

.github/workflows/diffcalc.yml

@@ -48,8 +48,8 @@ jobs:
             CONTINUE="no"
           fi
 
-          echo "::set-output name=continue::${CONTINUE}"
+          echo "continue=${CONTINUE}" >> $GITHUB_OUTPUT
-          echo "::set-output name=matrix::${MATRIX_JSON}"
+          echo "matrix=${MATRIX_JSON}" >> $GITHUB_OUTPUT
   diffcalc:
     name: Run
     runs-on: self-hosted
@@ -80,34 +80,34 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          echo "::set-output name=branchname::$(curl -H "Authorization: token ${GITHUB_TOKEN}" ${{ github.event.issue.pull_request.url }} | jq '.head.ref' | sed 's/\"//g')"
+          echo "branchname=$(curl -H "Authorization: token ${GITHUB_TOKEN}" ${{ github.event.issue.pull_request.url }} | jq '.head.ref' | sed 's/\"//g')" >> $GITHUB_OUTPUT
-          echo "::set-output name=repo::$(curl -H "Authorization: token ${GITHUB_TOKEN}" ${{ github.event.issue.pull_request.url }} | jq '.head.repo.full_name' | sed 's/\"//g')"
+          echo "repo=$(curl -H "Authorization: token ${GITHUB_TOKEN}" ${{ github.event.issue.pull_request.url }} | jq '.head.repo.full_name' | sed 's/\"//g')" >> $GITHUB_OUTPUT
 
       # Checkout osu
       - name: Checkout osu (master)
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: 'master/osu'
       - name: Checkout osu (pr)
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: 'pr/osu'
           repository: ${{ steps.upstreambranch.outputs.repo }}
           ref: ${{ steps.upstreambranch.outputs.branchname }}
 
       - name: Checkout osu-difficulty-calculator (master)
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: ppy/osu-difficulty-calculator
           path: 'master/osu-difficulty-calculator'
       - name: Checkout osu-difficulty-calculator (pr)
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: ppy/osu-difficulty-calculator
           path: 'pr/osu-difficulty-calculator'
 
       - name: Install .NET 5.0.x
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v3
         with:
           dotnet-version: "5.0.x"
 

.github/workflows/sentry-release.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 

osu.Android.props

@@ -11,7 +11,7 @@
     <AndroidManifestMerger>manifestmerger.jar</AndroidManifestMerger>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.314.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.327.0" />
   </ItemGroup>
   <ItemGroup>
     <AndroidManifestOverlay Include="$(MSBuildThisFileDirectory)osu.Android\Properties\AndroidManifestOverlay.xml" />

osu.Game.Rulesets.Catch.Tests.iOS/AppDelegate.cs

@@ -1,17 +0,0 @@
-// 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.
-
-#nullable disable
-
-using Foundation;
-using osu.Framework.iOS;
-using osu.Game.Tests;
-
-namespace osu.Game.Rulesets.Catch.Tests.iOS
-{
-    [Register("AppDelegate")]
-    public class AppDelegate : GameAppDelegate
-    {
-        protected override Framework.Game CreateGame() => new OsuTestBrowser();
-    }
-}

osu.Game.Rulesets.Catch.Tests.iOS/Application.cs

@@ -1,9 +1,8 @@
 // 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.
 
-#nullable disable
+using osu.Framework.iOS;
-
+using osu.Game.Tests;
-using UIKit;
 
 namespace osu.Game.Rulesets.Catch.Tests.iOS
 {
@@ -11,7 +10,7 @@ namespace osu.Game.Rulesets.Catch.Tests.iOS
     {
         public static void Main(string[] args)
         {
-            UIApplication.Main(args, null, typeof(AppDelegate));
+            GameApplication.Main(new OsuTestBrowser());
         }
     }
 }

osu.Game.Rulesets.Mania.Tests.iOS/AppDelegate.cs

@@ -1,17 +0,0 @@
-// 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.
-
-#nullable disable
-
-using Foundation;
-using osu.Framework.iOS;
-using osu.Game.Tests;
-
-namespace osu.Game.Rulesets.Mania.Tests.iOS
-{
-    [Register("AppDelegate")]
-    public class AppDelegate : GameAppDelegate
-    {
-        protected override Framework.Game CreateGame() => new OsuTestBrowser();
-    }
-}

osu.Game.Rulesets.Mania.Tests.iOS/Application.cs

@@ -1,9 +1,8 @@
 // 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.
 
-#nullable disable
+using osu.Framework.iOS;
-
+using osu.Game.Tests;
-using UIKit;
 
 namespace osu.Game.Rulesets.Mania.Tests.iOS
 {
@@ -11,7 +10,7 @@ namespace osu.Game.Rulesets.Mania.Tests.iOS
     {
         public static void Main(string[] args)
         {
-            UIApplication.Main(args, null, typeof(AppDelegate));
+            GameApplication.Main(new OsuTestBrowser());
         }
     }
 }

osu.Game.Rulesets.Mania.Tests/TestSceneManiaPlayer.cs

@@ -3,6 +3,9 @@
 
 #nullable disable
 
+using osu.Framework.Extensions.ObjectExtensions;
+using osu.Game.Rulesets.Mania.Configuration;
+using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Mania.Tests
@@ -10,5 +13,19 @@ namespace osu.Game.Rulesets.Mania.Tests
     public partial class TestSceneManiaPlayer : PlayerTestScene
     {
         protected override Ruleset CreatePlayerRuleset() => new ManiaRuleset();
+
+        public override void SetUpSteps()
+        {
+            base.SetUpSteps();
+
+            AddStep("change direction to down", () => changeDirectionTo(ManiaScrollingDirection.Down));
+            AddStep("change direction to up", () => changeDirectionTo(ManiaScrollingDirection.Up));
+        }
+
+        private void changeDirectionTo(ManiaScrollingDirection direction)
+        {
+            var rulesetConfig = (ManiaRulesetConfigManager)RulesetConfigs.GetConfigFor(new ManiaRuleset()).AsNonNull();
+            rulesetConfig.SetValue(ManiaRulesetSetting.ScrollDirection, direction);
+        }
     }
 }

osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHitExplosion.cs

@@ -43,8 +43,6 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
             {
                 largeFaint = new Container
                 {
-                    Anchor = Anchor.BottomCentre,
-                    Origin = Anchor.BottomCentre,
                     RelativeSizeAxes = Axes.Both,
                     Height = ArgonNotePiece.NOTE_ACCENT_RATIO,
                     Masking = true,
@@ -81,11 +79,15 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
             if (direction.NewValue == ScrollingDirection.Up)
             {
                 Anchor = Anchor.TopCentre;
+                largeFaint.Anchor = Anchor.TopCentre;
+                largeFaint.Origin = Anchor.TopCentre;
                 Y = ArgonNotePiece.NOTE_HEIGHT / 2;
             }
             else
             {
                 Anchor = Anchor.BottomCentre;
+                largeFaint.Anchor = Anchor.BottomCentre;
+                largeFaint.Origin = Anchor.BottomCentre;
                 Y = -ArgonNotePiece.NOTE_HEIGHT / 2;
             }
         }

osu.Game.Rulesets.Osu.Tests.iOS/AppDelegate.cs

@@ -1,17 +0,0 @@
-// 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.
-
-#nullable disable
-
-using Foundation;
-using osu.Framework.iOS;
-using osu.Game.Tests;
-
-namespace osu.Game.Rulesets.Osu.Tests.iOS
-{
-    [Register("AppDelegate")]
-    public class AppDelegate : GameAppDelegate
-    {
-        protected override Framework.Game CreateGame() => new OsuTestBrowser();
-    }
-}

osu.Game.Rulesets.Osu.Tests.iOS/Application.cs

@@ -1,9 +1,8 @@
 // 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.
 
-#nullable disable
+using osu.Framework.iOS;
-
+using osu.Game.Tests;
-using UIKit;
 
 namespace osu.Game.Rulesets.Osu.Tests.iOS
 {
@@ -11,7 +10,7 @@ namespace osu.Game.Rulesets.Osu.Tests.iOS
     {
         public static void Main(string[] args)
         {
-            UIApplication.Main(args, null, typeof(AppDelegate));
+            GameApplication.Main(new OsuTestBrowser());
         }
     }
 }

osu.Game.Rulesets.Osu/Skinning/SmokeSegment.cs

@@ -252,13 +252,14 @@ namespace osu.Game.Rulesets.Osu.Skinning
                 renderer.SetBlend(BlendingParameters.Additive);
                 renderer.PushLocalMatrix(DrawInfo.Matrix);
 
-                TextureShader.Bind();
+                BindTextureShader(renderer);
+
                 texture.Bind();
 
                 for (int i = 0; i < points.Count; i++)
                     drawPointQuad(points[i], textureRect, i + firstVisiblePointIndex);
 
-                TextureShader.Unbind();
+                UnbindTextureShader(renderer);
                 renderer.PopLocalMatrix();
             }
 

osu.Game.Rulesets.Taiko.Tests.iOS/AppDelegate.cs

@@ -1,17 +0,0 @@
-// 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.
-
-#nullable disable
-
-using Foundation;
-using osu.Framework.iOS;
-using osu.Game.Tests;
-
-namespace osu.Game.Rulesets.Taiko.Tests.iOS
-{
-    [Register("AppDelegate")]
-    public class AppDelegate : GameAppDelegate
-    {
-        protected override Framework.Game CreateGame() => new OsuTestBrowser();
-    }
-}

osu.Game.Rulesets.Taiko.Tests.iOS/Application.cs

@@ -1,9 +1,8 @@
 // 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.
 
-#nullable disable
+using osu.Framework.iOS;
-
+using osu.Game.Tests;
-using UIKit;
 
 namespace osu.Game.Rulesets.Taiko.Tests.iOS
 {
@@ -11,7 +10,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.iOS
     {
         public static void Main(string[] args)
         {
-            UIApplication.Main(args, null, typeof(AppDelegate));
+            GameApplication.Main(new OsuTestBrowser());
         }
     }
 }

osu.Game.Tests.iOS/AppDelegate.cs

@@ -1,16 +0,0 @@
-// 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.
-
-#nullable disable
-
-using Foundation;
-using osu.Framework.iOS;
-
-namespace osu.Game.Tests.iOS
-{
-    [Register("AppDelegate")]
-    public class AppDelegate : GameAppDelegate
-    {
-        protected override Framework.Game CreateGame() => new OsuTestBrowser();
-    }
-}

osu.Game.Tests.iOS/Application.cs

@@ -1,9 +1,7 @@
 // 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.
 
-#nullable disable
+using osu.Framework.iOS;
-
-using UIKit;
 
 namespace osu.Game.Tests.iOS
 {
@@ -11,7 +9,7 @@ namespace osu.Game.Tests.iOS
     {
         public static void Main(string[] args)
         {
-            UIApplication.Main(args, null, typeof(AppDelegate));
+            GameApplication.Main(new OsuTestBrowser());
         }
     }
 }

osu.Game.Tests/Visual/Background/TestSceneTriangleBorderShader.cs

@@ -100,8 +100,10 @@ namespace osu.Game.Tests.Visual.Background
 
                 private IUniformBuffer<TriangleBorderData>? borderDataBuffer;
 
-                public override void Draw(IRenderer renderer)
+                protected override void BindUniformResources(IShader shader, IRenderer renderer)
                 {
+                    base.BindUniformResources(shader, renderer);
+
                     borderDataBuffer ??= renderer.CreateUniformBuffer<TriangleBorderData>();
                     borderDataBuffer.Data = borderDataBuffer.Data with
                     {
@@ -109,9 +111,7 @@ namespace osu.Game.Tests.Visual.Background
                         TexelSize = texelSize
                     };
 
-                    TextureShader.BindUniformBlock("m_BorderData", borderDataBuffer);
+                    shader.BindUniformBlock("m_BorderData", borderDataBuffer);
-
-                    base.Draw(renderer);
                 }
 
                 protected override bool CanDrawOpaqueInterior => false;

osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs

@@ -126,6 +126,7 @@ namespace osu.Game.Tests.Visual.Online
                 Id = 13926,
                 TournamentId = 35,
                 ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2022/profile/winner_US.jpg",
+                Image = "https://assets.ppy.sh/tournament-banners/official/owc2022/profile/winner_US@2x.jpg",
             },
             Badges = new[]
             {

osu.Game.Tournament/TournamentGameBase.cs

@@ -332,13 +332,6 @@ namespace osu.Game.Tournament
 
         private void saveChanges()
         {
-            foreach (var r in ladder.Rounds)
-                r.Matches = ladder.Matches.Where(p => p.Round.Value == r).Select(p => p.ID).ToList();
-
-            ladder.Progressions = ladder.Matches.Where(p => p.Progression.Value != null).Select(p => new TournamentProgression(p.ID, p.Progression.Value.ID)).Concat(
-                                            ladder.Matches.Where(p => p.LosersProgression.Value != null).Select(p => new TournamentProgression(p.ID, p.LosersProgression.Value.ID, true)))
-                                        .ToList();
-
             // Serialise before opening stream for writing, so if there's a failure it will leave the file in the previous state.
             string serialisedLadder = GetSerialisedLadder();
 
@@ -349,6 +342,13 @@ namespace osu.Game.Tournament
 
         public string GetSerialisedLadder()
         {
+            foreach (var r in ladder.Rounds)
+                r.Matches = ladder.Matches.Where(p => p.Round.Value == r).Select(p => p.ID).ToList();
+
+            ladder.Progressions = ladder.Matches.Where(p => p.Progression.Value != null).Select(p => new TournamentProgression(p.ID, p.Progression.Value.ID)).Concat(
+                                            ladder.Matches.Where(p => p.LosersProgression.Value != null).Select(p => new TournamentProgression(p.ID, p.LosersProgression.Value.ID, true)))
+                                        .ToList();
+
             return JsonConvert.SerializeObject(ladder,
                 new JsonSerializerSettings
                 {

osu.Game/Graphics/Backgrounds/Triangles.cs

@@ -306,7 +306,7 @@ namespace osu.Game.Graphics.Backgrounds
                 };
 
                 shader.Bind();
-                shader.BindUniformBlock("m_BorderData", borderDataBuffer);
+                shader.BindUniformBlock(@"m_BorderData", borderDataBuffer);
 
                 foreach (TriangleParticle particle in parts)
                 {

osu.Game/Graphics/Backgrounds/TrianglesV2.cs

@@ -249,7 +249,7 @@ namespace osu.Game.Graphics.Backgrounds
                 };
 
                 shader.Bind();
-                shader.BindUniformBlock("m_BorderData", borderDataBuffer);
+                shader.BindUniformBlock(@"m_BorderData", borderDataBuffer);
 
                 Vector2 relativeSize = Vector2.Divide(triangleSize, size);
 

osu.Game/Graphics/Sprites/LogoAnimation.cs

@@ -76,17 +76,24 @@ namespace osu.Game.Graphics.Sprites
             private IUniformBuffer<AnimationData> animationDataBuffer;
             private IVertexBatch<LogoAnimationVertex> animationVertexBatch;
 
-            protected override void Blit(IRenderer renderer)
+            protected override void BindUniformResources(IShader shader, IRenderer renderer)
             {
-                if (DrawRectangle.Width == 0 || DrawRectangle.Height == 0)
+                base.BindUniformResources(shader, renderer);
-                    return;
 
                 animationDataBuffer ??= renderer.CreateUniformBuffer<AnimationData>();
                 animationVertexBatch ??= renderer.CreateQuadBatch<LogoAnimationVertex>(1, 2);
 
                 animationDataBuffer.Data = animationDataBuffer.Data with { Progress = progress };
 
-                TextureShader.BindUniformBlock("m_AnimationData", animationDataBuffer);
+                shader.BindUniformBlock(@"m_AnimationData", animationDataBuffer);
+            }
+
+            protected override void Blit(IRenderer renderer)
+            {
+                if (DrawRectangle.Width == 0 || DrawRectangle.Height == 0)
+                    return;
+
+                base.Blit(renderer);
 
                 renderer.DrawQuad(
                     Texture,

osu.Game/Localisation/GraphicsSettingsStrings.cs

@@ -19,6 +19,11 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString RendererHeader => new TranslatableString(getKey(@"renderer_header"), @"Renderer");
 
+        /// <summary>
+        /// "Renderer"
+        /// </summary>
+        public static LocalisableString Renderer => new TranslatableString(getKey(@"renderer"), @"Renderer");
+
         /// <summary>
         /// "Frame limiter"
         /// </summary>
@@ -144,6 +149,12 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString Png => new TranslatableString(getKey(@"png_lossless"), @"PNG (lossless)");
 
+        /// <summary>
+        /// "In order to change the renderer, the game will close. Please open it again."
+        /// </summary>
+        public static LocalisableString ChangeRendererConfirmation =>
+            new TranslatableString(getKey(@"change_renderer_configuration"), @"In order to change the renderer, the game will close. Please open it again.");
+
         private static string getKey(string key) => $"{prefix}:{key}";
     }
 }

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

@@ -1,15 +1,18 @@
 // 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.
 
-#nullable disable
+using System.Linq;
-
+using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Configuration;
+using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Localisation;
 using osu.Framework.Platform;
 using osu.Game.Configuration;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Localisation;
+using osu.Game.Overlays.Dialog;
 
 namespace osu.Game.Overlays.Settings.Sections.Graphics
 {
@@ -17,12 +20,25 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
     {
         protected override LocalisableString Header => GraphicsSettingsStrings.RendererHeader;
 
+        private bool automaticRendererInUse;
+
         [BackgroundDependencyLoader]
-        private void load(FrameworkConfigManager config, OsuConfigManager osuConfig)
+        private void load(FrameworkConfigManager config, OsuConfigManager osuConfig, IDialogOverlay? dialogOverlay, OsuGame? game, GameHost host)
         {
-            // NOTE: Compatability mode omitted
+            var renderer = config.GetBindable<RendererType>(FrameworkSetting.Renderer);
+            automaticRendererInUse = renderer.Value == RendererType.Automatic;
+
+            SettingsEnumDropdown<RendererType> rendererDropdown;
+
             Children = new Drawable[]
             {
+                rendererDropdown = new RendererSettingsDropdown
+                {
+                    LabelText = GraphicsSettingsStrings.Renderer,
+                    Current = renderer,
+                    Items = host.GetPreferredRenderersForCurrentPlatform().OrderBy(t => t).Where(t => t != RendererType.Vulkan),
+                    Keywords = new[] { @"compatibility", @"directx" },
+                },
                 // TODO: this needs to be a custom dropdown at some point
                 new SettingsEnumDropdown<FrameSync>
                 {
@@ -41,6 +57,55 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                     Current = osuConfig.GetBindable<bool>(OsuSetting.ShowFpsDisplay)
                 },
             };
+
+            renderer.BindValueChanged(r =>
+            {
+                if (r.NewValue == host.ResolvedRenderer)
+                    return;
+
+                // Need to check startup renderer for the "automatic" case, as ResolvedRenderer above will track the final resolved renderer instead.
+                if (r.NewValue == RendererType.Automatic && automaticRendererInUse)
+                    return;
+
+                dialogOverlay?.Push(new ConfirmDialog(GraphicsSettingsStrings.ChangeRendererConfirmation, () => game?.AttemptExit(), () =>
+                {
+                    renderer.Value = automaticRendererInUse ? RendererType.Automatic : host.ResolvedRenderer;
+                }));
+            });
+
+            // TODO: remove this once we support SDL+android.
+            if (RuntimeInfo.OS == RuntimeInfo.Platform.Android)
+            {
+                rendererDropdown.Items = new[] { RendererType.Automatic, RendererType.OpenGLLegacy };
+                rendererDropdown.SetNoticeText("New renderer support for android is coming soon!", true);
+            }
+        }
+
+        private partial class RendererSettingsDropdown : SettingsEnumDropdown<RendererType>
+        {
+            protected override OsuDropdown<RendererType> CreateDropdown() => new RendererDropdown();
+
+            protected partial class RendererDropdown : DropdownControl
+            {
+                private RendererType hostResolvedRenderer;
+                private bool automaticRendererInUse;
+
+                [BackgroundDependencyLoader]
+                private void load(FrameworkConfigManager config, GameHost host)
+                {
+                    var renderer = config.GetBindable<RendererType>(FrameworkSetting.Renderer);
+                    automaticRendererInUse = renderer.Value == RendererType.Automatic;
+                    hostResolvedRenderer = host.ResolvedRenderer;
+                }
+
+                protected override LocalisableString GenerateItemText(RendererType item)
+                {
+                    if (item == RendererType.Automatic && automaticRendererInUse)
+                        return LocalisableString.Interpolate($"{base.GenerateItemText(item)} ({hostResolvedRenderer.GetDescription()})");
+
+                    return base.GenerateItemText(item);
+                }
+            }
         }
     }
 }

osu.Game/Rulesets/Mods/ModFlashlight.cs

@@ -273,7 +273,7 @@ namespace osu.Game.Rulesets.Mods
                     };
 
                     shader.Bind();
-                    shader.BindUniformBlock("m_FlashlightParameters", flashlightParametersBuffer);
+                    shader.BindUniformBlock(@"m_FlashlightParameters", flashlightParametersBuffer);
 
                     renderer.DrawQuad(renderer.WhitePixel, screenSpaceDrawQuad, DrawColourInfo.Colour, vertexAction: addAction);
 

osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs

@@ -73,11 +73,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             private OsuSpriteText typeLabel = null!;
             private LoadingLayer loadingLayer = null!;
 
-            public void SelectBeatmap()
+            public void SelectBeatmap() => selectBeatmapButton.TriggerClick();
-            {
-                if (matchSubScreen.IsCurrentScreen())
-                    matchSubScreen.Push(new MultiplayerMatchSongSelect(matchSubScreen.Room));
-            }
 
             [Resolved]
             private MultiplayerMatchSubScreen matchSubScreen { get; set; } = null!;
@@ -97,6 +93,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             private IDisposable? applyingSettingsOperation;
             private Drawable playlistContainer = null!;
             private DrawableRoomPlaylist drawablePlaylist = null!;
+            private RoundedButton selectBeatmapButton = null!;
 
             public MatchSettings(Room room)
             {
@@ -275,12 +272,16 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
                                                             RelativeSizeAxes = Axes.X,
                                                             Height = DrawableRoomPlaylistItem.HEIGHT
                                                         },
-                                                        new RoundedButton
+                                                        selectBeatmapButton = new RoundedButton
                                                         {
                                                             RelativeSizeAxes = Axes.X,
                                                             Height = 40,
                                                             Text = "Select beatmap",
-                                                            Action = SelectBeatmap
+                                                            Action = () =>
+                                                            {
+                                                                if (matchSubScreen.IsCurrentScreen())
+                                                                    matchSubScreen.Push(new MultiplayerMatchSongSelect(matchSubScreen.Room));
+                                                            }
                                                         }
                                                     }
                                                 }

osu.Game/Screens/Select/FilterControl.cs

@@ -257,6 +257,7 @@ namespace osu.Game.Screens.Select
             public FilterControlTextBox()
             {
                 Height += filter_text_size;
+                TextContainer.Height *= (Height - filter_text_size) / Height;
                 TextContainer.Margin = new MarginPadding { Bottom = filter_text_size };
             }
 

osu.Game/Users/TournamentBanner.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.IO;
 using Newtonsoft.Json;
 
 namespace osu.Game.Users
@@ -17,7 +16,7 @@ namespace osu.Game.Users
         [JsonProperty("image")]
         public string ImageLowRes = null!;
 
-        // TODO: remove when api returns @2x image link: https://github.com/ppy/osu-web/issues/9816
+        [JsonProperty("image@2x")]
-        public string Image => $@"{Path.ChangeExtension(ImageLowRes, null)}@2x{Path.GetExtension(ImageLowRes)}";
+        public string Image = null!;
     }
 }

osu.Game/osu.Game.csproj

@@ -36,7 +36,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Realm" Version="10.20.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.314.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.327.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.320.0" />
     <PackageReference Include="Sentry" Version="3.28.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />

osu.iOS.props

@@ -16,6 +16,6 @@
     <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.314.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.327.0" />
   </ItemGroup>
 </Project>

osu.iOS/AppDelegate.cs

@@ -1,29 +0,0 @@
-// 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.
-
-#nullable disable
-
-using System.Threading.Tasks;
-using Foundation;
-using osu.Framework.iOS;
-using UIKit;
-
-namespace osu.iOS
-{
-    [Register("AppDelegate")]
-    public class AppDelegate : GameAppDelegate
-    {
-        private OsuGameIOS game;
-
-        protected override Framework.Game CreateGame() => game = new OsuGameIOS();
-
-        public override bool OpenUrl(UIApplication app, NSUrl url, NSDictionary options)
-        {
-            if (url.IsFileUrl)
-                Task.Run(() => game.Import(url.Path));
-            else
-                Task.Run(() => game.HandleLink(url.AbsoluteString));
-            return true;
-        }
-    }
-}

osu.iOS/Application.cs

@@ -1,9 +1,7 @@
 // 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.
 
-#nullable disable
+using osu.Framework.iOS;
-
-using UIKit;
 
 namespace osu.iOS
 {
@@ -11,7 +9,7 @@ namespace osu.iOS
     {
         public static void Main(string[] args)
         {
-            UIApplication.Main(args, null, typeof(AppDelegate));
+            GameApplication.Main(new OsuGameIOS());
         }
     }
 }

osu.iOS/IOSMouseSettings.cs

@@ -1,36 +0,0 @@
-// 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 osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Framework.Localisation;
-using osu.Game.Configuration;
-using osu.Game.Localisation;
-using osu.Game.Overlays.Settings;
-
-namespace osu.iOS
-{
-    public partial class IOSMouseSettings : SettingsSubsection
-    {
-        protected override LocalisableString Header => MouseSettingsStrings.Mouse;
-
-        [BackgroundDependencyLoader]
-        private void load(OsuConfigManager osuConfig)
-        {
-            Children = new Drawable[]
-            {
-                new SettingsCheckbox
-                {
-                    LabelText = MouseSettingsStrings.DisableMouseWheelVolumeAdjust,
-                    TooltipText = MouseSettingsStrings.DisableMouseWheelVolumeAdjustTooltip,
-                    Current = osuConfig.GetBindable<bool>(OsuSetting.MouseDisableWheel),
-                },
-                new SettingsCheckbox
-                {
-                    LabelText = MouseSettingsStrings.DisableMouseButtons,
-                    Current = osuConfig.GetBindable<bool>(OsuSetting.MouseDisableButtons),
-                },
-            };
-        }
-    }
-}

osu.iOS/OsuGameIOS.cs

@@ -7,10 +7,7 @@ using System;
 using Foundation;
 using Microsoft.Maui.Devices;
 using osu.Framework.Graphics;
-using osu.Framework.Input.Handlers;
-using osu.Framework.iOS.Input;
 using osu.Game;
-using osu.Game.Overlays.Settings;
 using osu.Game.Updater;
 using osu.Game.Utils;
 
@@ -29,18 +26,6 @@ namespace osu.iOS
             // Because we have the home indicator (mostly) hidden we don't really care about drawing in this region.
             Edges.Bottom;
 
-        public override SettingsSubsection CreateSettingsSubsectionFor(InputHandler handler)
-        {
-            switch (handler)
-            {
-                case IOSMouseHandler:
-                    return new IOSMouseSettings();
-
-                default:
-                    return base.CreateSettingsSubsectionFor(handler);
-            }
-        }
-
         private class IOSBatteryInfo : BatteryInfo
         {
             public override double? ChargeLevel => Battery.ChargeLevel;