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

gm/convexpolyeffect.cpp

 
 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 // This test only works with the GPU backend.
 
@@ skipping 102 matching lines @@
             return;
         }
 
         SkScalar y = 0;
         for (SkTLList<SkPath>::Iter iter(fPaths, SkTLList<SkPath>::Iter::kHead_IterStart);
              NULL != iter.get();
              iter.next()) {
             const SkPath* path = iter.get();
             SkScalar x = 0;
 
-            for (int et = 0; et < GrConvexPolyEffect::kEdgeTypeCnt; ++et) {
+            for (int et = 0; et < kGrEffectEdgeTypeCnt; ++et) {
                 GrTestTarget tt;
                 context->getTestTarget(&tt);
                 if (NULL == tt.target()) {
                     SkDEBUGFAIL("Couldn't get Gr test target.");
                     return;
                 }
                 GrDrawState* drawState = tt.target()->drawState();
                 drawState->setVertexAttribs<kAttribs>(SK_ARRAY_COUNT(kAttribs));
 
                 SkMatrix m;
                 SkPath p;
                 m.setTranslate(x, y);
                 path->transform(m, &p);
 
-                GrConvexPolyEffect::EdgeType edgeType = (GrConvexPolyEffect::EdgeType) et;
+                GrEffectEdgeType edgeType = (GrEffectEdgeType) et;
                 SkAutoTUnref<GrEffectRef> effect(GrConvexPolyEffect::Create(edgeType, p));
                 if (!effect) {
-                    SkDEBUGFAIL("Couldn't create convex poly effect.");
-                    return;
+                    continue;
                 }
                 drawState->addCoverageEffect(effect, 1);
                 drawState->setIdentityViewMatrix();
                 drawState->setRenderTarget(rt);
                 drawState->setColor(0xff000000);
 
                 SkPoint verts[4];
                 SkRect bounds = p.getBounds();
                 // Make sure any artifacts around the exterior of path are visible by using overly
                 // conservative bounding geometry.
@@ skipping 19 matching lines @@
 
             y += SkScalarCeilToScalar(path->getBounds().height() + 20.f);
         }
 
         for (SkTLList<SkRect>::Iter iter(fRects, SkTLList<SkRect>::Iter::kHead_IterStart);
              NULL != iter.get();
              iter.next()) {
 
             SkScalar x = 0;
 
-            for (int et = 0; et < GrConvexPolyEffect::kEdgeTypeCnt; ++et) {
+            for (int et = 0; et < kGrEffectEdgeTypeCnt; ++et) {
                 GrTestTarget tt;
                 context->getTestTarget(&tt);
                 if (NULL == tt.target()) {
                     SkDEBUGFAIL("Couldn't get Gr test target.");
                     return;
                 }
                 SkRect rect = *iter.get();
                 rect.offset(x, y);
-                GrConvexPolyEffect::EdgeType edgeType = (GrConvexPolyEffect::EdgeType) et;
+                GrEffectEdgeType edgeType = (GrEffectEdgeType) et;
                 SkAutoTUnref<GrEffectRef> effect(GrConvexPolyEffect::Create(edgeType, rect));
                 if (!effect) {
-                    SkDEBUGFAIL("Couldn't create convex poly effect.");
-                    return;
+                    continue;
                 }
 
                 GrDrawState* drawState = tt.target()->drawState();
                 drawState->setVertexAttribs<kAttribs>(SK_ARRAY_COUNT(kAttribs));
                 drawState->addCoverageEffect(effect, 1);
                 drawState->setIdentityViewMatrix();
                 drawState->setRenderTarget(rt);
                 drawState->setColor(0xff000000);
 
                 SkPoint verts[4];
@@ skipping 26 matching lines @@
     SkTLList<SkPath> fPaths;
     SkTLList<SkRect> fRects;
 
     typedef GM INHERITED;
 };
 
 DEF_GM( return SkNEW(ConvexPolyEffect); )
 }
 
 #endif