Index: src/effects/SkBlurMaskFilter.cpp |
diff --git a/src/effects/SkBlurMaskFilter.cpp b/src/effects/SkBlurMaskFilter.cpp |
index 6a1a857eefb02036c8bdb50aedf5024921a930c3..18ac484a2407a423d4df233bfe103b369049cdb8 100644 |
--- a/src/effects/SkBlurMaskFilter.cpp |
+++ b/src/effects/SkBlurMaskFilter.cpp |
@@ -611,9 +611,6 @@ public: |
const char* name() const override { return "RectBlur"; } |
- virtual void getGLProcessorKey(const GrGLSLCaps& caps, |
- GrProcessorKeyBuilder* b) const override; |
- |
GrGLFragmentProcessor* createGLInstance() const override; |
/** |
@@ -645,6 +642,10 @@ public: |
private: |
GrRectBlurEffect(const SkRect& rect, float sigma, GrTexture *blur_profile); |
+ |
+ virtual void onGetGLProcessorKey(const GrGLSLCaps& caps, |
+ GrProcessorKeyBuilder* b) const override; |
+ |
bool onIsEqual(const GrFragmentProcessor&) const override; |
void onComputeInvariantOutput(GrInvariantOutput* inout) const override; |
@@ -794,7 +795,7 @@ GrRectBlurEffect::GrRectBlurEffect(const SkRect& rect, float sigma, |
GrRectBlurEffect::~GrRectBlurEffect() { |
} |
-void GrRectBlurEffect::getGLProcessorKey(const GrGLSLCaps& caps, |
+void GrRectBlurEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, |
GrProcessorKeyBuilder* b) const { |
GrGLRectBlurEffect::GenKey(*this, caps, b); |
} |
@@ -879,14 +880,14 @@ public: |
const SkRRect& getRRect() const { return fRRect; } |
float getSigma() const { return fSigma; } |
- virtual void getGLProcessorKey(const GrGLSLCaps& caps, |
- GrProcessorKeyBuilder* b) const override; |
- |
GrGLFragmentProcessor* createGLInstance() const override; |
private: |
GrRRectBlurEffect(float sigma, const SkRRect&, GrTexture* profileTexture); |
+ virtual void onGetGLProcessorKey(const GrGLSLCaps& caps, |
+ GrProcessorKeyBuilder* b) const override; |
+ |
bool onIsEqual(const GrFragmentProcessor& other) const override; |
void onComputeInvariantOutput(GrInvariantOutput* inout) const override; |
@@ -1094,7 +1095,7 @@ void GrGLRRectBlurEffect::setData(const GrGLProgramDataManager& pdman, |
pdman.set1f(fCornerRadiusUniform, radius); |
} |
-void GrRRectBlurEffect::getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { |
+void GrRRectBlurEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { |
GrGLRRectBlurEffect::GenKey(*this, caps, b); |
} |