More changes to bring together path / geo procs

src/gpu/gl/GrGLGpu.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 "GrGLGpu.h"
 #include "GrGLStencilBuffer.h"
@@ skipping 1390 matching lines @@
         *indexOffsetInBytes = 0;
         ibuf = (GrGLIndexBuffer*)info.indexBuffer();
 
         SkASSERT(ibuf);
         SkASSERT(!ibuf->isMapped());
         *indexOffsetInBytes += ibuf->baseOffset();
     }
     GrGLAttribArrayState* attribState =
         fHWGeometryState.bindArrayAndBuffersToDraw(this, vbuf, ibuf);
 
-    if (fCurrentProgram->hasVertexShader()) {
-        const GrGeometryProcessor* gp = optState.getGeometryProcessor();
+    const GrPrimitiveProcessor* primProc = optState.getPrimitiveProcessor();
+    int vaCount = primProc->numAttribs();
+    if (vaCount > 0) {
 
-        GrGLsizei stride = static_cast<GrGLsizei>(gp->getVertexStride());
+        GrGLsizei stride = static_cast<GrGLsizei>(primProc->getVertexStride());
 
         size_t vertexOffsetInBytes = stride * info.startVertex();
 
         vertexOffsetInBytes += vbuf->baseOffset();
 
-        const SkTArray<GrGeometryProcessor::GrAttribute, true>& attribs = gp->getAttribs();
-        int vaCount = attribs.count();
         uint32_t usedAttribArraysMask = 0;
         size_t offset = 0;
 
         for (int attribIndex = 0; attribIndex < vaCount; attribIndex++) {
+            const GrGeometryProcessor::Attribute& attrib = primProc->getAttrib(attribIndex);
             usedAttribArraysMask |= (1 << attribIndex);
-            GrVertexAttribType attribType = attribs[attribIndex].fType;
+            GrVertexAttribType attribType = attrib.fType;
             attribState->set(this,
                              attribIndex,
                              vbuf,
                              GrGLAttribTypeToLayout(attribType).fCount,
                              GrGLAttribTypeToLayout(attribType).fType,
                              GrGLAttribTypeToLayout(attribType).fNormalized,
                              stride,
                              reinterpret_cast<GrGLvoid*>(vertexOffsetInBytes + offset));
-            offset += attribs[attribIndex].fOffset;
+            offset += attrib.fOffset;
         }
         attribState->disableUnusedArrays(this, usedAttribArraysMask);
     }
 }
 
 void GrGLGpu::buildProgramDesc(const GrOptDrawState& optState,
                                const GrProgramDesc::DescInfo& descInfo,
                                GrGpu::DrawType drawType,
                                GrProgramDesc* desc) {
     if (!GrGLProgramDescBuilder::Build(optState, descInfo, drawType, this, desc)) {
@@ skipping 1303 matching lines @@
             this->setVertexArrayID(gpu, 0);
         }
         int attrCount = gpu->glCaps().maxVertexAttributes();
         if (fDefaultVertexArrayAttribState.count() != attrCount) {
             fDefaultVertexArrayAttribState.resize(attrCount);
         }
         attribState = &fDefaultVertexArrayAttribState;
     }
     return attribState;
 }