Unify edge type enums across GrEffect subclasses that clip rendering to a geometry.

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 162 matching lines @@
         Element::Type type = elements.tail()->getType();
         bool isAA = GR_AA_CLIP && elements.tail()->isAA();
         SkAutoTUnref<GrEffectRef> effect;
         if (SkClipStack::Element::kPath_Type == type) {
             const SkPath& path = elements.tail()->getPath();
             if (rt->isMultisampled()) {
                 // A coverage effect for AA clipping won't play nicely with MSAA.
                 if (!isAA) {
                     SkVector offset = { SkIntToScalar(-clipDataIn->fOrigin.fX),
                                         SkIntToScalar(-clipDataIn->fOrigin.fY) };
-                    effect.reset(GrConvexPolyEffect::Create(GrConvexPolyEffect::kFillNoAA_EdgeType,
+                    effect.reset(GrConvexPolyEffect::Create(kFillBW_GrEffectEdgeType,
                                                             path, &offset));
                 }
             } else {
                 SkVector offset = { SkIntToScalar(-clipDataIn->fOrigin.fX),
                                     SkIntToScalar(-clipDataIn->fOrigin.fY) };
-                GrConvexPolyEffect::EdgeType type = isAA ? GrConvexPolyEffect::kFillAA_EdgeType :
-                                                           GrConvexPolyEffect::kFillNoAA_EdgeType;
+                GrEffectEdgeType type = isAA ? kFillAA_GrEffectEdgeType : kFillBW_GrEffectEdgeType;
                 effect.reset(GrConvexPolyEffect::Create(type, path, &offset));
             }
         } else if (isAA && SkClipStack::Element::kRRect_Type == type && !rt->isMultisampled()) {
             const SkRRect& rrect = elements.tail()->getRRect();
-            effect.reset(GrRRectEffect::Create(GrRRectEffect::kFillAA_EdgeType, rrect));
+            effect.reset(GrRRectEffect::Create(kFillAA_GrEffectEdgeType, rrect));
         } else if (isAA && SkClipStack::Element::kRect_Type == type && !rt->isMultisampled()) {
             // We only handle AA/non-MSAA rects here. Coverage effect AA isn't MSAA friendly and
             // non-AA rect clips are handled by the scissor.
             SkRect rect = elements.tail()->getRect();
             SkVector offset = { SkIntToScalar(-clipDataIn->fOrigin.fX),
                                 SkIntToScalar(-clipDataIn->fOrigin.fY) };
             rect.offset(offset);
-            effect.reset(GrConvexPolyEffect::Create(GrConvexPolyEffect::kFillAA_EdgeType, rect));
+            effect.reset(GrConvexPolyEffect::Create(kFillAA_GrEffectEdgeType, rect));
             // This should never fail.
             SkASSERT(effect);
         }
         if (effect) {
             are->set(fGpu->drawState());
             fGpu->drawState()->addCoverageEffect(effect);
             SkIRect scissorSpaceIBounds(clipSpaceIBounds);
             scissorSpaceIBounds.offset(-clipDataIn->fOrigin);
             fGpu->enableScissor(scissorSpaceIBounds);
             this->setGpuStencil();
@@ skipping 863 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);
     }
 }