Index: src/gpu/effects/GrOvalEffect.cpp |
diff --git a/src/gpu/effects/GrOvalEffect.cpp b/src/gpu/effects/GrOvalEffect.cpp |
index 729e8a599c7bb8253813b935bac23082c20f89c5..88ca11a92d2237c91522a830584bba9be95c98ed 100644 |
--- a/src/gpu/effects/GrOvalEffect.cpp |
+++ b/src/gpu/effects/GrOvalEffect.cpp |
@@ -23,8 +23,6 @@ public: |
const char* name() const override { return "Circle"; } |
- void getGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; |
- |
GrGLFragmentProcessor* createGLInstance() const override; |
const SkPoint& getCenter() const { return fCenter; } |
@@ -35,6 +33,8 @@ public: |
private: |
CircleEffect(GrPrimitiveEdgeType, const SkPoint& center, SkScalar radius); |
+ void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; |
+ |
bool onIsEqual(const GrFragmentProcessor&) const override; |
void onComputeInvariantOutput(GrInvariantOutput* inout) const override; |
@@ -170,7 +170,7 @@ void GLCircleEffect::setData(const GrGLProgramDataManager& pdman, const GrProces |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
-void CircleEffect::getGLProcessorKey(const GrGLSLCaps& caps, |
+void CircleEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, |
GrProcessorKeyBuilder* b) const { |
GLCircleEffect::GenKey(*this, caps, b); |
} |
@@ -190,8 +190,6 @@ public: |
const char* name() const override { return "Ellipse"; } |
- void getGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; |
- |
GrGLFragmentProcessor* createGLInstance() const override; |
const SkPoint& getCenter() const { return fCenter; } |
@@ -202,6 +200,8 @@ public: |
private: |
EllipseEffect(GrPrimitiveEdgeType, const SkPoint& center, SkScalar rx, SkScalar ry); |
+ void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; |
+ |
bool onIsEqual(const GrFragmentProcessor&) const override; |
void onComputeInvariantOutput(GrInvariantOutput* inout) const override; |
@@ -344,7 +344,7 @@ void GLEllipseEffect::setData(const GrGLProgramDataManager& pdman, const GrProce |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
-void EllipseEffect::getGLProcessorKey(const GrGLSLCaps& caps, |
+void EllipseEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, |
GrProcessorKeyBuilder* b) const { |
GLEllipseEffect::GenKey(*this, caps, b); |
} |