commit c3318f09cdf181f7c6e26a9445f4ceb839d41b7b
author Chris Dalton <csmartdalton@google.com> Fri Jul 19 14:20:53 2019 -0600
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jul 19 20:52:17 2019 +0000
tree 9eec928483cbf916bb2011ecf0c3d53e11301a85
parent 4a13119a60e25c75c4c4d6d99d852f3e8b3346e1

ccpr: Add an MSAA atlas mode

Adds the option to use a multisampled (or mixed sampled) atlas, and
uses the sample mask and stencil buffer instead of coverage counts.

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

src/gpu/ccpr/GrCCClipProcessor.cpp

diff --git a/src/gpu/ccpr/GrCCClipProcessor.cpp b/src/gpu/ccpr/GrCCClipProcessor.cpp
index eebfd47..73537e6 100644
--- a/src/gpu/ccpr/GrCCClipProcessor.cpp
+++ b/src/gpu/ccpr/GrCCClipProcessor.cpp
@@ -14,12 +14,12 @@
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 
-GrCCClipProcessor::GrCCClipProcessor(const GrCCClipPath* clipPath, MustCheckBounds mustCheckBounds,
-                                     SkPath::FillType overrideFillType)
+GrCCClipProcessor::GrCCClipProcessor(const GrCCClipPath* clipPath, IsCoverageCount isCoverageCount,
+                                     MustCheckBounds mustCheckBounds)
         : INHERITED(kGrCCClipProcessor_ClassID, kCompatibleWithCoverageAsAlpha_OptimizationFlag)
         , fClipPath(clipPath)
-        , fMustCheckBounds((bool)mustCheckBounds)
-        , fOverrideFillType(overrideFillType)
+        , fIsCoverageCount(IsCoverageCount::kYes == isCoverageCount)
+        , fMustCheckBounds(MustCheckBounds::kYes == mustCheckBounds)
         , fAtlasAccess(sk_ref_sp(fClipPath->atlasLazyProxy()), GrSamplerState::Filter::kNearest,
                        GrSamplerState::WrapMode::kClamp) {
     SkASSERT(fAtlasAccess.proxy());
@@ -27,12 +27,16 @@
 }
 
 std::unique_ptr<GrFragmentProcessor> GrCCClipProcessor::clone() const {
-    return skstd::make_unique<GrCCClipProcessor>(fClipPath, MustCheckBounds(fMustCheckBounds),
-                                                 fOverrideFillType);
+    return skstd::make_unique<GrCCClipProcessor>(
+            fClipPath, IsCoverageCount(fIsCoverageCount), MustCheckBounds(fMustCheckBounds));
 }
 
 void GrCCClipProcessor::onGetGLSLProcessorKey(const GrShaderCaps&, GrProcessorKeyBuilder* b) const {
-    b->add32((fOverrideFillType << 1) | (int)fMustCheckBounds);
+    const SkPath& clipPath = fClipPath->deviceSpacePath();
+    uint32_t key = (fIsCoverageCount) ? (uint32_t)GrFillRuleForSkPath(clipPath) : 0;
+    key = (key << 1) | ((clipPath.isInverseFillType()) ? 1 : 0);
+    key = (key << 1) | ((fMustCheckBounds) ? 1 : 0);
+    b->add32(key);
 }
 
 bool GrCCClipProcessor::onIsEqual(const GrFragmentProcessor& fp) const {
@@ -41,7 +45,9 @@
     // already weeded out FPs with different ClipPaths.
     SkASSERT(that.fClipPath->deviceSpacePath().getGenerationID() ==
              fClipPath->deviceSpacePath().getGenerationID());
-    return that.fOverrideFillType == fOverrideFillType;
+    return that.fClipPath->deviceSpacePath().getFillType() ==
+                   fClipPath->deviceSpacePath().getFillType() &&
+           that.fIsCoverageCount == fIsCoverageCount && that.fMustCheckBounds == fMustCheckBounds;
 }
 
 class GrCCClipProcessor::Impl : public GrGLSLFragmentProcessor {
@@ -52,6 +58,7 @@
         GrGLSLFPFragmentBuilder* f = args.fFragBuilder;
 
         f->codeAppend ("half coverage;");
+
         if (proc.fMustCheckBounds) {
             const char* pathIBounds;
             fPathIBoundsUniform = uniHandler->addUniform(kFragment_GrShaderFlag, kFloat4_GrSLType,
@@ -67,16 +74,19 @@
         f->codeAppendf("float2 texcoord = sk_FragCoord.xy * %s.xy + %s.zw;",
                        atlasTransform, atlasTransform);
 
-        f->codeAppend ("half coverage_count = ");
+        f->codeAppend ("coverage = ");
         f->appendTextureLookup(args.fTexSamplers[0], "texcoord", kHalf2_GrSLType);
         f->codeAppend (".a;");
 
-        if (SkPath::kEvenOdd_FillType == proc.fOverrideFillType ||
-            SkPath::kInverseEvenOdd_FillType == proc.fOverrideFillType) {
-            f->codeAppend ("half t = mod(abs(coverage_count), 2);");
-            f->codeAppend ("coverage = 1 - abs(t - 1);");
-        } else {
-            f->codeAppend ("coverage = min(abs(coverage_count), 1);");
+        if (proc.fIsCoverageCount) {
+            auto fillRule = GrFillRuleForSkPath(proc.fClipPath->deviceSpacePath());
+            if (GrFillRule::kEvenOdd == fillRule) {
+                f->codeAppend ("half t = mod(abs(coverage), 2);");
+                f->codeAppend ("coverage = 1 - abs(t - 1);");
+            } else {
+                SkASSERT(GrFillRule::kNonzero == fillRule);
+                f->codeAppend ("coverage = min(abs(coverage), 1);");
+            }
         }
 
         if (proc.fMustCheckBounds) {
@@ -85,7 +95,7 @@
             f->codeAppend ("}");
         }
 
-        if (SkPath::IsInverseFillType(proc.fOverrideFillType)) {
+        if (proc.fClipPath->deviceSpacePath().isInverseFillType()) {
             f->codeAppend ("coverage = 1 - coverage;");
         }