Plumb OptDrawState down to VertexShaderBuilder

src/gpu/gl/builders/GrGLVertexShaderBuilder.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 "GrGLVertexShaderBuilder.h"
 #include "GrGLFullProgramBuilder.h"
 #include "GrGLShaderStringBuilder.h"
@@ skipping 39 matching lines @@
     fOutputs.back().setType(type);
     fOutputs.back().setTypeModifier(GrGLShaderVar::kVaryingOut_TypeModifier);
     fProgramBuilder->nameVariable(fOutputs.back().accessName(), 'v', name);
 
     if (vsOutName) {
         *vsOutName = fOutputs.back().getName().c_str();
     }
 }
 
 
-void GrGLVertexShaderBuilder::bindProgramLocations(GrGLuint programId) {
+void GrGLVertexShaderBuilder::bindProgramLocations(const GrOptDrawState& optState,
+                                                   GrGLuint programId) {
     const GrGLProgramDesc::KeyHeader& header = fProgramBuilder->desc().getHeader();
     GrGpuGL* gpu = fProgramBuilder->gpu();
 
     // Bind the attrib locations to same values for all shaders
     SkASSERT(-1 != header.fPositionAttributeIndex);
     GL_CALL(BindAttribLocation(programId,
                                header.fPositionAttributeIndex,
                                fPositionVar->c_str()));
     if (-1 != header.fLocalCoordAttributeIndex) {
         GL_CALL(BindAttribLocation(programId,
                                    header.fLocalCoordAttributeIndex,
                                    fLocalCoordsVar->c_str()));
     }
     if (-1 != header.fColorAttributeIndex) {
         GL_CALL(BindAttribLocation(programId,
                                    header.fColorAttributeIndex,
                                    color_attribute_name()));
     }
     if (-1 != header.fCoverageAttributeIndex) {
         GL_CALL(BindAttribLocation(programId,
                                    header.fCoverageAttributeIndex,
                                    coverage_attribute_name()));
     }
 
-    // We pull the current state of attributes off of drawstate's optimized state and bind them in
-    // order. This assumes that the drawState has not changed since we called flushGraphicsState()
-    // higher up in the stack.
-    const GrDrawTargetCaps* caps = fProgramBuilder->gpu()->caps();
-    const GrDrawState& drawState = *fProgramBuilder->gpu()->drawState();
-    SkAutoTUnref<GrOptDrawState> optState(drawState.createOptState(*caps));
-    const GrVertexAttrib* vaPtr = optState->getVertexAttribs();
-    const int vaCount = optState->getVertexAttribCount();
+    const GrVertexAttrib* vaPtr = optState.getVertexAttribs();
+    const int vaCount = optState.getVertexAttribCount();
 
     int i = fEffectAttribOffset;
     for (int index = 0; index < vaCount; index++) {
         if (kGeometryProcessor_GrVertexAttribBinding != vaPtr[index].fBinding) {
             continue;
         }
         SkASSERT(index != header.fPositionAttributeIndex &&
                  index != header.fLocalCoordAttributeIndex &&
                  index != header.fColorAttributeIndex &&
                  index != header.fCoverageAttributeIndex);
@@ skipping 90 matching lines @@
         this->addAttribute(GrShaderVar(coverage_attribute_name(),
                                        kVec4f_GrSLType,
                                        GrShaderVar::kAttribute_TypeModifier));
         const char *vsName, *fsName;
         fFullProgramBuilder->addVarying(kVec4f_GrSLType, "Coverage", &vsName, &fsName);
         this->codeAppendf("%s = %s;", vsName, coverage_attribute_name());
         *coverage = fsName;
     }
     fEffectAttribOffset = fInputs.count();
 }