More changes to bring together path / geo procs

src/gpu/gl/builders/GrGLProgramBuilder.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrGLProgramBuilder_DEFINED
 #define GrGLProgramBuilder_DEFINED
 
@@ skipping 133 matching lines @@
     virtual void addVarying(const char* name,
                             GrGLVarying*,
                             GrSLPrecision fsPrecision = kDefault_GrSLPrecision) = 0;
 
     /*
      * This call can be used by GP to pass an attribute through all shaders directly to 'output' in
      * the fragment shader.  Though this call effects both the vertex shader and fragment shader,
      * it expects 'output' to be defined in the fragment shader before this call is made.
      * TODO it might be nicer behavior to have a flag to declare output inside this call
      */
-    virtual void addPassThroughAttribute(const GrGeometryProcessor::GrAttribute*,
+    virtual void addPassThroughAttribute(const GrGeometryProcessor::Attribute*,
                                          const char* output) = 0;
 
     // TODO rename getFragmentBuilder
     virtual GrGLGPFragmentBuilder* getFragmentShaderBuilder() = 0;
     virtual GrGLVertexBuilder* getVertexShaderBuilder() = 0;
 
     /*
      * *NOTE* NO MEMBERS ALLOWED, MULTIPLE INHERITANCE
      */
 };
@@ skipping 83 matching lines @@
     GrGLGpu* gpu() const SK_OVERRIDE { return fGpu; }
 
     GrGLFPFragmentBuilder* getFragmentShaderBuilder() SK_OVERRIDE { return &fFS; }
     GrGLVertexBuilder* getVertexShaderBuilder() SK_OVERRIDE { return &fVS; }
 
     void addVarying(
             const char* name,
             GrGLVarying*,
             GrSLPrecision fsPrecision = kDefault_GrSLPrecision) SK_OVERRIDE;
 
-    void addPassThroughAttribute(const GrGeometryProcessor::GrAttribute*,
-                                         const char* output) SK_OVERRIDE;
+    void addPassThroughAttribute(const GrPrimitiveProcessor::Attribute*,
+                                 const char* output) SK_OVERRIDE;
 
 
     // Handles for program uniforms (other than per-effect uniforms)
     struct BuiltinUniformHandles {
         UniformHandle       fRTAdjustmentUni;
 
         // We use the render target height to provide a y-down frag coord when specifying
         // origin_upper_left is not supported.
         UniformHandle       fRTHeightUni;
 
@@ skipping 119 matching lines @@
     UniformInfoArray fUniforms;
     GrGLPrimitiveProcessor::TransformsIn fCoordTransforms;
     GrGLPrimitiveProcessor::TransformsOut fOutCoords;
 
     friend class GrGLShaderBuilder;
     friend class GrGLVertexBuilder;
     friend class GrGLFragmentShaderBuilder;
     friend class GrGLGeometryBuilder;
 };
 #endif