commit 6edc8d9617587279f1f35e66738d9e4306d351cd
author Chris Dalton <csmartdalton@google.com> Thu May 27 09:40:43 2021 -0600
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu May 27 17:14:37 2021 +0000
tree cb35dd48c4def490492ea6c6cc2f009b568479df
parent 55cbc75930fd650565439c913e0076745f6df11c

Remove 'hasUserStencilSettings' from GrClip::apply

This doesn't seem necessary. Its only purpose was to disable analytic
clips when there were user stencil settings, which seems like a
de-optimization. The ops that use stencil all seem to properly handle
clip processors in their color pass, so it should be fine to remove
this.

Bug: skia:12047
Change-Id: Ide0ae1004548d62b2feb73c6950bcbcaf6716cfd
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/413099
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>

src/gpu/GrSurfaceDrawContext.cpp

diff --git a/src/gpu/GrSurfaceDrawContext.cpp b/src/gpu/GrSurfaceDrawContext.cpp
index 4dddf1d..06a53f1 100644
--- a/src/gpu/GrSurfaceDrawContext.cpp
+++ b/src/gpu/GrSurfaceDrawContext.cpp
@@ -1896,7 +1896,7 @@
         } else {
             aaType = op->hasAABloat() ? GrAAType::kCoverage : GrAAType::kNone;
         }
-        skipDraw = clip->apply(fContext, this, aaType, usesUserStencilBits,
+        skipDraw = clip->apply(fContext, this, aaType,
                                &appliedClip, &bounds) == GrClip::Effect::kClippedOut;
     } else {
         // No clipping, so just clip the bounds against the logical render target dimensions