commit ec7efdf4440ba658198a5fbde3d6a422f014a37e
author commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Aug 23 21:01:52 2013 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Aug 23 21:01:52 2013 +0000
tree 820f2cb08511a99a6917404526ba0eef3a693842
parent 96be867647c3376115cce7d271e9384bc9de6617

Only assert that conic/quad effects get created if they are to be used.

R=jvanverth@google.com

Author: bsalomon@google.com

Review URL: https://chromiumcodereview.appspot.com/22891023

git-svn-id: http://skia.googlecode.com/svn/trunk/src@10900 2bbb7eff-a529-9590-31e7-b0007b416f81

gpu/GrAAHairLinePathRenderer.cpp

diff --git a/gpu/GrAAHairLinePathRenderer.cpp b/gpu/GrAAHairLinePathRenderer.cpp
index fe41919..e4ee8a8 100644
--- a/gpu/GrAAHairLinePathRenderer.cpp
+++ b/gpu/GrAAHairLinePathRenderer.cpp
@@ -956,21 +956,18 @@
 
         static const int kEdgeAttrIndex = 1;
 
-        GrEffectRef* hairQuadEffect = GrQuadEffect::Create(kHairAA_GrBezierEdgeType,
-                                                           *target->caps());
-        GrEffectRef* hairConicEffect = GrConicEffect::Create(kHairAA_GrBezierEdgeType,
-                                                             *target->caps());
-        SkASSERT(hairQuadEffect && hairConicEffect);
-
         // Check devBounds
         SkASSERT(check_bounds<BezierVertex>(drawState, devBounds, arg.vertices(),
                                             kVertsPerQuad * quadCnt + kVertsPerQuad * conicCnt));
 
-        {
+        if (quadCnt > 0) {
+            GrEffectRef* hairQuadEffect = GrQuadEffect::Create(kHairAA_GrBezierEdgeType,
+                                                               *target->caps());
+            SkASSERT(NULL != hairQuadEffect);
             GrDrawState::AutoRestoreEffects are(drawState);
             target->setIndexSourceToBuffer(fQuadsIndexBuffer);
-            int quads = 0;
             drawState->addCoverageEffect(hairQuadEffect, kEdgeAttrIndex)->unref();
+            int quads = 0;
             while (quads < quadCnt) {
                 int n = GrMin(quadCnt - quads, kNumQuadsInIdxBuffer);
                 target->drawIndexed(kTriangles_GrPrimitiveType,
@@ -983,10 +980,13 @@
             }
         }
 
-        {
+        if (conicCnt > 0) {
             GrDrawState::AutoRestoreEffects are(drawState);
-            int conics = 0;
+            GrEffectRef* hairConicEffect = GrConicEffect::Create(kHairAA_GrBezierEdgeType,
+                                                                 *target->caps());
+            SkASSERT(NULL != hairConicEffect);
             drawState->addCoverageEffect(hairConicEffect, 1, 2)->unref();
+            int conics = 0;
             while (conics < conicCnt) {
                 int n = GrMin(conicCnt - conics, kNumQuadsInIdxBuffer);
                 target->drawIndexed(kTriangles_GrPrimitiveType,