Index: src/gpu/effects/GrRRectEffect.cpp |
diff --git a/src/gpu/effects/GrRRectEffect.cpp b/src/gpu/effects/GrRRectEffect.cpp |
index c95690ff195e0f1c944e596448658ceb36578d5a..d4b5b6bb8900e9a0a809e2da8726664956cc1550 100644 |
--- a/src/gpu/effects/GrRRectEffect.cpp |
+++ b/src/gpu/effects/GrRRectEffect.cpp |
@@ -49,8 +49,6 @@ public: |
const char* name() const override { return "CircularRRect"; } |
- void getGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; |
- |
GrGLFragmentProcessor* createGLInstance() const override; |
const SkRRect& getRRect() const { return fRRect; } |
@@ -62,6 +60,8 @@ public: |
private: |
CircularRRectEffect(GrPrimitiveEdgeType, uint32_t circularCornerFlags, const SkRRect&); |
+ void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; |
+ |
bool onIsEqual(const GrFragmentProcessor& other) const override; |
void onComputeInvariantOutput(GrInvariantOutput* inout) const override; |
@@ -361,7 +361,7 @@ void GLCircularRRectEffect::setData(const GrGLProgramDataManager& pdman, |
//////////////////////////////////////////////////////////////////////////////////////////////////// |
-void CircularRRectEffect::getGLProcessorKey(const GrGLSLCaps& caps, |
+void CircularRRectEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, |
GrProcessorKeyBuilder* b) const { |
GLCircularRRectEffect::GenKey(*this, caps, b); |
} |
@@ -380,8 +380,6 @@ public: |
const char* name() const override { return "EllipticalRRect"; } |
- void getGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; |
- |
GrGLFragmentProcessor* createGLInstance() const override; |
const SkRRect& getRRect() const { return fRRect; } |
@@ -391,6 +389,8 @@ public: |
private: |
EllipticalRRectEffect(GrPrimitiveEdgeType, const SkRRect&); |
+ void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; |
+ |
bool onIsEqual(const GrFragmentProcessor& other) const override; |
void onComputeInvariantOutput(GrInvariantOutput* inout) const override; |
@@ -607,7 +607,7 @@ void GLEllipticalRRectEffect::setData(const GrGLProgramDataManager& pdman, |
//////////////////////////////////////////////////////////////////////////////////////////////////// |
-void EllipticalRRectEffect::getGLProcessorKey(const GrGLSLCaps& caps, |
+void EllipticalRRectEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, |
GrProcessorKeyBuilder* b) const { |
GLEllipticalRRectEffect::GenKey(*this, caps, b); |
} |