More changes to bring together path / geo procs

src/gpu/effects/GrBezierEffect.h

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrBezierEffect_DEFINED
 #define GrBezierEffect_DEFINED
 
@@ skipping 74 matching lines @@
                                                   localMatrix));
             default:
                 return NULL;
         }
     }
 
     virtual ~GrConicEffect();
 
     const char* name() const SK_OVERRIDE { return "Conic"; }
 
-    inline const GrAttribute* inPosition() const { return fInPosition; }
-    inline const GrAttribute* inConicCoeffs() const { return fInConicCoeffs; }
+    inline const Attribute* inPosition() const { return fInPosition; }
+    inline const Attribute* inConicCoeffs() const { return fInConicCoeffs; }
     inline bool isAntiAliased() const { return GrProcessorEdgeTypeIsAA(fEdgeType); }
     inline bool isFilled() const { return GrProcessorEdgeTypeIsFill(fEdgeType); }
     inline GrPrimitiveEdgeType getEdgeType() const { return fEdgeType; }
 
     virtual void getGLProcessorKey(const GrBatchTracker& bt,
                                    const GrGLCaps& caps,
                                    GrProcessorKeyBuilder* b) const SK_OVERRIDE;
 
     virtual GrGLPrimitiveProcessor* createGLInstance(const GrBatchTracker& bt,
                                                      const GrGLCaps&) const SK_OVERRIDE;
 
     void initBatchTracker(GrBatchTracker*, const InitBT&) const SK_OVERRIDE;
     bool onCanMakeEqual(const GrBatchTracker&,
                         const GrGeometryProcessor&,
                         const GrBatchTracker&) const SK_OVERRIDE;
 
 private:
     GrConicEffect(GrColor, const SkMatrix& viewMatrix, uint8_t coverage, GrPrimitiveEdgeType,
                   const SkMatrix& localMatrix);
 
     bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE;
 
     void onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const SK_OVERRIDE {
         out->setUnknownSingleComponent();
     }
 
     uint8_t               fCoverageScale;
     GrPrimitiveEdgeType   fEdgeType;
-    const GrAttribute*    fInPosition;
-    const GrAttribute*    fInConicCoeffs;
+    const Attribute*    fInPosition;
+    const Attribute*    fInConicCoeffs;
 
     GR_DECLARE_GEOMETRY_PROCESSOR_TEST;
 
     typedef GrGeometryProcessor INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /**
  * The output of this effect is a hairline edge for quadratics.
  * Quadratic specified by 0=u^2-v canonical coords. u and v are the first
@@ skipping 33 matching lines @@
                                                  localMatrix));
             default:
                 return NULL;
         }
     }
 
     virtual ~GrQuadEffect();
 
     const char* name() const SK_OVERRIDE { return "Quad"; }
 
-    inline const GrAttribute* inPosition() const { return fInPosition; }
-    inline const GrAttribute* inHairQuadEdge() const { return fInHairQuadEdge; }
+    inline const Attribute* inPosition() const { return fInPosition; }
+    inline const Attribute* inHairQuadEdge() const { return fInHairQuadEdge; }
     inline bool isAntiAliased() const { return GrProcessorEdgeTypeIsAA(fEdgeType); }
     inline bool isFilled() const { return GrProcessorEdgeTypeIsFill(fEdgeType); }
     inline GrPrimitiveEdgeType getEdgeType() const { return fEdgeType; }
 
     virtual void getGLProcessorKey(const GrBatchTracker& bt,
                                    const GrGLCaps& caps,
                                    GrProcessorKeyBuilder* b) const SK_OVERRIDE;
 
     virtual GrGLPrimitiveProcessor* createGLInstance(const GrBatchTracker& bt,
                                                      const GrGLCaps&) const SK_OVERRIDE;
 
     void initBatchTracker(GrBatchTracker*, const InitBT&) const SK_OVERRIDE;
     bool onCanMakeEqual(const GrBatchTracker&,
                         const GrGeometryProcessor&,
                         const GrBatchTracker&) const SK_OVERRIDE;
 
 private:
     GrQuadEffect(GrColor, const SkMatrix& viewMatrix, uint8_t coverage, GrPrimitiveEdgeType,
                  const SkMatrix& localMatrix);
 
     bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE;
 
     void onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const SK_OVERRIDE {
         out->setUnknownSingleComponent();
     }
 
     uint8_t               fCoverageScale;
     GrPrimitiveEdgeType   fEdgeType;
-    const GrAttribute*    fInPosition;
-    const GrAttribute*    fInHairQuadEdge;
+    const Attribute*    fInPosition;
+    const Attribute*    fInHairQuadEdge;
 
     GR_DECLARE_GEOMETRY_PROCESSOR_TEST;
 
     typedef GrGeometryProcessor INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 /**
  * Shader is based off of "Resolution Independent Curve Rendering using
  * Programmable Graphics Hardware" by Loop and Blinn.
@@ skipping 29 matching lines @@
                                                   kFillBW_GrProcessorEdgeType));
             default:
                 return NULL;
         }
     }
 
     virtual ~GrCubicEffect();
 
     const char* name() const SK_OVERRIDE { return "Cubic"; }
 
-    inline const GrAttribute* inPosition() const { return fInPosition; }
-    inline const GrAttribute* inCubicCoeffs() const { return fInCubicCoeffs; }
+    inline const Attribute* inPosition() const { return fInPosition; }
+    inline const Attribute* inCubicCoeffs() const { return fInCubicCoeffs; }
     inline bool isAntiAliased() const { return GrProcessorEdgeTypeIsAA(fEdgeType); }
     inline bool isFilled() const { return GrProcessorEdgeTypeIsFill(fEdgeType); }
     inline GrPrimitiveEdgeType getEdgeType() const { return fEdgeType; }
 
     virtual void getGLProcessorKey(const GrBatchTracker& bt,
                                    const GrGLCaps& caps,
                                    GrProcessorKeyBuilder* b) const SK_OVERRIDE;
 
     virtual GrGLPrimitiveProcessor* createGLInstance(const GrBatchTracker& bt,
                                                      const GrGLCaps&) const SK_OVERRIDE;
 
     void initBatchTracker(GrBatchTracker*, const InitBT&) const SK_OVERRIDE;
     bool onCanMakeEqual(const GrBatchTracker&,
                         const GrGeometryProcessor&,
                         const GrBatchTracker&) const SK_OVERRIDE;
 
 private:
     GrCubicEffect(GrColor, const SkMatrix& viewMatrix, GrPrimitiveEdgeType);
 
     bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE;
 
     void onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const SK_OVERRIDE {
         out->setUnknownSingleComponent();
     }
 
     GrPrimitiveEdgeType   fEdgeType;
-    const GrAttribute*    fInPosition;
-    const GrAttribute*    fInCubicCoeffs;
+    const Attribute*    fInPosition;
+    const Attribute*    fInCubicCoeffs;
 
     GR_DECLARE_GEOMETRY_PROCESSOR_TEST;
 
     typedef GrGeometryProcessor INHERITED;
 };
 
 #endif