Add OpenGL Core renderer and use as default

Directory.Build.props

@@ -1,7 +1,7 @@
 <!-- Contains required properties for osu!framework projects. -->
 <Project>
   <PropertyGroup Label="C#">
-    <LangVersion>9.0</LangVersion>
+    <LangVersion>10.0</LangVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Nullable>enable</Nullable>
   </PropertyGroup>

osu.Framework.SourceGeneration.Tests/AbstractGeneratorTests.cs

@@ -51,8 +51,8 @@ protected void GetTestSources(
             out (string filename, string content)[] commonGenerated,
             out (string filename, string content)[] generated)
         {
-            string commonSourcesNamespace = $"{resources_namespace}.CommonSources";
-            string commonGeneratedNamespace = $"{resources_namespace}.CommonGenerated";
+            const string common_sources_namespace = $"{resources_namespace}.CommonSources";
+            const string common_generated_namespace = $"{resources_namespace}.CommonGenerated";
             string sourcesNamespace = $"{resources_namespace}.{name}.Sources";
             string generatedNamespace = $"{resources_namespace}.{name}.Generated";
 
@@ -64,11 +64,11 @@ protected void GetTestSources(
             var commonGeneratedFiles = new List<(string filename, string content)>();
             var generatedFiles = new List<(string filename, string content)>();
 
-            foreach (string? file in resourceNames.Where(n => n.StartsWith(commonSourcesNamespace, StringComparison.Ordinal)))
-                commonSourceFiles.Add((getFileNameFromResourceName(commonSourcesNamespace, file), readResourceStream(assembly, file)));
+            foreach (string? file in resourceNames.Where(n => n.StartsWith(common_sources_namespace, StringComparison.Ordinal)))
+                commonSourceFiles.Add((getFileNameFromResourceName(common_sources_namespace, file), readResourceStream(assembly, file)));
 
-            foreach (string? file in resourceNames.Where(n => n.StartsWith(commonGeneratedNamespace, StringComparison.Ordinal)))
-                commonGeneratedFiles.Add((getFileNameFromResourceName(commonGeneratedNamespace, file), readResourceStream(assembly, file)));
+            foreach (string? file in resourceNames.Where(n => n.StartsWith(common_generated_namespace, StringComparison.Ordinal)))
+                commonGeneratedFiles.Add((getFileNameFromResourceName(common_generated_namespace, file), readResourceStream(assembly, file)));
 
             foreach (string? file in resourceNames.Where(n => n.StartsWith(sourcesNamespace, StringComparison.Ordinal)))
                 sourceFiles.Add((getFileNameFromResourceName(sourcesNamespace, file), readResourceStream(assembly, file)));

osu.Framework.Tests/Graphics/ShaderRegexTest.cs

@@ -3,7 +3,6 @@
 
 #nullable disable
 
-using System.Text.RegularExpressions;
 using NUnit.Framework;
 using osu.Framework.Graphics.OpenGL.Shaders;
 
@@ -12,8 +11,6 @@ namespace osu.Framework.Tests.Graphics
     [TestFixture]
     public class ShaderRegexTest
     {
-        private readonly Regex shaderAttributeRegex = new Regex(GLShaderPart.SHADER_ATTRIBUTE_PATTERN);
-
         [Test]
         public void TestComment()
         {
@@ -24,42 +21,42 @@ public void TestComment()
         [Test]
         public void TestNonAttribute()
         {
-            const string test_string = "varying vec3 name;";
+            const string test_string = "wangs vec3 name;";
             performInvalidAttributeTest(test_string);
         }
 
         [Test]
         public void TestValidAttribute()
         {
-            const string test_string = "attribute lowp float name;";
+            const string test_string = "layout(location = 0) in lowp float name;";
             performValidAttributeTest(test_string);
         }
 
         [Test]
         public void TestSpacedAttribute()
         {
-            const string test_string = "    attribute    float    name   ;";
+            const string test_string = "    layout(  location   =0   )in    float    name   ;";
             performValidAttributeTest(test_string);
         }
 
         [Test]
         public void TestNoPrecisionQualifier()
         {
-            const string test_string = "attribute float name;";
+            const string test_string = "layout(location = 0) in float name;";
             performValidAttributeTest(test_string);
         }
 
         private void performValidAttributeTest(string testString)
         {
-            var match = shaderAttributeRegex.Match(testString);
+            var match = GLShaderPart.SHADER_INPUT_PATTERN.Match(testString);
 
             Assert.IsTrue(match.Success);
-            Assert.AreEqual("name", match.Groups[1].Value.Trim());
+            Assert.AreEqual("name", match.Groups[3].Value.Trim());
         }
 
         private void performInvalidAttributeTest(string testString)
         {
-            var match = shaderAttributeRegex.Match(testString);
+            var match = GLShaderPart.SHADER_INPUT_PATTERN.Match(testString);
 
             Assert.IsFalse(match.Success);
         }

osu.Framework.Tests/Program.cs

@@ -1,8 +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.
 
-#nullable disable
-
 using System;
 using System.Linq;
 using osu.Framework.Platform;

osu.Framework.Tests/Shaders/TestSceneShaderDisposal.cs

@@ -70,21 +70,17 @@ internal override IShader CreateShader(IRenderer renderer, string name, params I
 
             private class TestGLShader : GLShader
             {
-                private readonly GLRenderer renderer;
-
                 internal TestGLShader(GLRenderer renderer, string name, GLShaderPart[] parts)
-                    : base(renderer, name, parts)
+                    : base(renderer, name, parts, null)
                 {
-                    this.renderer = renderer;
                 }
 
                 private protected override int CreateProgram() => 1337;
 
                 private protected override bool CompileInternal() => true;
 
-                private protected override void SetupUniforms()
+                public override void BindUniformBlock(string blockName, IUniformBuffer buffer)
                 {
-                    Uniforms.Add("test", new Uniform<int>(renderer, this, "test", 1));
                 }
 
                 private protected override string GetProgramLog() => string.Empty;

osu.Framework.Tests/Visual/UserInterface/TestSceneContextMenu.cs

@@ -283,7 +283,7 @@ private void clickOutsideStep()
             });
         }
 
-        private void addBoxStep(Action<Drawable> boxFunc, int actionCount) => addBoxStep(boxFunc, Enumerable.Repeat<Action>(() => { }, actionCount).ToArray());
+        private void addBoxStep(Action<Drawable> boxFunc, int actionCount) => addBoxStep(boxFunc, Enumerable.Repeat(() => { }, actionCount).ToArray());
 
         private void addBoxStep(Action<Drawable> boxFunc, params Action[] actions)
         {

osu.Framework.iOS.props

@@ -28,6 +28,7 @@
     <NativeReference Include="$(MSBuildThisFileDirectory)osu.Framework.iOS\runtimes\ios\native\libavutil.xcframework" Kind="Framework" SmartLink="false" ForceLoad="true" />
     <NativeReference Include="$(MSBuildThisFileDirectory)osu.Framework.iOS\runtimes\ios\native\libswresample.xcframework" Kind="Framework" SmartLink="false" ForceLoad="true" />
     <NativeReference Include="$(MSBuildThisFileDirectory)osu.Framework.iOS\runtimes\ios\native\libswscale.xcframework" Kind="Framework" SmartLink="false" ForceLoad="true" />
+    <NativeReference Include="$(MSBuildThisFileDirectory)osu.Framework.iOS\runtimes\ios\native\veldrid-spirv.xcframework" Kind="Framework" SmartLink="false" ForceLoad="true" />
   </ItemGroup>
   <!-- Veldrid references libraries which cannot be AOT'd on iOS, replace them with stub assemblies.
        See: https://github.com/mellinoe/veldrid/issues/472#issuecomment-1356461410 -->

osu.Framework.iOS/GameAppDelegate.cs

@@ -16,6 +16,7 @@
 using SixLabors.ImageSharp.Formats.Png;
 using SixLabors.ImageSharp.PixelFormats;
 using UIKit;
+using Veldrid.SPIRV;
 
 namespace osu.Framework.iOS
 {
@@ -37,6 +38,7 @@ public override bool FinishedLaunching(UIApplication application, NSDictionary l
             NativeLibrary.SetDllImportResolver(typeof(Bass).Assembly, (_, assembly, path) => NativeLibrary.Load("@rpath/bass.framework/bass", assembly, path));
             NativeLibrary.SetDllImportResolver(typeof(BassFx).Assembly, (_, assembly, path) => NativeLibrary.Load("@rpath/bass_fx.framework/bass_fx", assembly, path));
             NativeLibrary.SetDllImportResolver(typeof(BassMix).Assembly, (_, assembly, path) => NativeLibrary.Load("@rpath/bassmix.framework/bassmix", assembly, path));
+            NativeLibrary.SetDllImportResolver(typeof(SpirvCompilation).Assembly, (_, assembly, path) => NativeLibrary.Load("@rpath/veldrid-spirv.framework/veldrid-spirv", assembly, path));
 
             Window = new UIWindow(UIScreen.MainScreen.Bounds);
 

osu.Framework.iOS/runtimes/ios/native/veldrid-spirv.xcframework/Info.plist

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+	<dict>
+		<key>AvailableLibraries</key>
+		<array>
+			<dict>
+				<key>LibraryIdentifier</key>
+				<string>ios-arm64</string>
+				<key>LibraryPath</key>
+				<string>veldrid-spirv.framework</string>
+				<key>SupportedArchitectures</key>
+				<array>
+					<string>arm64</string>
+				</array>
+				<key>SupportedPlatform</key>
+				<string>ios</string>
+			</dict>
+			<dict>
+				<key>LibraryIdentifier</key>
+				<string>ios-arm64_x86_64-simulator</string>
+				<key>LibraryPath</key>
+				<string>veldrid-spirv.framework</string>
+				<key>SupportedArchitectures</key>
+				<array>
+					<string>arm64</string>
+					<string>x86_64</string>
+				</array>
+				<key>SupportedPlatform</key>
+				<string>ios</string>
+				<key>SupportedPlatformVariant</key>
+				<string>simulator</string>
+			</dict>
+		</array>
+		<key>CFBundlePackageType</key>
+		<string>XFWK</string>
+		<key>XCFrameworkFormatVersion</key>
+		<string>1.0</string>
+	</dict>
+</plist>

osu.Framework/FrameworkEnvironment.cs

@@ -0,0 +1,26 @@
+// 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;
+using osu.Framework.Platform;
+
+namespace osu.Framework
+{
+    public static class FrameworkEnvironment
+    {
+        public static readonly ExecutionMode? STARTUP_EXECUTION_MODE;
+        public static readonly bool NO_TEST_TIMEOUT;
+        public static readonly bool FORCE_TEST_GC;
+        public static readonly GraphicsSurfaceType? PREFERRED_GRAPHICS_SURFACE;
+        public static readonly string? PREFERRED_GRAPHICS_RENDERER;
+
+        static FrameworkEnvironment()
+        {
+            STARTUP_EXECUTION_MODE = Enum.TryParse<ExecutionMode>(Environment.GetEnvironmentVariable("OSU_EXECUTION_MODE"), true, out var mode) ? mode : null;
+            NO_TEST_TIMEOUT = Environment.GetEnvironmentVariable("OSU_TESTS_NO_TIMEOUT") == "1";
+            FORCE_TEST_GC = Environment.GetEnvironmentVariable("OSU_TESTS_FORCED_GC") == "1";
+            PREFERRED_GRAPHICS_SURFACE = Enum.TryParse<GraphicsSurfaceType>(Environment.GetEnvironmentVariable("OSU_GRAPHICS_SURFACE"), true, out var surface) ? surface : null;
+            PREFERRED_GRAPHICS_RENDERER = Environment.GetEnvironmentVariable("OSU_GRAPHICS_RENDERER")?.ToLowerInvariant();
+        }
+    }
+}

osu.Framework/Graphics/Containers/BufferedContainer_DrawNode.cs

@@ -9,8 +9,10 @@
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Shaders;
 using System;
+using System.Runtime.InteropServices;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Rendering;
+using osu.Framework.Graphics.Shaders.Types;
 using osu.Framework.Utils;
 
 namespace osu.Framework.Graphics.Containers
@@ -92,25 +94,30 @@ protected override void DrawContents(IRenderer renderer)
                     base.DrawContents(renderer);
             }
 
+            private IUniformBuffer<BlurParameters> blurParametersBuffer;
+
             private void drawBlurredFrameBuffer(IRenderer renderer, int kernelRadius, float sigma, float blurRotation)
             {
+                blurParametersBuffer ??= renderer.CreateUniformBuffer<BlurParameters>();
+
                 IFrameBuffer current = SharedData.CurrentEffectBuffer;
                 IFrameBuffer target = SharedData.GetNextEffectBuffer();
 
                 renderer.SetBlend(BlendingParameters.None);
 
                 using (BindFrameBuffer(target))
                 {
-                    blurShader.GetUniform<int>(@"g_Radius").UpdateValue(ref kernelRadius);
-                    blurShader.GetUniform<float>(@"g_Sigma").UpdateValue(ref sigma);
-
-                    Vector2 size = current.Size;
-                    blurShader.GetUniform<Vector2>(@"g_TexSize").UpdateValue(ref size);
-
                     float radians = -MathUtils.DegreesToRadians(blurRotation);
-                    Vector2 blur = new Vector2(MathF.Cos(radians), MathF.Sin(radians));
-                    blurShader.GetUniform<Vector2>(@"g_BlurDirection").UpdateValue(ref blur);
 
+                    blurParametersBuffer.Data = blurParametersBuffer.Data with
+                    {
+                        Radius = kernelRadius,
+                        Sigma = sigma,
+                        TexSize = current.Size,
+                        Direction = new Vector2(MathF.Cos(radians), MathF.Sin(radians))
+                    };
+
+                    blurShader.BindUniformBlock("m_BlurParameters", blurParametersBuffer);
                     blurShader.Bind();
                     renderer.DrawFrameBuffer(current, new RectangleF(0, 0, current.Texture.Width, current.Texture.Height), ColourInfo.SingleColour(Color4.White));
                     blurShader.Unbind();
@@ -124,6 +131,22 @@ public List<DrawNode> Children
             }
 
             public bool AddChildDrawNodes => RequiresRedraw;
+
+            protected override void Dispose(bool isDisposing)
+            {
+                base.Dispose(isDisposing);
+                blurParametersBuffer?.Dispose();
+            }
+
+            [StructLayout(LayoutKind.Sequential, Pack = 1)]
+            private record struct BlurParameters
+            {
+                public UniformVector2 TexSize;
+                public UniformInt Radius;
+                public UniformFloat Sigma;
+                public UniformVector2 Direction;
+                private readonly UniformPadding8 pad1;
+            }
         }
 
         private class BufferedContainerDrawNodeSharedData : BufferedDrawNodeSharedData

osu.Framework/Graphics/OpenGL/Buffers/GLLinearBuffer.cs

@@ -41,28 +41,22 @@ protected override void Initialise()
         {
             base.Initialise();
 
+            // Must be outside the conditional below as it needs to be added to the VAO
+            GL.BindBuffer(BufferTarget.ElementArrayBuffer, GLLinearIndexData.EBO_ID);
+
             if (amountVertices > GLLinearIndexData.MaxAmountIndices)
             {
                 ushort[] indices = new ushort[amountVertices];
 
                 for (int i = 0; i < amountVertices; i++)
                     indices[i] = (ushort)i;
 
-                Renderer.BindBuffer(BufferTarget.ElementArrayBuffer, GLLinearIndexData.EBO_ID);
                 GL.BufferData(BufferTarget.ElementArrayBuffer, (IntPtr)(amountVertices * sizeof(ushort)), indices, BufferUsageHint.StaticDraw);
 
                 GLLinearIndexData.MaxAmountIndices = amountVertices;
             }
         }
 
-        public override void Bind(bool forRendering)
-        {
-            base.Bind(forRendering);
-
-            if (forRendering)
-                Renderer.BindBuffer(BufferTarget.ElementArrayBuffer, GLLinearIndexData.EBO_ID);
-        }
-
         protected override PrimitiveType Type { get; }
     }
 }

osu.Framework/Graphics/OpenGL/Buffers/GLQuadBuffer.cs

@@ -36,6 +36,9 @@ protected override void Initialise()
         {
             base.Initialise();
 
+            // Must be outside the conditional below as it needs to be added to the VAO
+            GL.BindBuffer(BufferTarget.ElementArrayBuffer, GLQuadIndexData.EBO_ID);
+
             if (amountIndices > GLQuadIndexData.MaxAmountIndices)
             {
                 ushort[] indices = new ushort[amountIndices];
@@ -50,21 +53,12 @@ protected override void Initialise()
                     indices[j + 5] = (ushort)(i + 1);
                 }
 
-                Renderer.BindBuffer(BufferTarget.ElementArrayBuffer, GLQuadIndexData.EBO_ID);
                 GL.BufferData(BufferTarget.ElementArrayBuffer, (IntPtr)(amountIndices * sizeof(ushort)), indices, BufferUsageHint.StaticDraw);
 
                 GLQuadIndexData.MaxAmountIndices = amountIndices;
             }
         }
 
-        public override void Bind(bool forRendering)
-        {
-            base.Bind(forRendering);
-
-            if (forRendering)
-                Renderer.BindBuffer(BufferTarget.ElementArrayBuffer, GLQuadIndexData.EBO_ID);
-        }
-
         protected override int ToElements(int vertices) => 3 * vertices / 2;
 
         protected override int ToElementIndex(int vertexIndex) => 3 * vertexIndex / 2;