First step to moving vertex attributes to the geometryProcessor

src/gpu/GrDrawTarget.cpp

 
 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 
@@ skipping 357 matching lines @@
     }
     for (int s = 0; s < drawState.numCoverageStages(); ++s) {
         const GrProcessor* effect = drawState.getCoverageStage(s).getProcessor();
         int numTextures = effect->numTextures();
         for (int t = 0; t < numTextures; ++t) {
             GrTexture* texture = effect->texture(t);
             SkASSERT(texture->asRenderTarget() != drawState.getRenderTarget());
         }
     }
 
-    SkASSERT(drawState.validateVertexAttribs());
 #endif
     if (NULL == drawState.getRenderTarget()) {
         return false;
     }
     return true;
 }
 
 bool GrDrawTarget::setupDstReadIfNecessary(GrDrawState* ds,
                                            GrDeviceCoordTexture* dstCopy,
                                            const SkRect* drawBounds) {
@@ skipping 76 matching lines @@
 
         if (devBounds) {
             info.setDevBounds(*devBounds);
         }
 
         // TODO: We should continue with incorrect blending.
         GrDeviceCoordTexture dstCopy;
         if (!this->setupDstReadIfNecessary(ds, &dstCopy, devBounds)) {
             return;
         }
-        this->setDrawBuffers(&info, ds->getVertexStride());
+        this->setDrawBuffers(&info, ds->getGeometryProcessor()->getVertexStride());
 
         this->onDraw(*ds, info, scissorState, dstCopy.texture() ? &dstCopy : NULL);
     }
 }
 
 void GrDrawTarget::drawNonIndexed(GrDrawState* ds,
                                   GrPrimitiveType type,
                                   int startVertex,
                                   int vertexCount,
                                   const SkRect* devBounds) {
@@ skipping 22 matching lines @@
         if (devBounds) {
             info.setDevBounds(*devBounds);
         }
 
         // TODO: We should continue with incorrect blending.
         GrDeviceCoordTexture dstCopy;
         if (!this->setupDstReadIfNecessary(ds, &dstCopy, devBounds)) {
             return;
         }
 
-        this->setDrawBuffers(&info, ds->getVertexStride());
+        this->setDrawBuffers(&info, ds->getGeometryProcessor()->getVertexStride());
 
         this->onDraw(*ds, info, scissorState, dstCopy.texture() ? &dstCopy : NULL);
     }
 }
 
 static const GrStencilSettings& winding_path_stencil_settings() {
     GR_STATIC_CONST_SAME_STENCIL_STRUCT(gSettings,
         kIncClamp_StencilOp,
         kIncClamp_StencilOp,
         kAlwaysIfInClip_StencilFunc,
@@ skipping 243 matching lines @@
         info.fInstanceCount = SkTMin(instanceCount, maxInstancesPerDraw);
         info.fVertexCount = info.fInstanceCount * verticesPerInstance;
         info.fIndexCount = info.fInstanceCount * indicesPerInstance;
 
         if (this->checkDraw(*ds,
                             type,
                             info.fStartVertex,
                             info.fStartIndex,
                             info.fVertexCount,
                             info.fIndexCount)) {
-            this->setDrawBuffers(&info, ds->getVertexStride());
+            this->setDrawBuffers(&info, ds->getGeometryProcessor()->getVertexStride());
             this->onDraw(*ds, info, scissorState, dstCopy.texture() ? &dstCopy : NULL);
         }
         info.fStartVertex += info.fVertexCount;
         instanceCount -= info.fInstanceCount;
     }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 GrDrawTarget::AutoReleaseGeometry::AutoReleaseGeometry(
@@ skipping 365 matching lines @@
                              GrDrawState::AutoRestoreStencil* ars,
                              GrDrawState* ds,
                              GrClipMaskManager::ScissorState* scissorState) {
     return fClipMaskManager.setupClipping(ds,
                                           are,
                                           ars,
                                           scissorState,
                                           this->getClip(),
                                           devBounds);
 }