Index: src/effects/SkAlphaThresholdFilter.cpp |
diff --git a/src/effects/SkAlphaThresholdFilter.cpp b/src/effects/SkAlphaThresholdFilter.cpp |
index fd7e5c35aef10f4b2f4d0d97910074410b3c3cdc..e55376d5218a95679a562bd301a3d905d75a25bd 100644 |
--- a/src/effects/SkAlphaThresholdFilter.cpp |
+++ b/src/effects/SkAlphaThresholdFilter.cpp |
@@ -81,8 +81,6 @@ public: |
float innerThreshold() const { return fInnerThreshold; } |
float outerThreshold() const { return fOuterThreshold; } |
- GrGLFragmentProcessor* createGLInstance() const override; |
- |
private: |
AlphaThresholdEffect(GrProcessorDataManager*, |
GrTexture* texture, |
@@ -106,6 +104,8 @@ private: |
this->addTextureAccess(&fMaskTextureAccess); |
} |
+ GrGLFragmentProcessor* onCreateGLInstance() const override; |
+ |
void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; |
bool onIsEqual(const GrFragmentProcessor&) const override; |
@@ -130,7 +130,8 @@ public: |
virtual void emitCode(EmitArgs&) override; |
- void setData(const GrGLProgramDataManager&, const GrProcessor&) override; |
+protected: |
+ void onSetData(const GrGLProgramDataManager&, const GrProcessor&) override; |
private: |
@@ -186,7 +187,7 @@ void GrGLAlphaThresholdEffect::emitCode(EmitArgs& args) { |
(GrGLSLExpr4(args.fInputColor) * GrGLSLExpr4("color")).c_str()); |
} |
-void GrGLAlphaThresholdEffect::setData(const GrGLProgramDataManager& pdman, |
+void GrGLAlphaThresholdEffect::onSetData(const GrGLProgramDataManager& pdman, |
const GrProcessor& proc) { |
const AlphaThresholdEffect& alpha_threshold = proc.cast<AlphaThresholdEffect>(); |
pdman.set1f(fInnerThresholdVar, alpha_threshold.innerThreshold()); |
@@ -213,7 +214,7 @@ void AlphaThresholdEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, |
GrGLAlphaThresholdEffect::GenKey(*this, caps, b); |
} |
-GrGLFragmentProcessor* AlphaThresholdEffect::createGLInstance() const { |
+GrGLFragmentProcessor* AlphaThresholdEffect::onCreateGLInstance() const { |
return SkNEW_ARGS(GrGLAlphaThresholdEffect, (*this)); |
} |