Use fixed function pipeline only when drawing paths

src/gpu/gl/GrGpuGL_program.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 "GrGpuGL.h"
 
 #include "GrEffect.h"
@@ skipping 215 matching lines @@
         GrBlendCoeff dstCoeff;
         GrDrawState::BlendOptFlags blendOpts = drawState.getBlendOpts(false, &srcCoeff, &dstCoeff);
         if (GrDrawState::kSkipDraw_BlendOptFlag & blendOpts) {
             return false;
         }
 
         SkSTArray<8, const GrEffectStage*, true> colorStages;
         SkSTArray<8, const GrEffectStage*, true> coverageStages;
         GrGLProgramDesc desc;
         GrGLProgramDesc::Build(this->getDrawState(),
-                               kDrawPoints_DrawType == type,
+                               type,
                                blendOpts,
                                srcCoeff,
                                dstCoeff,
                                this,
                                dstCopy,
                                &colorStages,
                                &coverageStages,
                                &desc);
 
         fCurrentProgram.reset(fProgramCache->getProgram(desc,
@@ skipping 89 matching lines @@
             GrCrash("Unknown geometry src type!");
         }
 
         SkASSERT(NULL != ibuf);
         SkASSERT(!ibuf->isLocked());
         *indexOffsetInBytes += ibuf->baseOffset();
     }
     GrGLAttribArrayState* attribState =
         fHWGeometryState.bindArrayAndBuffersToDraw(this, vbuf, ibuf);
 
-    if (!fCurrentProgram->hasVertexShader()) {
-        int posIdx = this->getDrawState().positionAttributeIndex();
-        const GrVertexAttrib* vertexAttrib = this->getDrawState().getVertexAttribs() + posIdx;
-        GrVertexAttribType attribType = vertexAttrib->fType;
-        SkASSERT(!GrGLAttribTypeToLayout(attribType).fNormalized);
-        SkASSERT(GrGLAttribTypeToLayout(attribType).fCount == 2);
-
-        // Attrib at location 0 is defined to be bound to vertex in fixed-function pipe.  Asserts
-        // above should make sure position attribute goes to location 0 when below code is executed.
-
-        attribState->set(this,
-                         0,
-                         vbuf,
-                         GrGLAttribTypeToLayout(attribType).fCount,
-                         GrGLAttribTypeToLayout(attribType).fType,
-                         GrGLAttribTypeToLayout(attribType).fNormalized,
-                         stride,
-                         reinterpret_cast<GrGLvoid*>(
-                             vertexOffsetInBytes + vertexAttrib->fOffset));
-        attribState->disableUnusedArrays(this, 1);
-    } else {
+    if (fCurrentProgram->hasVertexShader()) {
         int vertexAttribCount = this->getDrawState().getVertexAttribCount();
         uint32_t usedAttribArraysMask = 0;
         const GrVertexAttrib* vertexAttrib = this->getDrawState().getVertexAttribs();
 
         for (int vertexAttribIndex = 0; vertexAttribIndex < vertexAttribCount;
              ++vertexAttribIndex, ++vertexAttrib) {
 
             usedAttribArraysMask |= (1 << vertexAttribIndex);
             GrVertexAttribType attribType = vertexAttrib->fType;
             attribState->set(this,
                              vertexAttribIndex,
                              vbuf,
                              GrGLAttribTypeToLayout(attribType).fCount,
                              GrGLAttribTypeToLayout(attribType).fType,
                              GrGLAttribTypeToLayout(attribType).fNormalized,
                              stride,
                              reinterpret_cast<GrGLvoid*>(
                                  vertexOffsetInBytes + vertexAttrib->fOffset));
         }
         attribState->disableUnusedArrays(this, usedAttribArraysMask);
     }
 }