Merge pull request #26636 from EVAST9919/triangles-batch

Remove local vertex batching from triangles backgrounds
ppy · Jan 20, 2024 · 1e44ba6 · 1e44ba6
2 parents e669e28 + 45effdb
commit 1e44ba6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 21 deletions.
diff --git a/osu.Game/Graphics/Backgrounds/Triangles.cs b/osu.Game/Graphics/Backgrounds/Triangles.cs
@@ -15,7 +15,6 @@
 using osu.Framework.Allocation;
 using System.Collections.Generic;
 using osu.Framework.Graphics.Rendering;
-using osu.Framework.Graphics.Rendering.Vertices;
 using osu.Framework.Lists;
 using osu.Framework.Bindables;
 
@@ -264,7 +263,6 @@ private class TrianglesDrawNode : DrawNode
             private readonly Vector2 triangleSize = new Vector2(1f, equilateral_triangle_ratio) * triangle_size;
 
             private Vector2 size;
-            private IVertexBatch<TexturedVertex2D> vertexBatch;
 
             public TrianglesDrawNode(Triangles source)
                 : base(source)
@@ -290,12 +288,6 @@ protected override void Draw(IRenderer renderer)
             {
                 base.Draw(renderer);
 
-                if (Source.AimCount > 0 && (vertexBatch == null || vertexBatch.Size != Source.AimCount))
-                {
-                    vertexBatch?.Dispose();
-                    vertexBatch = renderer.CreateQuadBatch<TexturedVertex2D>(Source.AimCount, 1);
-                }
-
                 borderDataBuffer ??= renderer.CreateUniformBuffer<TriangleBorderData>();
                 borderDataBuffer.Data = borderDataBuffer.Data with
                 {
@@ -333,7 +325,7 @@ protected override void Draw(IRenderer renderer)
                         triangleQuad.Height
                     ) / relativeSize;
 
-                    renderer.DrawQuad(texture, drawQuad, colourInfo, new RectangleF(0, 0, 1, 1), vertexBatch.AddAction, textureCoords: textureCoords);
+                    renderer.DrawQuad(texture, drawQuad, colourInfo, new RectangleF(0, 0, 1, 1), textureCoords: textureCoords);
                 }
 
                 shader.Unbind();
@@ -356,7 +348,6 @@ protected override void Dispose(bool isDisposing)
             {
                 base.Dispose(isDisposing);
 
-                vertexBatch?.Dispose();
                 borderDataBuffer?.Dispose();
             }
         }

diff --git a/osu.Game/Graphics/Backgrounds/TrianglesV2.cs b/osu.Game/Graphics/Backgrounds/TrianglesV2.cs
@@ -10,7 +10,6 @@
 using osu.Framework.Allocation;
 using System.Collections.Generic;
 using osu.Framework.Graphics.Rendering;
-using osu.Framework.Graphics.Rendering.Vertices;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 
@@ -196,8 +195,6 @@ private class TrianglesDrawNode : DrawNode
             private float texelSize;
             private bool masking;
 
-            private IVertexBatch<TexturedVertex2D>? vertexBatch;
-
             public TrianglesDrawNode(TrianglesV2 source)
                 : base(source)
             {
@@ -235,12 +232,6 @@ protected override void Draw(IRenderer renderer)
                 if (Source.AimCount == 0 || thickness == 0)
                     return;
 
-                if (vertexBatch == null || vertexBatch.Size != Source.AimCount)
-                {
-                    vertexBatch?.Dispose();
-                    vertexBatch = renderer.CreateQuadBatch<TexturedVertex2D>(Source.AimCount, 1);
-                }
-
                 borderDataBuffer ??= renderer.CreateUniformBuffer<TriangleBorderData>();
                 borderDataBuffer.Data = borderDataBuffer.Data with
                 {
@@ -273,7 +264,7 @@ protected override void Draw(IRenderer renderer)
                         triangleQuad.Height
                     ) / relativeSize;
 
-                    renderer.DrawQuad(texture, drawQuad, DrawColourInfo.Colour.Interpolate(triangleQuad), new RectangleF(0, 0, 1, 1), vertexBatch.AddAction, textureCoords: textureCoords);
+                    renderer.DrawQuad(texture, drawQuad, DrawColourInfo.Colour.Interpolate(triangleQuad), new RectangleF(0, 0, 1, 1), textureCoords: textureCoords);
                 }
 
                 shader.Unbind();
@@ -296,7 +287,6 @@ protected override void Dispose(bool isDisposing)
             {
                 base.Dispose(isDisposing);
 
-                vertexBatch?.Dispose();
                 borderDataBuffer?.Dispose();
             }
         }