Index: src/gpu/effects/GrBezierEffect.h |
diff --git a/src/gpu/effects/GrBezierEffect.h b/src/gpu/effects/GrBezierEffect.h |
index 27f2fa1aa24ce3d01bce3e77b4a6bce8fdca8cb7..6039f05d35e37b9c035d79f7bed8a0f2f6e9d3a2 100644 |
--- a/src/gpu/effects/GrBezierEffect.h |
+++ b/src/gpu/effects/GrBezierEffect.h |
@@ -86,7 +86,7 @@ public: |
virtual ~GrConicEffect(); |
- static const char* Name() { return "Conic"; } |
+ virtual const char* name() const SK_OVERRIDE { return "Conic"; } |
inline const GrAttribute* inPosition() const { return fInPosition; } |
inline const GrAttribute* inConicCoeffs() const { return fInConicCoeffs; } |
@@ -94,9 +94,16 @@ public: |
inline bool isFilled() const { return GrProcessorEdgeTypeIsFill(fEdgeType); } |
inline GrPrimitiveEdgeType getEdgeType() const { return fEdgeType; } |
- typedef GrGLConicEffect GLProcessor; |
+ virtual void getGLProcessorKey(const GrBatchTracker& bt, |
+ const GrGLCaps& caps, |
+ GrProcessorKeyBuilder* b) const SK_OVERRIDE; |
- virtual const GrBackendGeometryProcessorFactory& getFactory() const SK_OVERRIDE; |
+ virtual GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE; |
+ |
+ virtual uint32_t classID() const { |
+ static uint32_t id = GenClassID(); |
+ return id; |
+ } |
private: |
GrConicEffect(GrPrimitiveEdgeType); |
@@ -157,7 +164,7 @@ public: |
virtual ~GrQuadEffect(); |
- static const char* Name() { return "Quad"; } |
+ virtual const char* name() const SK_OVERRIDE { return "Quad"; } |
inline const GrAttribute* inPosition() const { return fInPosition; } |
inline const GrAttribute* inHairQuadEdge() const { return fInHairQuadEdge; } |
@@ -165,9 +172,16 @@ public: |
inline bool isFilled() const { return GrProcessorEdgeTypeIsFill(fEdgeType); } |
inline GrPrimitiveEdgeType getEdgeType() const { return fEdgeType; } |
- typedef GrGLQuadEffect GLProcessor; |
+ virtual void getGLProcessorKey(const GrBatchTracker& bt, |
+ const GrGLCaps& caps, |
+ GrProcessorKeyBuilder* b) const SK_OVERRIDE; |
+ |
+ virtual GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE; |
- virtual const GrBackendGeometryProcessorFactory& getFactory() const SK_OVERRIDE; |
+ virtual uint32_t classID() const { |
+ static uint32_t id = GenClassID(); |
+ return id; |
+ } |
private: |
GrQuadEffect(GrPrimitiveEdgeType); |
@@ -230,7 +244,7 @@ public: |
virtual ~GrCubicEffect(); |
- static const char* Name() { return "Cubic"; } |
+ virtual const char* name() const SK_OVERRIDE { return "Cubic"; } |
inline const GrAttribute* inPosition() const { return fInPosition; } |
inline const GrAttribute* inCubicCoeffs() const { return fInCubicCoeffs; } |
@@ -238,9 +252,16 @@ public: |
inline bool isFilled() const { return GrProcessorEdgeTypeIsFill(fEdgeType); } |
inline GrPrimitiveEdgeType getEdgeType() const { return fEdgeType; } |
- typedef GrGLCubicEffect GLProcessor; |
+ virtual void getGLProcessorKey(const GrBatchTracker& bt, |
+ const GrGLCaps& caps, |
+ GrProcessorKeyBuilder* b) const SK_OVERRIDE; |
+ |
+ virtual GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE; |
- virtual const GrBackendGeometryProcessorFactory& getFactory() const SK_OVERRIDE; |
+ virtual uint32_t classID() const { |
+ static uint32_t id = GenClassID(); |
+ return id; |
+ } |
private: |
GrCubicEffect(GrPrimitiveEdgeType); |