Merge pull request #6366 from EVAST9919/blending-test

Fix renderers can't batch vertices with the same blending parameters in some cases
ppy · Aug 28, 2024 · a4a2b68 · a4a2b68
2 parents 4e3ef47 + 1b28393
commit a4a2b68
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/osu.Framework/Graphics/Containers/CompositeDrawable_DrawNode.cs b/osu.Framework/Graphics/Containers/CompositeDrawable_DrawNode.cs
@@ -176,6 +176,9 @@ private void updateQuadBatch(IRenderer renderer)
                     quadBatch = renderer.CreateQuadBatch<TexturedVertex2D>(100, 1000);
             }
 
+            // Children will set their own blending parameters.
+            internal override bool SetBlending => false;
+
             protected override void Draw(IRenderer renderer)
             {
                 updateQuadBatch(renderer);

diff --git a/osu.Framework/Graphics/DrawNode.cs b/osu.Framework/Graphics/DrawNode.cs
@@ -67,6 +67,11 @@ public virtual void ApplyState()
             InvalidationID = Source.InvalidationID;
         }
 
+        /// <summary>
+        /// Whether the renderer should set blending parameters of this <see cref="DrawNode"/>.
+        /// </summary>
+        internal virtual bool SetBlending => true;
+
         /// <summary>
         /// Draws this <see cref="DrawNode"/> to the screen.
         /// </summary>
@@ -76,7 +81,9 @@ public virtual void ApplyState()
         /// <param name="renderer">The renderer to draw with.</param>
         protected virtual void Draw(IRenderer renderer)
         {
-            renderer.SetBlend(DrawColourInfo.Blending);
+            if (SetBlending)
+                renderer.SetBlend(DrawColourInfo.Blending);
+
             renderer.BackbufferDepth.Set(drawDepth);
         }