More changes to bring together path / geo procs

src/gpu/GrGeometryProcessor.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 "GrGeometryProcessor.h"
 
 #include "GrCoordTransform.h"
@@ skipping 101 matching lines @@
         combined.set(SkMatrix::kMTransY,
             combined[SkMatrix::kMPersp2] - combined[SkMatrix::kMTransY]);
     }
     return combined;
 }
 
 void
 GrGLPrimitiveProcessor::setupColorPassThrough(GrGLGPBuilder* pb,
                                               GrGPInput inputType,
                                               const char* outputName,
-                                              const GrGeometryProcessor::GrAttribute* colorAttr,
+                                              const GrGeometryProcessor::Attribute* colorAttr,
                                               UniformHandle* colorUniform) {
     GrGLGPFragmentBuilder* fs = pb->getFragmentShaderBuilder();
     if (kUniform_GrGPInput == inputType) {
         SkASSERT(colorUniform);
         const char* stagedLocalVarName;
         *colorUniform = pb->addUniform(GrGLProgramBuilder::kFragment_Visibility,
                                        kVec4f_GrSLType,
                                        kDefault_GrSLPrecision,
                                        "Color",
                                        &stagedLocalVarName);
@@ skipping 398 matching lines @@
                                                           const GrGLCaps& caps) const {
     SkASSERT(caps.nvprSupport() != GrGLCaps::kNone_NvprSupport);
     if (caps.nvprSupport() == GrGLCaps::kLegacy_NvprSupport) {
         return SkNEW_ARGS(GrGLLegacyPathProcessor, (*this, bt,
                                                     caps.maxFixedFunctionTextureCoords()));
     } else {
         return SkNEW_ARGS(GrGLNormalPathProcessor, (*this, bt));
     }
 }