commit 031d76b67447b9849f0d727e319632458f60bebd
author Chris Dalton <csmartdalton@google.com> Tue Jun 08 16:32:00 2021 -0600
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jun 08 23:33:50 2021 +0000
tree b1fa3bd55dd985e9cdf69519a4d8466fea877463
parent 26666bda75b9edce02dcf3e27caf6fb35085476e

Rename GrPathStencilFillOp -> GrPathStencilCoverOp

"Fill" is an overloaded term. Switch to saying "cover", which I
believe is more true to the Redbook terminology anyway.

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

src/gpu/tessellate/GrPathInnerTriangulateOp.cpp

diff --git a/src/gpu/tessellate/GrPathInnerTriangulateOp.cpp b/src/gpu/tessellate/GrPathInnerTriangulateOp.cpp
index 37b4c75..715b119 100644
--- a/src/gpu/tessellate/GrPathInnerTriangulateOp.cpp
+++ b/src/gpu/tessellate/GrPathInnerTriangulateOp.cpp
@@ -22,7 +22,7 @@
 namespace {
 
 // Fills an array of convex hulls surrounding 4-point cubic or conic instances. This shader is used
-// for the "fill" pass after the curves have been fully stencilled.
+// for the "cover" pass after the curves have been fully stencilled.
 class HullShader : public GrPathTessellationShader {
 public:
     HullShader(const SkMatrix& viewMatrix, SkPMColor4f color)
@@ -157,13 +157,13 @@
     SkASSERT(!fTessellator);
     SkASSERT(!fStencilCurvesProgram);
     SkASSERT(fFanPrograms.empty());
-    SkASSERT(!fFillHullsProgram);
+    SkASSERT(!fCoverHullsProgram);
 
     if (fPath.countVerbs() <= 0) {
         return;
     }
 
-    // If using wireframe, we have to fall back on a standard Redbook "stencil then fill" algorithm
+    // If using wireframe, we have to fall back on a standard Redbook "stencil then cover" algorithm
     // instead of bypassing the stencil buffer to fill the fan directly.
     bool forceRedbookStencilPass = (fPathFlags & (PathFlags::kStencilOnly | PathFlags::kWireframe));
     bool doFill = !(fPathFlags & PathFlags::kStencilOnly);
@@ -202,8 +202,8 @@
     // Pass 2: Fill the path's inner fan with a stencil test against the curves.
     if (fFanPolys) {
         if (forceRedbookStencilPass) {
-            // Use a standard Redbook "stencil then fill" algorithm instead of bypassing the stencil
-            // buffer to fill the fan directly.
+            // Use a standard Redbook "stencil then cover" algorithm instead of bypassing the
+            // stencil buffer to fill the fan directly.
             const GrUserStencilSettings* stencilPathSettings =
                     GrPathTessellationShader::StencilPathSettings(fPath.getFillType());
             this->pushFanStencilProgram(args, pipelineForStencils, stencilPathSettings);
@@ -299,7 +299,7 @@
         // This will fill in any remaining samples and reset the stencil values back to zero.
         SkASSERT(fTessellator);
         auto* hullShader = args.fArena->make<HullShader>(fViewMatrix, fColor);
-        fFillHullsProgram = GrTessellationShader::MakeProgram(
+        fCoverHullsProgram = GrTessellationShader::MakeProgram(
                 args, hullShader, fPipelineForFills,
                 GrPathTessellationShader::TestAndResetStencilSettings());
     }
@@ -320,8 +320,8 @@
     for (const GrProgramInfo* fanProgram : fFanPrograms) {
         context->priv().recordProgramInfo(fanProgram);
     }
-    if (fFillHullsProgram) {
-        context->priv().recordProgramInfo(fFillHullsProgram);
+    if (fCoverHullsProgram) {
+        context->priv().recordProgramInfo(fCoverHullsProgram);
     }
 }
 
@@ -365,10 +365,10 @@
         flushState->draw(fFanVertexCount, fBaseFanVertex);
     }
 
-    if (fFillHullsProgram) {
+    if (fCoverHullsProgram) {
         SkASSERT(fTessellator);
-        flushState->bindPipelineAndScissorClip(*fFillHullsProgram, this->bounds());
-        flushState->bindTextures(fFillHullsProgram->geomProc(), nullptr, *fPipelineForFills);
+        flushState->bindPipelineAndScissorClip(*fCoverHullsProgram, this->bounds());
+        flushState->bindTextures(fCoverHullsProgram->geomProc(), nullptr, *fPipelineForFills);
         fTessellator->drawHullInstances(flushState);
     }
 }