Make setVertexAttribs in GrDrawState take a stride parameter.

src/gpu/GrAAHairLinePathRenderer.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrAAHairLinePathRenderer.h"
 
 #include "GrContext.h"
@@ skipping 713 matching lines @@
                                               const PtArray& lines,
                                               int lineCnt,
                                               GrDrawTarget::AutoReleaseGeometry* arg,
                                               SkRect* devBounds) {
     GrDrawState* drawState = target->drawState();
 
     const SkMatrix& viewM = drawState->getViewMatrix();
 
     int vertCnt = kVertsPerLineSeg * lineCnt;
 
-    drawState->setVertexAttribs<gHairlineLineAttribs>(SK_ARRAY_COUNT(gHairlineLineAttribs));
-    SkASSERT(sizeof(LineVertex) == drawState->getVertexSize());
+    drawState->setVertexAttribs<gHairlineLineAttribs>(SK_ARRAY_COUNT(gHairlineLineAttribs), sizeof(LineVertex));

[bsalomon, 2014/08/27 17:46:27]

wrap?

[egdaniel, 2014/08/27 18:33:55]

Done.

 
     if (!arg->set(target, vertCnt, 0)) {
         return false;
     }
 
     LineVertex* verts = reinterpret_cast<LineVertex*>(arg->vertices());
 
     const SkMatrix* toSrc = NULL;
     SkMatrix ivm;
 
@@ skipping 25 matching lines @@
                                           const IntArray& qSubdivs,
                                           const FloatArray& cWeights,
                                           GrDrawTarget::AutoReleaseGeometry* arg,
                                           SkRect* devBounds) {
     GrDrawState* drawState = target->drawState();
 
     const SkMatrix& viewM = drawState->getViewMatrix();
 
     int vertCnt = kVertsPerQuad * quadCnt + kVertsPerQuad * conicCnt;
 
-    target->drawState()->setVertexAttribs<gHairlineBezierAttribs>(SK_ARRAY_COUNT(gHairlineBezierAttribs));
-    SkASSERT(sizeof(BezierVertex) == target->getDrawState().getVertexSize());
+    int vAttribCnt = SK_ARRAY_COUNT(gHairlineBezierAttribs);
+    target->drawState()->setVertexAttribs<gHairlineBezierAttribs>(vAttribCnt, sizeof(BezierVertex));
 
     if (!arg->set(target, vertCnt, 0)) {
         return false;
     }
 
     BezierVertex* verts = reinterpret_cast<BezierVertex*>(arg->vertices());
 
     const SkMatrix* toDevice = NULL;
     const SkMatrix* toSrc = NULL;
     SkMatrix ivm;
@@ skipping 240 matching lines @@
                                     &devBounds);
                 conics += n;
             }
         }
     }
 
     target->resetIndexSource();
 
     return true;
 }