Revert of Make setVertexAttribs in GrDrawState take a stride parameter.

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 150 matching lines @@
                     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);
                     SkASSERT(NULL != tt.target());
                     GrDrawState* drawState = tt.target()->drawState();
-                    drawState->setVertexAttribs<kAttribs>(2, sizeof(Vertex));
+                    drawState->setVertexAttribs<kAttribs>(2);
 
                     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;
@@ skipping 134 matching lines @@
                     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);
                     SkASSERT(NULL != tt.target());
                     GrDrawState* drawState = tt.target()->drawState();
-                    drawState->setVertexAttribs<kAttribs>(2, sizeof(Vertex));
+                    drawState->setVertexAttribs<kAttribs>(2);
 
                     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;
@@ skipping 163 matching lines @@
                                                   bounds.fRight, bounds.fBottom,
                                                   sizeof(Vertex));
 
                     GrPathUtils::QuadUVMatrix DevToUV(pts);
                     DevToUV.apply<4, sizeof(Vertex), sizeof(SkPoint)>(verts);
 
                     GrTestTarget tt;
                     context->getTestTarget(&tt);
                     SkASSERT(NULL != tt.target());
                     GrDrawState* drawState = tt.target()->drawState();
-                    drawState->setVertexAttribs<kAttribs>(2, sizeof(Vertex));
+                    drawState->setVertexAttribs<kAttribs>(2);
 
                     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