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

gm/beziereffects.cpp

 
 /*
  * Copyright 2013 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 75 matching lines @@
         int row = 0;
         int col = 0;
 
         for (int i = 0; i < kNumCubics; ++i) {
             SkPoint baseControlPts[] = {
                 {rand.nextRangeF(0.f, w), rand.nextRangeF(0.f, h)},
                 {rand.nextRangeF(0.f, w), rand.nextRangeF(0.f, h)},
                 {rand.nextRangeF(0.f, w), rand.nextRangeF(0.f, h)},
                 {rand.nextRangeF(0.f, w), rand.nextRangeF(0.f, h)}
             };
-            for(int edgeType = kFillAA_GrBezierEdgeType; edgeType < 3; ++edgeType) {
+            for(int edgeType = 0; edgeType < kGrEffectEdgeTypeCnt; ++edgeType) {
+                SkAutoTUnref<GrEffectRef> effect;
+                {   // scope to contain GrTestTarget
+                    GrTestTarget tt;
+                    context->getTestTarget(&tt);
+                    if (NULL == tt.target()) {
+                        continue;
+                    }
+                    GrEffectEdgeType et = (GrEffectEdgeType)edgeType;
+                    effect.reset(GrCubicEffect::Create(et, *tt.target()->caps()));
+                    if (!effect) {
+                        continue;
+                    }
+                }
+
                 SkScalar x = SkScalarMul(col, w);
                 SkScalar y = SkScalarMul(row, h);
                 SkPoint controlPts[] = {
                     {x + baseControlPts[0].fX, y + baseControlPts[0].fY},
                     {x + baseControlPts[1].fX, y + baseControlPts[1].fY},
                     {x + baseControlPts[2].fX, y + baseControlPts[2].fY},
                     {x + baseControlPts[3].fX, y + baseControlPts[3].fY}
                 };
                 SkPoint chopped[10];
                 SkScalar klmEqs[9];
@@ skipping 39 matching lines @@
                                                   bounds.fRight, bounds.fBottom,
                                                   sizeof(Vertex));
                     for (int v = 0; v < 4; ++v) {
                         verts[v].fKLM[0] = eval_line(verts[v].fPosition, klmEqs + 0, klmSigns[c]);
                         verts[v].fKLM[1] = eval_line(verts[v].fPosition, klmEqs + 3, klmSigns[c]);
                         verts[v].fKLM[2] = eval_line(verts[v].fPosition, klmEqs + 6, 1.f);
                     }
 
                     GrTestTarget tt;
                     context->getTestTarget(&tt);
-                    if (NULL == tt.target()) {
-                        continue;
-                    }
+                    SkASSERT(NULL != tt.target());
                     GrDrawState* drawState = tt.target()->drawState();
                     drawState->setVertexAttribs<kAttribs>(2);
 
-                    SkAutoTUnref<GrEffectRef> effect(GrCubicEffect::Create(
-                            GrBezierEdgeType(edgeType), *tt.target()->caps()));
-                    if (!effect) {
-                        continue;
-                    }
                     drawState->addCoverageEffect(effect, 1);
                     drawState->setRenderTarget(rt);
                     drawState->setColor(0xff000000);
 
                     tt.target()->setVertexSourceToArray(verts, 4);
                     tt.target()->setIndexSourceToBuffer(context->getQuadIndexBuffer());
                     tt.target()->drawIndexed(kTriangleFan_GrPrimitiveType, 0, 0, 4, 6);
                 }
                 ++col;
                 if (numCols == col) {
@@ skipping 61 matching lines @@
         int row = 0;
         int col = 0;
 
         for (int i = 0; i < kNumConics; ++i) {
             SkPoint baseControlPts[] = {
                 {rand.nextRangeF(0.f, w), rand.nextRangeF(0.f, h)},
                 {rand.nextRangeF(0.f, w), rand.nextRangeF(0.f, h)},
                 {rand.nextRangeF(0.f, w), rand.nextRangeF(0.f, h)}
             };
             SkScalar weight = rand.nextRangeF(0.f, 2.f);
-            for(int edgeType = kFillAA_GrBezierEdgeType; edgeType < 3; ++edgeType) {
+            for(int edgeType = 0; edgeType < kGrEffectEdgeTypeCnt; ++edgeType) {
+                SkAutoTUnref<GrEffectRef> effect;
+                {   // scope to contain GrTestTarget
+                    GrTestTarget tt;
+                    context->getTestTarget(&tt);
+                    if (NULL == tt.target()) {
+                        continue;
+                    }
+                    GrEffectEdgeType et = (GrEffectEdgeType)edgeType;
+                    effect.reset(GrConicEffect::Create(et, *tt.target()->caps()));
+                    if (!effect) {
+                        continue;
+                    }
+                }
+
                 SkScalar x = SkScalarMul(col, w);
                 SkScalar y = SkScalarMul(row, h);
                 SkPoint controlPts[] = {
                     {x + baseControlPts[0].fX, y + baseControlPts[0].fY},
                     {x + baseControlPts[1].fX, y + baseControlPts[1].fY},
                     {x + baseControlPts[2].fX, y + baseControlPts[2].fY}
                 };
                 SkConic dst[4];
                 SkScalar klmEqs[9];
                 int cnt = chop_conic(controlPts, dst, weight);
@@ skipping 36 matching lines @@
                                                   bounds.fRight, bounds.fBottom,
                                                   sizeof(Vertex));
                     for (int v = 0; v < 4; ++v) {
                         verts[v].fKLM[0] = eval_line(verts[v].fPosition, klmEqs + 0, 1.f);
                         verts[v].fKLM[1] = eval_line(verts[v].fPosition, klmEqs + 3, 1.f);
                         verts[v].fKLM[2] = eval_line(verts[v].fPosition, klmEqs + 6, 1.f);
                     }
 
                     GrTestTarget tt;
                     context->getTestTarget(&tt);
-                    if (NULL == tt.target()) {
-                        continue;
-                    }
+                    SkASSERT(NULL != tt.target());
                     GrDrawState* drawState = tt.target()->drawState();
                     drawState->setVertexAttribs<kAttribs>(2);
 
-                    SkAutoTUnref<GrEffectRef> effect(GrConicEffect::Create(
-                            GrBezierEdgeType(edgeType), *tt.target()->caps()));
-                    if (!effect) {
-                        continue;
-                    }
                     drawState->addCoverageEffect(effect, 1);
                     drawState->setRenderTarget(rt);
                     drawState->setColor(0xff000000);
 
                     tt.target()->setVertexSourceToArray(verts, 4);
                     tt.target()->setIndexSourceToBuffer(context->getQuadIndexBuffer());
                     tt.target()->drawIndexed(kTriangleFan_GrPrimitiveType, 0, 0, 4, 6);
                 }
                 ++col;
                 if (numCols == col) {
@@ skipping 95 matching lines @@
         SkScalar h = SkIntToScalar(rt->height()) / numRows;
         int row = 0;
         int col = 0;
 
         for (int i = 0; i < kNumQuads; ++i) {
             SkPoint baseControlPts[] = {
                 {rand.nextRangeF(0.f, w), rand.nextRangeF(0.f, h)},
                 {rand.nextRangeF(0.f, w), rand.nextRangeF(0.f, h)},
                 {rand.nextRangeF(0.f, w), rand.nextRangeF(0.f, h)}
             };
-            for(int edgeType = kFillAA_GrBezierEdgeType; edgeType < 3; ++edgeType) {
+            for(int edgeType = 0; edgeType < kGrEffectEdgeTypeCnt; ++edgeType) {
+                SkAutoTUnref<GrEffectRef> effect;
+                {   // scope to contain GrTestTarget
+                    GrTestTarget tt;
+                    context->getTestTarget(&tt);
+                    if (NULL == tt.target()) {
+                        continue;
+                    }
+                    GrEffectEdgeType et = (GrEffectEdgeType)edgeType;
+                    effect.reset(GrQuadEffect::Create(et, *tt.target()->caps()));
+                    if (!effect) {
+                        continue;
+                    }
+                }
+
                 SkScalar x = SkScalarMul(col, w);
                 SkScalar y = SkScalarMul(row, h);
                 SkPoint controlPts[] = {
                     {x + baseControlPts[0].fX, y + baseControlPts[0].fY},
                     {x + baseControlPts[1].fX, y + baseControlPts[1].fY},
                     {x + baseControlPts[2].fX, y + baseControlPts[2].fY}
                 };
                 SkPoint chopped[5];
                 int cnt = SkChopQuadAtMaxCurvature(controlPts, chopped);
 
@@ skipping 31 matching lines @@
                     Vertex verts[4];
                     verts[0].fPosition.setRectFan(bounds.fLeft, bounds.fTop,
                                                   bounds.fRight, bounds.fBottom,
                                                   sizeof(Vertex));
 
                     GrPathUtils::QuadUVMatrix DevToUV(pts);
                     DevToUV.apply<4, sizeof(Vertex), sizeof(GrPoint)>(verts);
 
                     GrTestTarget tt;
                     context->getTestTarget(&tt);
-                    if (NULL == tt.target()) {
-                        continue;
-                    }
+                    SkASSERT(NULL != tt.target());
                     GrDrawState* drawState = tt.target()->drawState();
                     drawState->setVertexAttribs<kAttribs>(2);
-                    SkAutoTUnref<GrEffectRef> effect(GrQuadEffect::Create(
-                            GrBezierEdgeType(edgeType), *tt.target()->caps()));
-                    if (!effect) {
-                        continue;
-                    }
+
                     drawState->addCoverageEffect(effect, 1);
                     drawState->setRenderTarget(rt);
                     drawState->setColor(0xff000000);
 
                     tt.target()->setVertexSourceToArray(verts, 4);
                     tt.target()->setIndexSourceToBuffer(context->getQuadIndexBuffer());
                     tt.target()->drawIndexed(kTriangles_GrPrimitiveType, 0, 0, 4, 6);
                 }
                 ++col;
                 if (numCols == col) {
                     col = 0;
                     ++row;
                 }
             }
         }
     }
 
 private:
     typedef GM INHERITED;
 };
 
 DEF_GM( return SkNEW(BezierCubicEffects); )
 DEF_GM( return SkNEW(BezierConicEffects); )
 DEF_GM( return SkNEW(BezierQuadEffects); )
 
 }
 
 #endif