| Index: src/effects/SkMorphologyImageFilter.cpp
|
| diff --git a/src/effects/SkMorphologyImageFilter.cpp b/src/effects/SkMorphologyImageFilter.cpp
|
| index 397e43193e087c232e5dc3c765665b0d3f6e3ca9..a9c1c4f00c34a7328887ab9170b28c16dbd2840f 100644
|
| --- a/src/effects/SkMorphologyImageFilter.cpp
|
| +++ b/src/effects/SkMorphologyImageFilter.cpp
|
| @@ -309,7 +309,6 @@ public:
|
| typedef GrGLMorphologyEffect GLProcessor;
|
|
|
| virtual const GrBackendFragmentProcessorFactory& getFactory() const SK_OVERRIDE;
|
| - virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const SK_OVERRIDE;
|
|
|
| protected:
|
|
|
| @@ -318,6 +317,8 @@ protected:
|
| private:
|
| virtual bool onIsEqual(const GrProcessor&) const SK_OVERRIDE;
|
|
|
| + virtual void onComputeInvarientOutput(InvarientOutput* invarientOutput) const SK_OVERRIDE;
|
| +
|
| GrMorphologyEffect(GrTexture*, Direction, int radius, MorphologyType);
|
|
|
| GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
|
| @@ -455,10 +456,11 @@ bool GrMorphologyEffect::onIsEqual(const GrProcessor& sBase) const {
|
| this->type() == s.type());
|
| }
|
|
|
| -void GrMorphologyEffect::getConstantColorComponents(GrColor* color, uint32_t* validFlags) const {
|
| +void GrMorphologyEffect::onComputeInvarientOutput(InvarientOutput* invarientOutput) const {
|
| // This is valid because the color components of the result of the kernel all come
|
| // exactly from existing values in the source texture.
|
| - this->updateConstantColorComponentsForModulation(color, validFlags);
|
| + this->updateInvarientOutputForModulation(invarientOutput);
|
| + invarientOutput->isSingleComponent = false;
|
| }
|
|
|
| ///////////////////////////////////////////////////////////////////////////////
|
|
|