Skip to content

Port ppy#5551 (additive blend no-flush) + ppy#6699 (System.Numerics vectors) + hot-path optimizations #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
winnerspiros merged 17 commits into from
May 16, 2026
Merged

Port ppy#5551 (additive blend no-flush) + ppy#6699 (System.Numerics vectors) + hot-path optimizations #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
5a411b8
Attempt to fix file type detection logic on Android (#6748)
bdach May 12, 2026
ce76a4b
Bump SDL3 package
smoogipoo May 12, 2026
4f7a8ef
Merge upstream ppy/osu-framework (2 PRs: SDL3 bump + Android file typ…
Copilot May 16, 2026
e3bf29e
perf: eliminate per-frame heap allocations (video ReturnFrame, GL ref…
Copilot May 16, 2026
116910e
perf: BufferedContainer skip-redraw on self-invalidation, Metal UBO s…
Copilot May 16, 2026
a5c7a2f
perf: implement PathBBH (bounding box hierarchy) for O(log n) path hi…
Copilot May 16, 2026
84c1a72
feat: PR#5551 additive blend without GPU state change (no-flush addit…
Copilot May 16, 2026
96be553
Replace osuTK.Vector2/3/4 with System.Numerics.Vector2/3/4
Copilot May 16, 2026
e911baf
Remove migration scripts
Copilot May 16, 2026
64686b5
perf: optimize hot paths from PR#5551+#6699 (inline GL uniforms, SIMD…
Copilot May 16, 2026
1884f46
fix: migrate templates/benchmarks/SampleGame from osuTK.Vector2 to Sy…
Copilot May 16, 2026
c92dc03
fix: remove unused using directives (IDE0005) causing Code Quality CI…
Copilot May 16, 2026
eed8863
fix: remove 5 more unused using directives (IDE0005) causing Code Qua…
Copilot May 16, 2026
ec19cfc
fix: resolve all 16 InspectCode warnings (indentation, naming, redund…
Copilot May 16, 2026
93ab01a
fix: resolve all 22 InspectCode notes (field keyword, with expression…
Copilot May 16, 2026
b521185
fix: replace redundant `get => field;` with `get;` in all field-keywo…
Copilot May 16, 2026
cfc43e3
fix: remove dead BackgroundFocused initializer (InspectCode member-in…
Copilot May 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion SampleGame/SampleGameGame.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Shapes;
using osuTK;
using System.Numerics;
using osuTK.Graphics;

namespace SampleGame
Expand Down
1 change: 1 addition & 0 deletions osu-framework.sln.DotSettings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,7 @@
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AABB/@EntryIndexedValue">AABB</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=API/@EntryIndexedValue">API</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ARGB/@EntryIndexedValue">ARGB</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BBH/@EntryIndexedValue">BBH</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BPM/@EntryIndexedValue">BPM</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CG/@EntryIndexedValue">CG</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=FBO/@EntryIndexedValue">FBO</s:String>
Expand Down
2 changes: 1 addition & 1 deletion osu.Framework.Benchmarks/BenchmarkBeginAbsoluteSequence.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osuTK;
using System.Numerics;
using osuTK.Graphics;

namespace osu.Framework.Benchmarks
Expand Down
2 changes: 1 addition & 1 deletion osu.Framework.Benchmarks/BenchmarkDrawableLoad.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osuTK;
using System.Numerics;
using osuTK.Graphics;

namespace osu.Framework.Benchmarks
Expand Down
2 changes: 1 addition & 1 deletion osu.Framework.Benchmarks/BenchmarkFillFlowContainerAllocations.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osuTK;
using System.Numerics;

namespace osu.Framework.Benchmarks
{
Expand Down
2 changes: 1 addition & 1 deletion osu.Framework.Benchmarks/BenchmarkInvalidationWithManyNotAlive.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osuTK;
using System.Numerics;

namespace osu.Framework.Benchmarks
{
Expand Down
2 changes: 1 addition & 1 deletion osu.Framework.Benchmarks/BenchmarkManySpinningBoxes.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osuTK;
using System.Numerics;
using osuTK.Graphics;

namespace osu.Framework.Benchmarks
Expand Down
2 changes: 1 addition & 1 deletion osu.Framework.Benchmarks/BenchmarkPiecewiseLinearToBezier.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System.Collections.Generic;
using BenchmarkDotNet.Attributes;
using osu.Framework.Utils;
using osuTK;
using System.Numerics;

namespace osu.Framework.Benchmarks
{
Expand Down
2 changes: 1 addition & 1 deletion osu.Framework.Benchmarks/BenchmarkQuad.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System;
using BenchmarkDotNet.Attributes;
using osu.Framework.Graphics.Primitives;
using osuTK;
using System.Numerics;

namespace osu.Framework.Benchmarks
{
Expand Down
2 changes: 1 addition & 1 deletion osu.Framework.Benchmarks/BenchmarkSpinningParentWithManyAlive.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osuTK;
using System.Numerics;

namespace osu.Framework.Benchmarks
{
Expand Down
2 changes: 1 addition & 1 deletion osu.Framework.Benchmarks/BenchmarkSpriteText.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
using osu.Framework.Graphics;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Utils;
using osuTK;
using System.Numerics;

namespace osu.Framework.Benchmarks
{
Expand Down
2 changes: 1 addition & 1 deletion osu.Framework.Benchmarks/BenchmarkTransform.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Transforms;
using osu.Framework.Timing;
using osuTK;
using System.Numerics;

namespace osu.Framework.Benchmarks
{
Expand Down
2 changes: 1 addition & 1 deletion osu.Framework.Benchmarks/BenchmarkTransformUpdate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using osu.Framework.Graphics;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Timing;
using osuTK;
using System.Numerics;

namespace osu.Framework.Benchmarks
{
Expand Down
2 changes: 1 addition & 1 deletion osu.Framework.Templates/templates/template-empty/TemplateGame.Game/TemplateGameGameBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.IO.Stores;
using osuTK;
using System.Numerics;
using TemplateGame.Resources;

namespace TemplateGame.Game
Expand Down
2 changes: 1 addition & 1 deletion osu.Framework.Templates/templates/template-flappy/FlappyDon.Game/Elements/Backdrop.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites;
using osuTK;
using System.Numerics;

namespace FlappyDon.Game.Elements
{
Expand Down
2 changes: 1 addition & 1 deletion osu.Framework.Templates/templates/template-flappy/FlappyDon.Game/Elements/BackdropSprite.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using osu.Framework.Graphics;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Textures;
using osuTK;
using System.Numerics;

namespace FlappyDon.Game.Elements
{
Expand Down
2 changes: 1 addition & 1 deletion osu.Framework.Templates/templates/template-flappy/FlappyDon.Game/Elements/Bird.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Primitives;
using osu.Framework.Graphics.Textures;
using osuTK;
using System.Numerics;

namespace FlappyDon.Game.Elements
{
Expand Down
2 changes: 1 addition & 1 deletion osu.Framework.Templates/templates/template-flappy/FlappyDon.Game/Elements/GroundSprite.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using osu.Framework.Graphics;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Textures;
using osuTK;
using System.Numerics;

namespace FlappyDon.Game.Elements
{
Expand Down
2 changes: 1 addition & 1 deletion osu.Framework.Templates/templates/template-flappy/FlappyDon.Game/Elements/Obstacles.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Primitives;
using osu.Framework.Utils;
using osuTK;
using System.Numerics;

namespace FlappyDon.Game.Elements
{
Expand Down
2 changes: 1 addition & 1 deletion osu.Framework.Templates/templates/template-flappy/FlappyDon.Game/Elements/Pipe.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using osu.Framework.Graphics;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Textures;
using osuTK;
using System.Numerics;

namespace FlappyDon.Game.Elements
{
Expand Down
2 changes: 1 addition & 1 deletion osu.Framework.Templates/templates/template-flappy/FlappyDon.Game/Elements/PipeObstacle.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Primitives;
using osuTK;
using System.Numerics;

namespace FlappyDon.Game.Elements
{
Expand Down
2 changes: 1 addition & 1 deletion osu.Framework.Templates/templates/template-flappy/FlappyDon.Game/Elements/TitleSprite.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using osu.Framework.Graphics;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Textures;
using osuTK;
using System.Numerics;

namespace FlappyDon.Game.Elements
{
Expand Down
2 changes: 1 addition & 1 deletion osu.Framework.Templates/templates/template-flappy/FlappyDon.Game/FlappyDonGame.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using osu.Framework.Graphics.Audio;
using osu.Framework.Graphics.Containers;
using osu.Framework.Input.Events;
using osuTK;
using System.Numerics;
using osuTK.Input;

namespace FlappyDon.Game
Expand Down
2 changes: 1 addition & 1 deletion osu.Framework.Tests/Containers/TestSceneContainerState.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
using osu.Framework.Graphics.Sprites;
using osu.Framework.Testing;
using osu.Framework.Tests.Visual;
using osuTK;
using System.Numerics;

#pragma warning disable CA1826 // Performance for test is not important

Expand Down
2 changes: 1 addition & 1 deletion osu.Framework.Tests/Exceptions/TestLoadExceptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
using osu.Framework.Logging;
using osu.Framework.Platform;
using osu.Framework.Testing;
using osuTK;
using System.Numerics;
using osuTK.Graphics;

namespace osu.Framework.Tests.Exceptions
Expand Down
2 changes: 1 addition & 1 deletion osu.Framework.Tests/Input/JoystickInputTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
using osu.Framework.Input;
using osu.Framework.Input.Events;
using osu.Framework.Testing;
using osuTK;
using System.Numerics;

namespace osu.Framework.Tests.Input
{
Expand Down
2 changes: 1 addition & 1 deletion osu.Framework.Tests/Input/KeyBindingInputTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
using osu.Framework.Input.Bindings;
using osu.Framework.Input.Events;
using osu.Framework.Testing;
using osuTK;
using System.Numerics;
using osuTK.Input;

namespace osu.Framework.Tests.Input
Expand Down
2 changes: 1 addition & 1 deletion osu.Framework.Tests/Input/KeyboardInputTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
using osu.Framework.Graphics.Shapes;
using osu.Framework.Input.Events;
using osu.Framework.Testing;
using osuTK;
using System.Numerics;
using osuTK.Input;

namespace osu.Framework.Tests.Input
Expand Down
2 changes: 1 addition & 1 deletion osu.Framework.Tests/Input/MouseInputTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
using osu.Framework.Graphics.Shapes;
using osu.Framework.Input.Events;
using osu.Framework.Testing;
using osuTK;
using System.Numerics;
using osuTK.Input;

namespace osu.Framework.Tests.Input
Expand Down
2 changes: 1 addition & 1 deletion osu.Framework.Tests/Input/TouchInputTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
using osu.Framework.Input;
using osu.Framework.Input.Events;
using osu.Framework.Testing;
using osuTK;
using System.Numerics;

namespace osu.Framework.Tests.Input
{
Expand Down
2 changes: 1 addition & 1 deletion osu.Framework.Tests/Layout/TestSceneContainerLayout.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
using osu.Framework.Testing;
using osu.Framework.Tests.Visual;
using osu.Framework.Utils;
using osuTK;
using System.Numerics;

namespace osu.Framework.Tests.Layout
{
Expand Down
2 changes: 1 addition & 1 deletion osu.Framework.Tests/Layout/TestSceneDrawableLayout.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
using osu.Framework.Testing;
using osu.Framework.Tests.Visual;
using osu.Framework.Utils;
using osuTK;
using System.Numerics;
using osuTK.Graphics;

namespace osu.Framework.Tests.Layout
Expand Down
2 changes: 1 addition & 1 deletion osu.Framework.Tests/Layout/TestSceneGridContainerLayout.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
using osu.Framework.Testing;
using osu.Framework.Tests.Visual;
using osu.Framework.Utils;
using osuTK;
using System.Numerics;

namespace osu.Framework.Tests.Layout
{
Expand Down
2 changes: 1 addition & 1 deletion osu.Framework.Tests/Layout/TestSceneSpriteLayout.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
using osu.Framework.Graphics.Shapes;
using osu.Framework.Testing;
using osu.Framework.Tests.Visual;
using osuTK;
using System.Numerics;

namespace osu.Framework.Tests.Layout
{
Expand Down
4 changes: 2 additions & 2 deletions osu.Framework.Tests/MathUtils/TestInterpolation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// 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;
Expand All @@ -8,7 +8,7 @@
using osu.Framework.Graphics;
using osu.Framework.Graphics.Transforms;
using osu.Framework.Utils;
using osuTK;
using System.Numerics;

namespace osu.Framework.Tests.MathUtils
{
Expand Down
4 changes: 2 additions & 2 deletions osu.Framework.Tests/MathUtils/TestPathApproximator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// 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 System.Collections.Generic;
using System.Linq;
using NUnit.Framework;
using osu.Framework.Utils;
using osuTK;
using System.Numerics;

namespace osu.Framework.Tests.MathUtils
{
Expand Down
4 changes: 2 additions & 2 deletions osu.Framework.Tests/Polygons/ConvexPolygonClipperFuzzingTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// 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;
Expand All @@ -8,7 +8,7 @@
using NUnit.Framework;
using osu.Framework.Graphics.Primitives;
using osu.Framework.Utils;
using osuTK;
using System.Numerics;

namespace osu.Framework.Tests.Polygons
{
Expand Down
2 changes: 1 addition & 1 deletion osu.Framework.Tests/Polygons/ConvexPolygonClippingTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using osu.Framework.Graphics;
using osu.Framework.Graphics.Primitives;
using osu.Framework.Utils;
using osuTK;
using System.Numerics;

namespace osu.Framework.Tests.Polygons
{
Expand Down
4 changes: 2 additions & 2 deletions osu.Framework.Tests/Polygons/LineIntersections.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// 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 NUnit.Framework;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Primitives;
using osuTK;
using System.Numerics;

namespace osu.Framework.Tests.Polygons
{
Expand Down
3 changes: 2 additions & 1 deletion osu.Framework.Tests/Primitives/QuadTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// 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.Collections;
Expand All @@ -7,6 +7,7 @@
using osu.Framework.Graphics.Primitives;
using osu.Framework.Utils;
using osuTK;
using Vector2 = System.Numerics.Vector2;

namespace osu.Framework.Tests.Primitives
{
Expand Down
4 changes: 2 additions & 2 deletions osu.Framework.Tests/Primitives/TriangleTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// 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.Collections;
using NUnit.Framework;
using osu.Framework.Graphics.Primitives;
using osuTK;
using System.Numerics;

namespace osu.Framework.Tests.Primitives
{
Expand Down
Loading
Loading