diff --git a/osu.Game.Rulesets.Osu/Skinning/SmokeSegment.cs b/osu.Game.Rulesets.Osu/Skinning/SmokeSegment.cs
index a824f202ec..9d64c354e2 100644
--- a/osu.Game.Rulesets.Osu/Skinning/SmokeSegment.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/SmokeSegment.cs
@@ -252,13 +252,14 @@ namespace osu.Game.Rulesets.Osu.Skinning
                 renderer.SetBlend(BlendingParameters.Additive);
                 renderer.PushLocalMatrix(DrawInfo.Matrix);
 
-                TextureShader.Bind();
+                BindTextureShader(renderer);
+
                 texture.Bind();
 
                 for (int i = 0; i < points.Count; i++)
                     drawPointQuad(points[i], textureRect, i + firstVisiblePointIndex);
 
-                TextureShader.Unbind();
+                UnbindTextureShader(renderer);
                 renderer.PopLocalMatrix();
             }
 
diff --git a/osu.Game.Tests/Visual/Background/TestSceneTriangleBorderShader.cs b/osu.Game.Tests/Visual/Background/TestSceneTriangleBorderShader.cs
index 07427c242f..711d9ab5ea 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneTriangleBorderShader.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneTriangleBorderShader.cs
@@ -100,8 +100,10 @@ namespace osu.Game.Tests.Visual.Background
 
                 private IUniformBuffer<TriangleBorderData>? borderDataBuffer;
 
-                public override void Draw(IRenderer renderer)
+                protected override void BindUniformResources(IShader shader, IRenderer renderer)
                 {
+                    base.BindUniformResources(shader, renderer);
+
                     borderDataBuffer ??= renderer.CreateUniformBuffer<TriangleBorderData>();
                     borderDataBuffer.Data = borderDataBuffer.Data with
                     {
@@ -109,9 +111,7 @@ namespace osu.Game.Tests.Visual.Background
                         TexelSize = texelSize
                     };
 
-                    TextureShader.BindUniformBlock("m_BorderData", borderDataBuffer);
-
-                    base.Draw(renderer);
+                    shader.BindUniformBlock("m_BorderData", borderDataBuffer);
                 }
 
                 protected override bool CanDrawOpaqueInterior => false;
diff --git a/osu.Game/Graphics/Backgrounds/Triangles.cs b/osu.Game/Graphics/Backgrounds/Triangles.cs
index 28a715ca0b..0ee42c69d5 100644
--- a/osu.Game/Graphics/Backgrounds/Triangles.cs
+++ b/osu.Game/Graphics/Backgrounds/Triangles.cs
@@ -306,7 +306,7 @@ namespace osu.Game.Graphics.Backgrounds
                 };
 
                 shader.Bind();
-                shader.BindUniformBlock("m_BorderData", borderDataBuffer);
+                shader.BindUniformBlock(@"m_BorderData", borderDataBuffer);
 
                 foreach (TriangleParticle particle in parts)
                 {
diff --git a/osu.Game/Graphics/Backgrounds/TrianglesV2.cs b/osu.Game/Graphics/Backgrounds/TrianglesV2.cs
index 6a34fefa3a..750e96440d 100644
--- a/osu.Game/Graphics/Backgrounds/TrianglesV2.cs
+++ b/osu.Game/Graphics/Backgrounds/TrianglesV2.cs
@@ -249,7 +249,7 @@ namespace osu.Game.Graphics.Backgrounds
                 };
 
                 shader.Bind();
-                shader.BindUniformBlock("m_BorderData", borderDataBuffer);
+                shader.BindUniformBlock(@"m_BorderData", borderDataBuffer);
 
                 Vector2 relativeSize = Vector2.Divide(triangleSize, size);
 
diff --git a/osu.Game/Graphics/Sprites/LogoAnimation.cs b/osu.Game/Graphics/Sprites/LogoAnimation.cs
index 220f57e9fa..eb7613a1b2 100644
--- a/osu.Game/Graphics/Sprites/LogoAnimation.cs
+++ b/osu.Game/Graphics/Sprites/LogoAnimation.cs
@@ -59,14 +59,14 @@ namespace osu.Game.Graphics.Sprites
 
             private IUniformBuffer<AnimationData> animationDataBuffer;
 
-            protected override void Blit(IRenderer renderer)
+            protected override void BindUniformResources(IShader shader, IRenderer renderer)
             {
+                base.BindUniformResources(shader, renderer);
+
                 animationDataBuffer ??= renderer.CreateUniformBuffer<AnimationData>();
                 animationDataBuffer.Data = animationDataBuffer.Data with { Progress = progress };
 
-                TextureShader.BindUniformBlock("m_AnimationData", animationDataBuffer);
-
-                base.Blit(renderer);
+                shader.BindUniformBlock(@"m_AnimationData", animationDataBuffer);
             }
 
             protected override bool CanDrawOpaqueInterior => false;
diff --git a/osu.Game/Rulesets/Mods/ModFlashlight.cs b/osu.Game/Rulesets/Mods/ModFlashlight.cs
index a7889cb98d..f8c3a730f2 100644
--- a/osu.Game/Rulesets/Mods/ModFlashlight.cs
+++ b/osu.Game/Rulesets/Mods/ModFlashlight.cs
@@ -273,7 +273,7 @@ namespace osu.Game.Rulesets.Mods
                     };
 
                     shader.Bind();
-                    shader.BindUniformBlock("m_FlashlightParameters", flashlightParametersBuffer);
+                    shader.BindUniformBlock(@"m_FlashlightParameters", flashlightParametersBuffer);
 
                     renderer.DrawQuad(renderer.WhitePixel, screenSpaceDrawQuad, DrawColourInfo.Colour, vertexAction: addAction);