Reject dashes from GrAADFR

src/gpu/batches/GrAADistanceFieldPathRenderer.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.
  */
 
 #include "GrAADistanceFieldPathRenderer.h"
 
@@ skipping 91 matching lines @@
     const SkRect& bounds = args.fPath->getBounds();
     SkScalar maxDim = SkMaxScalar(bounds.width(), bounds.height());
     // Approximate stroked size by adding the maximum of the stroke width or 2x the miter limit
     if (!args.fStroke->isFillStyle()) {
         SkScalar extraWidth = args.fStroke->getWidth();
         if (SkPaint::kMiter_Join == args.fStroke->getJoin()) {
             extraWidth = SkTMax(extraWidth, 2.0f*args.fStroke->getMiter());
         }
         maxDim += extraWidth;
     }
-    
+
+    // We don't currently apply the dash or factor it into the DF key.
+    if (args.fStroke->isDashed()) {

[egdaniel, 2016/03/11 01:00:52]

any reason not to move this check up earlier to avoid doing some unnecessary
work?

[jvanverth1, 2016/03/11 13:49:40]

The first conditional block seems like a good place to put it.

+        return false;
+    }
+
     return maxDim <= kMediumMIP && maxDim * maxScale <= 2.0f*kLargeMIP;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 // padding around path bounds to allow for antialiased pixels
 static const SkScalar kAntiAliasPad = 1.0f;
 
 class AADistanceFieldPathBatch : public GrVertexBatch {
 public:
@@ skipping 522 matching lines @@
     geometry.fAntiAlias = random->nextBool();
     geometry.fGenID = random->nextU();
 
     return AADistanceFieldPathBatch::Create(geometry, viewMatrix,
                                             gTestStruct.fAtlas,
                                             &gTestStruct.fPathCache,
                                             &gTestStruct.fPathList);
 }
 
 #endif