| Index: src/effects/SkDisplacementMapEffect.cpp
|
| diff --git a/src/effects/SkDisplacementMapEffect.cpp b/src/effects/SkDisplacementMapEffect.cpp
|
| index 11332b10da35edd93f5d703f158712c8f79ee6f0..ec06e5b8317c37923513661e8a6590cebbbbc6fb 100644
|
| --- a/src/effects/SkDisplacementMapEffect.cpp
|
| +++ b/src/effects/SkDisplacementMapEffect.cpp
|
| @@ -344,11 +344,6 @@ public:
|
|
|
| virtual ~GrDisplacementMapEffect();
|
|
|
| - virtual void getGLProcessorKey(const GrGLSLCaps& caps,
|
| - GrProcessorKeyBuilder* b) const override {
|
| - GrGLDisplacementMapEffect::GenKey(*this, caps, b);
|
| - }
|
| -
|
| GrGLFragmentProcessor* createGLInstance() const override {
|
| return SkNEW_ARGS(GrGLDisplacementMapEffect, (*this));
|
| }
|
| @@ -363,6 +358,11 @@ public:
|
| const GrTextureDomain& domain() const { return fDomain; }
|
|
|
| private:
|
| + virtual void onGetGLProcessorKey(const GrGLSLCaps& caps,
|
| + GrProcessorKeyBuilder* b) const override {
|
| + GrGLDisplacementMapEffect::GenKey(*this, caps, b);
|
| + }
|
| +
|
| bool onIsEqual(const GrFragmentProcessor&) const override;
|
|
|
| void onComputeInvariantOutput(GrInvariantOutput* inout) const override;
|
|
|