| Index: src/effects/SkColorFilters.cpp
|
| diff --git a/src/effects/SkColorFilters.cpp b/src/effects/SkColorFilters.cpp
|
| index bda3d9ad880f283e4b3ae89be78d6e08bb470da6..af3e38b02ae301610ca390aa6b52d0a042a548f9 100644
|
| --- a/src/effects/SkColorFilters.cpp
|
| +++ b/src/effects/SkColorFilters.cpp
|
| @@ -147,10 +147,6 @@ public:
|
| return true;
|
| }
|
|
|
| - GrGLFragmentProcessor* createGLInstance() const override {
|
| - return SkNEW_ARGS(GLProcessor, (*this));
|
| - }
|
| -
|
| const char* name() const override { return "ModeColorFilterEffect"; }
|
|
|
| SkXfermode::Mode mode() const { return fMode; }
|
| @@ -190,7 +186,8 @@ public:
|
| b->add32(colorModeFilter.mode());
|
| }
|
|
|
| - virtual void setData(const GrGLProgramDataManager& pdman,
|
| + protected:
|
| + virtual void onSetData(const GrGLProgramDataManager& pdman,
|
| const GrProcessor& fp) override {
|
| if (fFilterColorUni.isValid()) {
|
| const ModeColorFilterEffect& colorModeFilter = fp.cast<ModeColorFilterEffect>();
|
| @@ -215,6 +212,10 @@ private:
|
| this->initClassID<ModeColorFilterEffect>();
|
| }
|
|
|
| + GrGLFragmentProcessor* onCreateGLInstance() const override {
|
| + return SkNEW_ARGS(GLProcessor, (*this));
|
| + }
|
| +
|
| virtual void onGetGLProcessorKey(const GrGLSLCaps& caps,
|
| GrProcessorKeyBuilder* b) const override {
|
| GLProcessor::GenKey(*this, caps, b);
|
|
|