| Index: src/effects/SkLightingImageFilter.cpp
|
| diff --git a/src/effects/SkLightingImageFilter.cpp b/src/effects/SkLightingImageFilter.cpp
|
| index a30955faf7f7a1561549eabe415b6b1d34bc14be..cc3b3357f63276c14e297c2bba2e97ff137bfafe 100644
|
| --- a/src/effects/SkLightingImageFilter.cpp
|
| +++ b/src/effects/SkLightingImageFilter.cpp
|
| @@ -534,13 +534,13 @@ public:
|
|
|
| const char* name() const override { return "DiffuseLighting"; }
|
|
|
| - void getGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override;
|
| -
|
| GrGLFragmentProcessor* createGLInstance() const override;
|
|
|
| SkScalar kd() const { return fKD; }
|
|
|
| private:
|
| + void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override;
|
| +
|
| bool onIsEqual(const GrFragmentProcessor&) const override;
|
|
|
| GrDiffuseLightingEffect(GrProcessorDataManager*,
|
| @@ -578,14 +578,14 @@ public:
|
|
|
| const char* name() const override { return "SpecularLighting"; }
|
|
|
| - void getGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override;
|
| -
|
| GrGLFragmentProcessor* createGLInstance() const override;
|
|
|
| SkScalar ks() const { return fKS; }
|
| SkScalar shininess() const { return fShininess; }
|
|
|
| private:
|
| + void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override;
|
| +
|
| bool onIsEqual(const GrFragmentProcessor&) const override;
|
|
|
| GrSpecularLightingEffect(GrProcessorDataManager*,
|
| @@ -1613,7 +1613,7 @@ bool GrDiffuseLightingEffect::onIsEqual(const GrFragmentProcessor& sBase) const
|
| this->kd() == s.kd();
|
| }
|
|
|
| -void GrDiffuseLightingEffect::getGLProcessorKey(const GrGLSLCaps& caps,
|
| +void GrDiffuseLightingEffect::onGetGLProcessorKey(const GrGLSLCaps& caps,
|
| GrProcessorKeyBuilder* b) const {
|
| GrGLDiffuseLightingEffect::GenKey(*this, caps, b);
|
| }
|
| @@ -1815,7 +1815,7 @@ bool GrSpecularLightingEffect::onIsEqual(const GrFragmentProcessor& sBase) const
|
| this->shininess() == s.shininess();
|
| }
|
|
|
| -void GrSpecularLightingEffect::getGLProcessorKey(const GrGLSLCaps& caps,
|
| +void GrSpecularLightingEffect::onGetGLProcessorKey(const GrGLSLCaps& caps,
|
| GrProcessorKeyBuilder* b) const {
|
| GrGLSpecularLightingEffect::GenKey(*this, caps, b);
|
| }
|
|
|