commit 40ff868be1939e55b4b850a50f49f15c1eeddf4a
author Greg Daniel <egdaniel@google.com> Wed May 05 22:02:02 2021 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed May 05 22:02:17 2021 +0000
tree 580f65f9b9bcfa4adad9d92ab8cf1586439b0f37
parent ae333c414a4ca2711c8e5871cf78054d423f5632

Revert "Re-enable tessellation for cacheable strokes"

This reverts commit 5e1f135376bd870e03ec43d4e5394f8c50b5f6fe.

Reason for revert: breaking pixel test on chrome roll

Original change's description:
> Re-enable tessellation for cacheable strokes
>
> Now that the fixed count stroke tessellator has landed, these should
> hopefully not regress performance.
>
> Bug: skia:11138
> Bug: skia:11139
> Change-Id: I1a7d756e2a8a55f9ad4aaed716e4816b342b3b4f
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/404398
> Reviewed-by: Greg Daniel <egdaniel@google.com>
> Commit-Queue: Chris Dalton <csmartdalton@google.com>

TBR=egdaniel@google.com,csmartdalton@google.com

Change-Id: I723bbb3f6ee8f2cfbf80a1475b351a87f82e4d2b
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:11138
Bug: skia:11139
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/404919
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>

src/gpu/tessellate/GrTessellationPathRenderer.cpp

diff --git a/src/gpu/tessellate/GrTessellationPathRenderer.cpp b/src/gpu/tessellate/GrTessellationPathRenderer.cpp
index 5773546..8804a4a 100644
--- a/src/gpu/tessellate/GrTessellationPathRenderer.cpp
+++ b/src/gpu/tessellate/GrTessellationPathRenderer.cpp
@@ -137,17 +137,14 @@
         !args.fProxy->canUseStencil(*args.fCaps)) {
         return CanDrawPath::kNo;
     }
-    if (shape.style().strokeRec().getStyle() != SkStrokeRec::kStroke_Style) {
-        // On platforms that don't have native support for indirect draws and/or hardware
-        // tessellation, we find that the default path renderer can draw fills faster sometimes. Let
-        // fills fall through to the default renderer on these platforms for now.
-        // (crbug.com/1163441, skbug.com/11138, skbug.com/11139)
-        if (!args.fCaps->nativeDrawIndirectSupport() &&
-            !args.fCaps->shaderCaps()->tessellationSupport() &&
-            // Is the path cacheable? TODO: This check is outdated. Remove it next.
-            shape.hasUnstyledKey()) {
-            return CanDrawPath::kNo;
-        }
+    // On platforms that don't have native support for indirect draws and/or hardware tessellation,
+    // we find that cached triangulations of strokes can render slightly faster. Let cacheable paths
+    // go to the triangulator on these platforms for now.
+    // (crbug.com/1163441, skbug.com/11138, skbug.com/11139)
+    if (!args.fCaps->nativeDrawIndirectSupport() &&
+        !args.fCaps->shaderCaps()->tessellationSupport() &&
+        shape.hasUnstyledKey()) {  // Is the path cacheable?
+        return CanDrawPath::kNo;
     }
     return CanDrawPath::kYes;
 }