Start trying to collapse path program stuff

src/gpu/gl/GrGLGeometryProcessor.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 "GrGLGeometryProcessor.h"
 
 #include "builders/GrGLProgramBuilder.h"
@@ skipping 29 matching lines @@
             }
             varyingType = SkToBool(SkMatrix::kPerspective_Mask & type) ? kVec3f_GrSLType :
                                                                          kVec2f_GrSLType;
             GrSLPrecision precision = coordTransforms[t]->precision();
 
             const char* uniName;
             fInstalledTransforms[i][t].fHandle =
                     pb->addUniform(GrGLProgramBuilder::kVertex_Visibility,
                                    kMat33f_GrSLType, precision,
                                    strUniName.c_str(),
-                                   &uniName).toShaderBuilderIndex();
+                                   &uniName).toIndex();
 
             SkString strVaryingName("MatrixCoord");
             strVaryingName.appendf("_%i_%i", i, t);
 
             GrGLVertToFrag v(varyingType);
             pb->addVarying(strVaryingName.c_str(), &v, precision);
 
             SkASSERT(kVec2f_GrSLType == varyingType || kVec3f_GrSLType == varyingType);
             SkNEW_APPEND_TO_TARRAY(&(*tout)[i], GrGLProcessor::TransformedCoords,
                                    (SkString(v.fsIn()), varyingType));
@@ skipping 84 matching lines @@
             gpArgs->fPositionVar.set(kVec2f_GrSLType, "pos2");
             vsBuilder->codeAppendf("vec2 %s = vec2(%s * vec3(%s, 1));",
                                    gpArgs->fPositionVar.c_str(), viewMatrixName, posName);
         } else {
             gpArgs->fPositionVar.set(kVec3f_GrSLType, "pos3");
             vsBuilder->codeAppendf("vec3 %s = %s * vec3(%s, 1);",
                                    gpArgs->fPositionVar.c_str(), viewMatrixName, posName);
         }
     }
 }