Vulkan: Clean up ClipRectToScissor.

src/libANGLE/renderer/renderer_utils.cpp

@@ -768,22 +768,6 @@ angle::Result GetVertexRangeInfo(const gl::Context *context,
 
 gl::Rectangle ClipRectToScissor(const gl::State &glState, const gl::Rectangle &rect, bool invertY)
 {
-    if (glState.isScissorTestEnabled())
-    {
-        gl::Rectangle clippedRect;
-        if (!gl::ClipRectangle(glState.getScissor(), rect, &clippedRect))
-        {
-            return gl::Rectangle();
-        }
-
-        if (invertY)
-        {
-            clippedRect.y = rect.height - clippedRect.y - clippedRect.height;
-        }
-
-        return clippedRect;
-    }
-
     // If the scissor test isn't enabled, assume it has infinite size.  Its intersection with the
     // rect would be the rect itself.
     //
@@ -791,7 +775,23 @@ gl::Rectangle ClipRectToScissor(const gl::State &glState, const gl::Rectangle &r
     // unnecessary pipeline creations if two otherwise identical pipelines are used on framebuffers
     // with different sizes.  If such usage is observed in an application, we should investigate
     // possible optimizations.
-    return rect;
+    if (!glState.isScissorTestEnabled())
+    {
+        return rect;
+    }
+
+    gl::Rectangle clippedRect;
+    if (!gl::ClipRectangle(glState.getScissor(), rect, &clippedRect))
+    {
+        return gl::Rectangle();
+    }
+
+    if (invertY)
+    {
+        clippedRect.y = rect.height - clippedRect.y - clippedRect.height;
+    }
+
+    return clippedRect;
 }
 
 void ApplyFeatureOverrides(angle::FeatureSetBase *features, const egl::DisplayState &state)