commit 2f733ec2ddfb68d2a6041912f57e0c8c4cebc806
author Chris Dalton <csmartdalton@google.com> Tue Jun 01 12:11:57 2021 -0600
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jun 01 19:11:43 2021 +0000
tree bb7fb2cfd0591b360e130d9bfe891cc7cb22afbe
parent 8f73edeaf6558e8c14ad80679737b90c24d08e31

Restructure path tessellation shaders

Merges the GrStrokePathShader and GrFillPathShader classes together.
Creates a new base class called GrPathTessellationShader. Now they all
have a uniform color and can all be draw to stencil and color both.
This is necessary cleanup in general, but will also allow us to create
a convex tessellation op that bypasses the stencil buffer.

Bug: skia:10419
Change-Id: Ifc492c94d3de044a36bd9ea95b1d5aa22e007905
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/413696
Commit-Queue: Chris Dalton <csmartdalton@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>

src/gpu/tessellate/GrStrokeTessellateOp.h

diff --git a/src/gpu/tessellate/GrStrokeTessellateOp.h b/src/gpu/tessellate/GrStrokeTessellateOp.h
index 7162742..da375c4 100644
--- a/src/gpu/tessellate/GrStrokeTessellateOp.h
+++ b/src/gpu/tessellate/GrStrokeTessellateOp.h
@@ -10,8 +10,8 @@
 
 #include "include/core/SkStrokeRec.h"
 #include "src/gpu/ops/GrMeshDrawOp.h"
-#include "src/gpu/tessellate/GrPathShader.h"
 #include "src/gpu/tessellate/GrStrokeTessellator.h"
+#include "src/gpu/tessellate/GrTessellationShader.h"
 
 class GrRecordingContext;
 
@@ -55,7 +55,7 @@
     CombineResult onCombineIfPossible(GrOp*, SkArenaAlloc*, const GrCaps&) override;
 
     // Creates the tessellator and the stencil/fill program(s) we will use with it.
-    void prePrepareTessellator(GrPathShader::ProgramArgs&&, GrAppliedClip&&);
+    void prePrepareTessellator(GrTessellationShader::ProgramArgs&&, GrAppliedClip&&);
 
     void onPrePrepare(GrRecordingContext*, const GrSurfaceProxyView&, GrAppliedClip*,
                       const GrXferProcessor::DstProxyView&, GrXferBarrierFlags,