Revert of Remove the AA requirement for selecting GrEffect-based clipping.

src/gpu/GrClipMaskManager.cpp

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrClipMaskManager.h"
 #include "GrAAConvexPathRenderer.h"
@@ skipping 92 matching lines @@
                 return true;
             }
         }
     }
     return false;
 }
 
 bool GrClipMaskManager::installClipEffects(const ElementList& elements,
                                            GrDrawState::AutoRestoreEffects* are,
                                            const SkVector& clipToRTOffset,
-                                           const SkRect* drawBounds,
-                                           SkIRect* scissorRect) {
-
-    SkASSERT(NULL != scissorRect);
+                                           const SkRect* drawBounds) {
 
     GrDrawState* drawState = fGpu->drawState();
     SkRect boundsInClipSpace;
     if (NULL != drawBounds) {
         boundsInClipSpace = *drawBounds;
         boundsInClipSpace.offset(-clipToRTOffset.fX, -clipToRTOffset.fY);
     }
 
     are->set(drawState);
     GrRenderTarget* rt = drawState->getRenderTarget();
-    // We iterate from the top of the stack to the bottom. We do this because we select the first
-    // BW rectangle as the scissor. Clients performing hierarchical rendering tend to use smaller
-    // clips towards the top of the clip stack. Smaller scissor rects can help tiled architectures
-    // skip processing tiles for draws.
-    ElementList::Iter iter(elements, ElementList::Iter::kTail_IterStart);
+    ElementList::Iter iter(elements);
 
     bool setARE = false;
     bool failed = false;
 
     while (NULL != iter.get()) {
         SkRegion::Op op = iter.get()->getOp();
         bool invert;
         bool skip = false;
         switch (op) {
             case SkRegion::kReplace_Op:
@@ skipping 15 matching lines @@
                 break;
         }
         if (failed) {
             break;
         }
 
         if (!skip) {
             GrEffectEdgeType edgeType;
             if (GR_AA_CLIP && iter.get()->isAA()) {
                 if (rt->isMultisampled()) {
-                    // Coverage based AA clips don't play nicely with MSAA.
+                    // Coverage based AA clips don't place nicely with MSAA.
                     failed = true;
                     break;
                 }
                 edgeType = invert ? kInverseFillAA_GrEffectEdgeType : kFillAA_GrEffectEdgeType;
             } else {
                 edgeType = invert ? kInverseFillBW_GrEffectEdgeType : kFillBW_GrEffectEdgeType;
             }
-            // We don't want to exit if we convert a BW rect clip to a scissor.
-            bool failIfNoEffect = true;
             SkAutoTUnref<GrEffectRef> effect;
             switch (iter.get()->getType()) {
                 case SkClipStack::Element::kPath_Type:
                     effect.reset(GrConvexPolyEffect::Create(edgeType, iter.get()->getPath(),
                         &clipToRTOffset));
                     break;
                 case SkClipStack::Element::kRRect_Type: {
                     SkRRect rrect = iter.get()->getRRect();
                     rrect.offset(clipToRTOffset.fX, clipToRTOffset.fY);
                     effect.reset(GrRRectEffect::Create(edgeType, rrect));
                     break;
                 }
                 case SkClipStack::Element::kRect_Type: {
                     SkRect rect = iter.get()->getRect();
                     rect.offset(clipToRTOffset.fX, clipToRTOffset.fY);
-                    if (kFillBW_GrEffectEdgeType == edgeType && scissorRect->isEmpty()) {
-                        // This is OK because we only allow clip operations that shrink the clip
-                        // to be implemented as effects.
-                        rect.roundOut(scissorRect);
-                        failIfNoEffect = false;
-                    } else {
-                        effect.reset(GrConvexPolyEffect::Create(edgeType, rect));
-                    }
+                    effect.reset(GrConvexPolyEffect::Create(edgeType, rect));
                     break;
                 }
                 default:
                     break;
             }
             if (effect) {
                 if (!setARE) {
                     are->set(fGpu->drawState());
                     setARE = true;
                 }
                 fGpu->drawState()->addCoverageEffect(effect);
-            } else if (failIfNoEffect) {
+            } else {
                 failed = true;
                 break;
             }
         }
-        iter.prev();
+        iter.next();
     }
 
     if (failed) {
         are->set(NULL);
     }
 
     return !failed;
 }
 
-static inline bool rect_contains_irect(const SkIRect ir, const SkRect& r) {
-    SkASSERT(!ir.isEmpty());
-    SkASSERT(!r.isEmpty());
-    return ir.fLeft <= r.fLeft && ir.fTop <= r.fTop &&
-           ir.fRight >= r.fRight && ir.fBottom >= r.fBottom;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // sort out what kind of clip mask needs to be created: alpha, stencil,
 // scissor, or entirely software
 bool GrClipMaskManager::setupClipping(const GrClipData* clipDataIn,
                                       GrDrawState::AutoRestoreEffects* are,
                                       const SkRect* devBounds) {
     fCurrClipMaskType = kNone_ClipMaskType;
 
     ElementList elements(16);
     int32_t genID;
@@ skipping 36 matching lines @@
 
     // An element count of 4 was chosen because of the common pattern in Blink of:
     //   isect RR
     //   diff  RR
     //   isect convex_poly
     //   isect convex_poly
     // when drawing rounded div borders. This could probably be tuned based on a
     // configuration's relative costs of switching RTs to generate a mask vs
     // longer shaders.
     if (elements.count() <= 4) {
-        SkIRect scissorRect;
-        scissorRect.setEmpty();
         SkVector clipToRTOffset = { SkIntToScalar(-clipDataIn->fOrigin.fX),
                                     SkIntToScalar(-clipDataIn->fOrigin.fY) };
         if (elements.isEmpty() ||
-            this->installClipEffects(elements, are, clipToRTOffset, devBounds, &scissorRect)) {
-            if (scissorRect.isEmpty()) {
-                // We may still want to use a scissor, especially on tiled architectures.
-                scissorRect = clipSpaceIBounds;
-                scissorRect.offset(-clipDataIn->fOrigin);
-                if (NULL == devBounds ||
-                    !rect_contains_irect(scissorRect, *devBounds)) {
-                    fGpu->enableScissor(scissorRect);
-                } else {
-                    // When the vertices that will be rendered fit fully inside the clip's bounds
-                    // then providing the scissor rect will not help the driver eliminate tiles
-                    // from consideration for the draw, but changing the scissor will cause
-                    // state changes between draws.
-                    fGpu->disableScissor();
-                }
+            (requiresAA && this->installClipEffects(elements, are, clipToRTOffset, devBounds))) {
+            SkIRect scissorSpaceIBounds(clipSpaceIBounds);
+            scissorSpaceIBounds.offset(-clipDataIn->fOrigin);
+            if (NULL == devBounds ||
+                !SkRect::Make(scissorSpaceIBounds).contains(*devBounds)) {
+                fGpu->enableScissor(scissorSpaceIBounds);
             } else {
-                scissorRect.fLeft = SkTMax(0, scissorRect.fLeft);
-                scissorRect.fTop = SkTMax(0, scissorRect.fTop);
-                scissorRect.fRight = SkTMin(rt->width(), scissorRect.fRight);
-                scissorRect.fBottom = SkTMin(rt->height(), scissorRect.fBottom);
-                fGpu->enableScissor(scissorRect);
+                fGpu->disableScissor();
             }
             this->setGpuStencil();
             return true;
         }
     }
 
 #if GR_AA_CLIP
     // If MSAA is enabled we can do everything in the stencil buffer.
     if (0 == rt->numSamples() && requiresAA) {
         GrTexture* result = NULL;
@@ skipping 852 matching lines @@
 
     // TODO: dynamically attach a stencil buffer
     int stencilBits = 0;
     GrStencilBuffer* stencilBuffer =
         drawState.getRenderTarget()->getStencilBuffer();
     if (NULL != stencilBuffer) {
         stencilBits = stencilBuffer->bits();
         this->adjustStencilParams(settings, clipMode, stencilBits);
     }
 }