commit 917f9193d24437f4b004fbf732152c0a6de93b7f
author Chris Dalton <csmartdalton@google.com> Tue Jun 08 14:32:37 2021 -0600
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jun 08 21:33:40 2021 +0000
tree bf682e543bd1db7eddbcd5c8bed96b1ecd4dc11d
parent acdbb1e397177d36c735c0714a09423cdfaf7bd5

Delete GrPathTessellationShader::OpFlags::kPreferWedges

It doesn't actually help perf to use wedges on the atlas. The atlas
does better with a separate dedicated draw for the triangle fans. Also
renames OpFlags -> PathFlags since we don't use these for stroking.

Bug: skia:10419
Change-Id: I31dab94d7e9469d2bf9975041170da6bc340df78
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/416857
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>

src/gpu/tessellate/GrPathInnerTriangulateOp.cpp

diff --git a/src/gpu/tessellate/GrPathInnerTriangulateOp.cpp b/src/gpu/tessellate/GrPathInnerTriangulateOp.cpp
index 143d153..c340ae9 100644
--- a/src/gpu/tessellate/GrPathInnerTriangulateOp.cpp
+++ b/src/gpu/tessellate/GrPathInnerTriangulateOp.cpp
@@ -18,7 +18,7 @@
 #include "src/gpu/tessellate/GrTessellationPathRenderer.h"
 #include "src/gpu/tessellate/shaders/GrPathTessellationShader.h"
 
-using OpFlags = GrTessellationPathRenderer::OpFlags;
+using PathFlags = GrTessellationPathRenderer::PathFlags;
 
 namespace {
 
@@ -166,8 +166,8 @@
 
     // If using wireframe, we have to fall back on a standard Redbook "stencil then fill" algorithm
     // instead of bypassing the stencil buffer to fill the fan directly.
-    bool forceRedbookStencilPass = (fOpFlags & (OpFlags::kStencilOnly | OpFlags::kWireframe));
-    bool doFill = !(fOpFlags & OpFlags::kStencilOnly);
+    bool forceRedbookStencilPass = (fPathFlags & (PathFlags::kStencilOnly | PathFlags::kWireframe));
+    bool doFill = !(fPathFlags & PathFlags::kStencilOnly);
 
     bool isLinear;
     fFanTriangulator = args.fArena->make<GrInnerFanTriangulator>(fPath, args.fArena);
@@ -177,7 +177,7 @@
     const GrPipeline* pipelineForStencils = nullptr;
     if (forceRedbookStencilPass || !isLinear) {  // Curves always get stencilled.
         pipelineForStencils = GrPathTessellationShader::MakeStencilOnlyPipeline(
-                args, fAAType, fOpFlags, appliedClip.hardClip());
+                args, fAAType, fPathFlags, appliedClip.hardClip());
     }
 
     // Create a pipeline for fill passes if needed.