| Index: src/gpu/effects/GrMatrixConvolutionEffect.cpp
|
| diff --git a/src/gpu/effects/GrMatrixConvolutionEffect.cpp b/src/gpu/effects/GrMatrixConvolutionEffect.cpp
|
| index 625a3e9dab7bc22a9a8ea78f7e33f193835f2640..3da4c54ab072c618a42c956ad9aa1b4f2352c94f 100644
|
| --- a/src/gpu/effects/GrMatrixConvolutionEffect.cpp
|
| +++ b/src/gpu/effects/GrMatrixConvolutionEffect.cpp
|
| @@ -16,7 +16,8 @@ public:
|
|
|
| static inline void GenKey(const GrProcessor&, const GrGLSLCaps&, GrProcessorKeyBuilder*);
|
|
|
| - void setData(const GrGLProgramDataManager&, const GrProcessor&) override;
|
| +protected:
|
| + void onSetData(const GrGLProgramDataManager&, const GrProcessor&) override;
|
|
|
| private:
|
| typedef GrGLProgramDataManager::UniformHandle UniformHandle;
|
| @@ -110,7 +111,7 @@ void GrGLMatrixConvolutionEffect::GenKey(const GrProcessor& processor,
|
| b->add32(GrTextureDomain::GLDomain::DomainKey(m.domain()));
|
| }
|
|
|
| -void GrGLMatrixConvolutionEffect::setData(const GrGLProgramDataManager& pdman,
|
| +void GrGLMatrixConvolutionEffect::onSetData(const GrGLProgramDataManager& pdman,
|
| const GrProcessor& processor) {
|
| const GrMatrixConvolutionEffect& conv = processor.cast<GrMatrixConvolutionEffect>();
|
| GrTexture& texture = *conv.texture(0);
|
| @@ -160,7 +161,7 @@ void GrMatrixConvolutionEffect::onGetGLProcessorKey(const GrGLSLCaps& caps,
|
| GrGLMatrixConvolutionEffect::GenKey(*this, caps, b);
|
| }
|
|
|
| -GrGLFragmentProcessor* GrMatrixConvolutionEffect::createGLInstance() const {
|
| +GrGLFragmentProcessor* GrMatrixConvolutionEffect::onCreateGLInstance() const {
|
| return SkNEW_ARGS(GrGLMatrixConvolutionEffect, (*this));
|
| }
|
|
|
|
|