h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-12 21:02:54 +08:00
Code Issues Releases Wiki Activity

Merge branch 'remove-legacy-gl' into update-framework

Browse Source
This commit is contained in:
Dean Herbert 2024-02-21 21:44:19 +08:00
commit 9d732bd9b1
No known key found for this signature in database
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs
View File

@ -2,7 +2,6 @@
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using System.Linq; using System.Linq;
using osu.Framework;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Configuration; using osu.Framework.Configuration;
using osu.Framework.Extensions; using osu.Framework.Extensions;
@ -28,15 +27,16 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
var renderer = config.GetBindable<RendererType>(FrameworkSetting.Renderer); var renderer = config.GetBindable<RendererType>(FrameworkSetting.Renderer);
automaticRendererInUse = renderer.Value == RendererType.Automatic; automaticRendererInUse = renderer.Value == RendererType.Automatic;
SettingsEnumDropdown<RendererType> rendererDropdown;
Children = new Drawable[] Children = new Drawable[]
{ {
rendererDropdown = new RendererSettingsDropdown new RendererSettingsDropdown
{ {
LabelText = GraphicsSettingsStrings.Renderer, LabelText = GraphicsSettingsStrings.Renderer,
Current = renderer, Current = renderer,
Items = host.GetPreferredRenderersForCurrentPlatform().Order().Where(t => t != RendererType.Vulkan), Items = host.GetPreferredRenderersForCurrentPlatform().Order()
#pragma warning disable CS0612 // Type or member is obsolete
.Where(t => t != RendererType.Vulkan && t != RendererType.OpenGLLegacy),
#pragma warning restore CS0612 // Type or member is obsolete
Keywords = new[] { @"compatibility", @"directx" }, Keywords = new[] { @"compatibility", @"directx" },
}, },
// TODO: this needs to be a custom dropdown at some point // TODO: this needs to be a custom dropdown at some point
@ -79,13 +79,6 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
})); }));
} }
}); });
// 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> private partial class RendererSettingsDropdown : SettingsEnumDropdown<RendererType>