wip2

osu.Framework/Game.cs

@@ -108,6 +108,8 @@ protected Game()
         {
             RelativeSizeAxes = Axes.Both;
 
+            ExtraRotation = Matrix3.CreateRotationX(MathF.PI / 4);
+
             base.AddInternal(content = new Container
             {
                 Anchor = Anchor.Centre,

osu.Framework/Graphics/Containers/CompositeDrawable_DrawNode.cs

@@ -66,6 +66,8 @@ protected class CompositeDrawableDrawNode : DrawNode, ICompositeDrawNode
 
             private int sourceChildrenCount;
 
+            private bool hasExtraRotation;
+
             public CompositeDrawableDrawNode(CompositeDrawable source)
                 : base(source)
             {
@@ -88,6 +90,8 @@ public override void ApplyState()
                 RectangleF shrunkDrawRectangle = Source.DrawRectangle.Normalize();
                 shrunkDrawRectangle = shrunkDrawRectangle.Shrink(new Vector2(Math.Min(shrunkDrawRectangle.Width / 2, shrinkage), Math.Min(shrunkDrawRectangle.Height / 2, shrinkage)));
 
+                hasExtraRotation = Source.ExtraRotation != Matrix3.Identity;
+
                 maskingInfo = !Source.Masking
                     ? null
                     : new MaskingInfo

osu.Framework/Graphics/Rendering/Renderer.cs

@@ -330,10 +330,7 @@ public void ScheduleDisposal<T>(Action<T> disposalAction, T target)
         /// The draw depth is written to every vertex added to <see cref="IVertexBuffer"/>s.
         /// </summary>
         /// <param name="drawDepth">The draw depth.</param>
-        internal void SetDrawDepth(float drawDepth)
-        {
-            BackbufferDrawDepth = 1.5f;
-        }
+        internal void SetDrawDepth(float drawDepth) => BackbufferDrawDepth = drawDepth;
 
         /// <summary>
         /// Performs a once-off initialisation of this <see cref="Renderer"/>.
@@ -484,43 +481,37 @@ private void setViewport(RectangleI viewport)
         public void PushScissor(RectangleI scissor)
         {
             scissorRectStack.Push(scissor);
-            setScissor(scissor);
         }
 
         public void PushScissorState(bool enabled)
         {
             scissorStateStack.Push(enabled);
-            setScissorState(enabled);
         }
 
         public void PushScissorOffset(Vector2I offset)
         {
             scissorOffsetStack.Push(offset);
-            setScissorOffset(offset);
         }
 
         public void PopScissor()
         {
             Trace.Assert(scissorRectStack.Count > 1);
 
             scissorRectStack.Pop();
-            setScissor(scissorRectStack.Peek());
         }
 
         public void PopScissorState()
         {
             Trace.Assert(scissorStateStack.Count > 1);
 
             scissorStateStack.Pop();
-            setScissorState(scissorStateStack.Peek());
         }
 
         public void PopScissorOffset()
         {
             Trace.Assert(scissorOffsetStack.Count > 1);
 
             scissorOffsetStack.Pop();
-            setScissorOffset(scissorOffsetStack.Peek());
         }
 
         private void setScissor(RectangleI scissor)

osu.Framework/Resources/Shaders/sh_Texture2D.vs

@@ -19,16 +19,19 @@ layout(location = 4) out mediump vec2 v_BlendRange;
 void main(void)
 {
     // Transform from screen space to masking space.
-    highp vec4 maskingPos = g_ToMaskingSpace * vec4(m_Position, 1.0, 1.0);
+    highp vec4 maskingPos = g_ToMaskingSpace * vec4(m_Position, 1.0 , 1.0);
     v_MaskingPosition = maskingPos.xy / maskingPos.w;
 
     v_Colour = m_Colour;
     v_TexCoord = m_TexCoord;
     v_TexRect = m_TexRect;
     v_BlendRange = m_BlendRange;
 
-    gl_Position = g_ProjMatrix * vec4(m_Position, m_BackbufferDrawDepth, 1.0);
+    gl_Position = g_ProjMatrix * vec4(m_Position, 1.0, 1.0);
     gl_Position /= gl_Position.w;
+
+    if (g_BackbufferDraw)
+        gl_Position.z = m_BackbufferDrawDepth;
 }
 
 #endif