commit a912ddef05e6c2b7a2c4076772b6cead56a345bd
author bsalomon <bsalomon@google.com> Wed Oct 14 15:01:50 2015 -0700
committer Commit bot <commit-bot@chromium.org> Wed Oct 14 15:01:50 2015 -0700
tree 00c9c4e68363290d968ea878926fca1251cb5590
parent a3b8c67ea6e542aecf40d46ce9be45d50ef89660

Don't abort analytic clipping if using MSAA until elements are examined

TBR=joshualitt@google.com

Review URL: https://codereview.chromium.org/1399223005

src/gpu/GrClipMaskManager.cpp

diff --git a/src/gpu/GrClipMaskManager.cpp b/src/gpu/GrClipMaskManager.cpp
index 4b464bb..e0a85d1 100644
--- a/src/gpu/GrClipMaskManager.cpp
+++ b/src/gpu/GrClipMaskManager.cpp
@@ -109,6 +109,7 @@
 }
 
 bool GrClipMaskManager::getAnalyticClipProcessor(const GrReducedClip::ElementList& elements,
+                                                 bool abortIfAA,
                                                  SkVector& clipToRTOffset,
                                                  const SkRect* drawBounds,
                                                  const GrFragmentProcessor** resultFP) {
@@ -151,16 +152,20 @@
         if (failed) {
             break;
         }
-
         if (!skip) {
             GrPrimitiveEdgeType edgeType;
             if (iter.get()->isAA()) {
+                if (abortIfAA) {
+                    failed = true;
+                    break;
+                }
                 edgeType =
                     invert ? kInverseFillAA_GrProcessorEdgeType : kFillAA_GrProcessorEdgeType;
             } else {
                 edgeType =
                     invert ? kInverseFillBW_GrProcessorEdgeType : kFillBW_GrProcessorEdgeType;
             }
+
             switch (iter.get()->getType()) {
                 case SkClipStack::Element::kPath_Type:
                     fps[fpCnt] = GrConvexPolyEffect::Create(edgeType, iter.get()->getPath(),
@@ -282,8 +287,9 @@
         bool disallowAnalyticAA = pipelineBuilder.getRenderTarget()->isUnifiedMultisampled();
         const GrFragmentProcessor* clipFP = nullptr;
         if (elements.isEmpty() ||
-            (requiresAA && !disallowAnalyticAA &&
-             this->getAnalyticClipProcessor(elements, clipToRTOffset, devBounds, &clipFP))) {
+            (requiresAA &&
+             this->getAnalyticClipProcessor(elements, disallowAnalyticAA, clipToRTOffset, devBounds,
+                                            &clipFP))) {
             SkIRect scissorSpaceIBounds(clipSpaceIBounds);
             scissorSpaceIBounds.offset(-clip.origin());
             if (nullptr == devBounds ||