commit bc3307c395e2530d7a3a26f2846aed9f8c57fd35
author Chris Dalton <csmartdalton@google.com> Tue Feb 04 13:21:03 2020 -0700
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Feb 05 06:42:53 2020 +0000
tree 021cff241ede08e1c2be20b0573545af41fa57fc
parent 6c9b1fd6663e683d5edbdab4c9ccd15c336746c3

Don't do clear or round rect optimizations when a rect has stencil

Change-Id: Ib506c0cc3c46d1bf514b35a8ba78d31d3e84f22c
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/268666
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>

src/gpu/GrRenderTargetContext.cpp

diff --git a/src/gpu/GrRenderTargetContext.cpp b/src/gpu/GrRenderTargetContext.cpp
index 665de5e..001f041 100644
--- a/src/gpu/GrRenderTargetContext.cpp
+++ b/src/gpu/GrRenderTargetContext.cpp
@@ -685,7 +685,8 @@
         if (clipRRect.isRect()) {
             // No rounded corners, so the kClear and kExplicitClip optimizations are possible
             if (GrQuadUtils::CropToRect(clipBounds, clipAA, &newFlags, deviceQuad, localQuad)) {
-                if (constColor && deviceQuad->quadType() == GrQuad::Type::kAxisAligned) {
+                if (!stencilSettings && constColor &&
+                    deviceQuad->quadType() == GrQuad::Type::kAxisAligned) {
                     // Clear optimization is possible
                     drawBounds = deviceQuad->bounds();
                     if (drawBounds.contains(rtRect)) {
@@ -722,7 +723,7 @@
                 // the clip entirely
                 return QuadOptimization::kCropped;
             }
-        } else if (constColor) {
+        } else if (!stencilSettings && constColor) {
             // Rounded corners and constant filled color (limit ourselves to solid colors because
             // there is no way to use custom local coordinates with drawRRect).
             if (GrQuadUtils::CropToRect(clipBounds, clipAA, &newFlags, deviceQuad, localQuad) &&