Revert of Make setVertexAttribs in GrDrawState take a stride parameter.

src/gpu/GrRODrawState.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 "GrRODrawState.h"
 #include "GrDrawTargetCaps.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 
 bool GrRODrawState::isEqual(const GrRODrawState& that) const {
     bool usingVertexColors = this->hasColorVertexAttribute();
     if (!usingVertexColors && this->fColor != that.fColor) {
         return false;
     }
 
     if (this->fRenderTarget.get() != that.fRenderTarget.get() ||
         this->fColorStages.count() != that.fColorStages.count() ||
         this->fCoverageStages.count() != that.fCoverageStages.count() ||
         !this->fViewMatrix.cheapEqualTo(that.fViewMatrix) ||
         this->fSrcBlend != that.fSrcBlend ||
         this->fDstBlend != that.fDstBlend ||
         this->fBlendConstant != that.fBlendConstant ||
         this->fFlagBits != that.fFlagBits ||
         this->fVACount != that.fVACount ||
-        this->fVAStride != that.fVAStride ||
         memcmp(this->fVAPtr, that.fVAPtr, this->fVACount * sizeof(GrVertexAttrib)) ||
         this->fStencilSettings != that.fStencilSettings ||
         this->fDrawFace != that.fDrawFace) {
         return false;
     }
 
     bool usingVertexCoverage = this->hasCoverageVertexAttribute();
     if (!usingVertexCoverage && this->fCoverage != that.fCoverage) {
         return false;
     }
 
     bool explicitLocalCoords = this->hasLocalCoordAttribute();
     for (int i = 0; i < this->numColorStages(); i++) {
         if (!GrEffectStage::AreCompatible(this->getColorStage(i), that.getColorStage(i),
                                           explicitLocalCoords)) {
             return false;
         }
     }
     for (int i = 0; i < this->numCoverageStages(); i++) {
         if (!GrEffectStage::AreCompatible(this->getCoverageStage(i), that.getCoverageStage(i),
                                           explicitLocalCoords)) {
             return false;
         }
     }
 
+    SkASSERT(this->fVertexSize == that.fVertexSize);
     SkASSERT(0 == memcmp(this->fFixedFunctionVertexAttribIndices,
                             that.fFixedFunctionVertexAttribIndices,
                             sizeof(this->fFixedFunctionVertexAttribIndices)));
 
     return true;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 bool GrRODrawState::validateVertexAttribs() const {
@@ skipping 94 matching lines @@
      find that only 1, ISA, and ISC produce the correct destination when applied to S' and D.
      Also, if we're directly rendering coverage (isCoverageDrawing) then coverage is treated as
      color by definition.
      */
     return kOne_GrBlendCoeff == fDstBlend ||
            kISA_GrBlendCoeff == fDstBlend ||
            kISC_GrBlendCoeff == fDstBlend ||
            this->isCoverageDrawing();
 }