Unify edge type enums across GrEffect subclasses that clip rendering to a geometry.
BUG=skia:
R=egdaniel@google.com, robertphillips@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/183893023
git-svn-id: http://skia.googlecode.com/svn/trunk@13674 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gm/convexpolyeffect.cpp b/gm/convexpolyeffect.cpp
index 9142ca9..ac8ec72 100644
--- a/gm/convexpolyeffect.cpp
+++ b/gm/convexpolyeffect.cpp
@@ -120,7 +120,7 @@
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()) {
@@ -135,11 +135,10 @@
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();
@@ -179,7 +178,7 @@
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()) {
@@ -188,11 +187,10 @@
}
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();