diff options
Diffstat (limited to 'src')
43 files changed, 163 insertions, 142 deletions
diff --git a/src/effects/SkAlphaThresholdFilter.cpp b/src/effects/SkAlphaThresholdFilter.cpp index dda265d8bf..fd7e5c35ae 100644 --- a/src/effects/SkAlphaThresholdFilter.cpp +++ b/src/effects/SkAlphaThresholdFilter.cpp @@ -81,8 +81,6 @@ public: float innerThreshold() const { return fInnerThreshold; } float outerThreshold() const { return fOuterThreshold; } - void getGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; - GrGLFragmentProcessor* createGLInstance() const override; private: @@ -108,6 +106,8 @@ private: this->addTextureAccess(&fMaskTextureAccess); } + void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; + bool onIsEqual(const GrFragmentProcessor&) const override; void onComputeInvariantOutput(GrInvariantOutput* inout) const override; @@ -208,7 +208,7 @@ GrFragmentProcessor* AlphaThresholdEffect::TestCreate(GrProcessorTestData* d) { /////////////////////////////////////////////////////////////////////////////// -void AlphaThresholdEffect::getGLProcessorKey(const GrGLSLCaps& caps, +void AlphaThresholdEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { GrGLAlphaThresholdEffect::GenKey(*this, caps, b); } diff --git a/src/effects/SkArithmeticMode_gpu.cpp b/src/effects/SkArithmeticMode_gpu.cpp index d2bec6934e..08851cb7bd 100644 --- a/src/effects/SkArithmeticMode_gpu.cpp +++ b/src/effects/SkArithmeticMode_gpu.cpp @@ -112,7 +112,7 @@ GrArithmeticFP::GrArithmeticFP(GrProcessorDataManager*, float k1, float k2, floa this->addTextureAccess(&fBackgroundAccess); } -void GrArithmeticFP::getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { +void GrArithmeticFP::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { GLArithmeticFP::GenKey(*this, caps, b); } diff --git a/src/effects/SkArithmeticMode_gpu.h b/src/effects/SkArithmeticMode_gpu.h index b84df05e19..36f0f40024 100644 --- a/src/effects/SkArithmeticMode_gpu.h +++ b/src/effects/SkArithmeticMode_gpu.h @@ -42,8 +42,6 @@ public: const char* name() const override { return "Arithmetic"; } - void getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; - GrGLFragmentProcessor* createGLInstance() const override; float k1() const { return fK1; } @@ -53,6 +51,8 @@ public: bool enforcePMColor() const { return fEnforcePMColor; } private: + void onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; + bool onIsEqual(const GrFragmentProcessor&) const override; void onComputeInvariantOutput(GrInvariantOutput* inout) const override; diff --git a/src/effects/SkBlurMaskFilter.cpp b/src/effects/SkBlurMaskFilter.cpp index 6a1a857eef..18ac484a24 100644 --- a/src/effects/SkBlurMaskFilter.cpp +++ b/src/effects/SkBlurMaskFilter.cpp @@ -611,9 +611,6 @@ public: const char* name() const override { return "RectBlur"; } - virtual void getGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const override; - GrGLFragmentProcessor* createGLInstance() const override; /** @@ -645,6 +642,10 @@ public: private: GrRectBlurEffect(const SkRect& rect, float sigma, GrTexture *blur_profile); + + virtual void onGetGLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const override; + bool onIsEqual(const GrFragmentProcessor&) const override; void onComputeInvariantOutput(GrInvariantOutput* inout) const override; @@ -794,7 +795,7 @@ GrRectBlurEffect::GrRectBlurEffect(const SkRect& rect, float sigma, GrRectBlurEffect::~GrRectBlurEffect() { } -void GrRectBlurEffect::getGLProcessorKey(const GrGLSLCaps& caps, +void GrRectBlurEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { GrGLRectBlurEffect::GenKey(*this, caps, b); } @@ -879,14 +880,14 @@ public: const SkRRect& getRRect() const { return fRRect; } float getSigma() const { return fSigma; } - virtual void getGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const override; - GrGLFragmentProcessor* createGLInstance() const override; private: GrRRectBlurEffect(float sigma, const SkRRect&, GrTexture* profileTexture); + virtual void onGetGLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const override; + bool onIsEqual(const GrFragmentProcessor& other) const override; void onComputeInvariantOutput(GrInvariantOutput* inout) const override; @@ -1094,7 +1095,7 @@ void GrGLRRectBlurEffect::setData(const GrGLProgramDataManager& pdman, pdman.set1f(fCornerRadiusUniform, radius); } -void GrRRectBlurEffect::getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { +void GrRRectBlurEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { GrGLRRectBlurEffect::GenKey(*this, caps, b); } diff --git a/src/effects/SkColorCubeFilter.cpp b/src/effects/SkColorCubeFilter.cpp index eeffb08733..3b7c75fa7f 100644 --- a/src/effects/SkColorCubeFilter.cpp +++ b/src/effects/SkColorCubeFilter.cpp @@ -194,9 +194,6 @@ public: const char* name() const override { return "ColorCube"; } - virtual void getGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const override; - GrGLFragmentProcessor* createGLInstance() const override; int colorCubeSize() const { return fColorCubeAccess.getTexture()->width(); } @@ -222,6 +219,9 @@ public: }; private: + virtual void onGetGLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const override; + bool onIsEqual(const GrFragmentProcessor&) const override { return true; } GrColorCubeEffect(GrTexture* colorCube); @@ -242,7 +242,7 @@ GrColorCubeEffect::GrColorCubeEffect(GrTexture* colorCube) GrColorCubeEffect::~GrColorCubeEffect() { } -void GrColorCubeEffect::getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { +void GrColorCubeEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { GLProcessor::GenKey(*this, caps, b); } diff --git a/src/effects/SkColorFilters.cpp b/src/effects/SkColorFilters.cpp index 13ef7c6dfd..bda3d9ad88 100644 --- a/src/effects/SkColorFilters.cpp +++ b/src/effects/SkColorFilters.cpp @@ -147,11 +147,6 @@ public: return true; } - virtual void getGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const override { - GLProcessor::GenKey(*this, caps, b); - } - GrGLFragmentProcessor* createGLInstance() const override { return SkNEW_ARGS(GLProcessor, (*this)); } @@ -220,6 +215,11 @@ private: this->initClassID<ModeColorFilterEffect>(); } + virtual void onGetGLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const override { + GLProcessor::GenKey(*this, caps, b); + } + bool onIsEqual(const GrFragmentProcessor& other) const override { const ModeColorFilterEffect& s = other.cast<ModeColorFilterEffect>(); return fMode == s.fMode && fColor == s.fColor; diff --git a/src/effects/SkColorMatrixFilter.cpp b/src/effects/SkColorMatrixFilter.cpp index d0bd1625ac..0f90349b2b 100644 --- a/src/effects/SkColorMatrixFilter.cpp +++ b/src/effects/SkColorMatrixFilter.cpp @@ -394,11 +394,6 @@ public: const char* name() const override { return "Color Matrix"; } - virtual void getGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const override { - GLProcessor::GenKey(*this, caps, b); - } - GrGLFragmentProcessor* createGLInstance() const override { return SkNEW_ARGS(GLProcessor, (*this)); } @@ -471,6 +466,11 @@ private: this->initClassID<ColorMatrixEffect>(); } + virtual void onGetGLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const override { + GLProcessor::GenKey(*this, caps, b); + } + bool onIsEqual(const GrFragmentProcessor& s) const override { const ColorMatrixEffect& cme = s.cast<ColorMatrixEffect>(); return cme.fMatrix == fMatrix; diff --git a/src/effects/SkDisplacementMapEffect.cpp b/src/effects/SkDisplacementMapEffect.cpp index fa61da97ca..c303301714 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; diff --git a/src/effects/SkLightingImageFilter.cpp b/src/effects/SkLightingImageFilter.cpp index 898b094a6b..0b5e3e8fd0 100644 --- a/src/effects/SkLightingImageFilter.cpp +++ b/src/effects/SkLightingImageFilter.cpp @@ -533,13 +533,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*, @@ -577,14 +577,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*, @@ -1612,7 +1612,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); } @@ -1814,7 +1814,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); } diff --git a/src/effects/SkLightingShader.cpp b/src/effects/SkLightingShader.cpp index 4dcfa527f9..6ed9874639 100644 --- a/src/effects/SkLightingShader.cpp +++ b/src/effects/SkLightingShader.cpp @@ -227,7 +227,7 @@ public: GrGLFragmentProcessor* createGLInstance() const override { return SkNEW(LightingGLFP); } - void getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override { + void onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override { LightingGLFP::GenKey(*this, caps, b); } diff --git a/src/effects/SkLumaColorFilter.cpp b/src/effects/SkLumaColorFilter.cpp index 34cfdad102..939accf13b 100644 --- a/src/effects/SkLumaColorFilter.cpp +++ b/src/effects/SkLumaColorFilter.cpp @@ -65,11 +65,6 @@ public: const char* name() const override { return "Luminance-to-Alpha"; } - virtual void getGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const override { - GLProcessor::GenKey(*this, caps, b); - } - GrGLFragmentProcessor* createGLInstance() const override { return SkNEW_ARGS(GLProcessor, (*this)); } @@ -105,6 +100,11 @@ private: this->initClassID<LumaColorFilterEffect>(); } + virtual void onGetGLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const override { + GLProcessor::GenKey(*this, caps, b); + } + bool onIsEqual(const GrFragmentProcessor&) const override { return true; } void onComputeInvariantOutput(GrInvariantOutput* inout) const override { diff --git a/src/effects/SkMagnifierImageFilter.cpp b/src/effects/SkMagnifierImageFilter.cpp index a397689ef8..e0edb4a75c 100644 --- a/src/effects/SkMagnifierImageFilter.cpp +++ b/src/effects/SkMagnifierImageFilter.cpp @@ -47,8 +47,6 @@ public: const char* name() const override { return "Magnifier"; } - void getGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; - GrGLFragmentProcessor* createGLInstance() const override; const SkRect& bounds() const { return fBounds; } // Bounds of source image. @@ -85,6 +83,8 @@ private: this->initClassID<GrMagnifierEffect>(); } + void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; + bool onIsEqual(const GrFragmentProcessor&) const override; void onComputeInvariantOutput(GrInvariantOutput* inout) const override; @@ -190,7 +190,7 @@ void GrGLMagnifierEffect::setData(const GrGLProgramDataManager& pdman, ///////////////////////////////////////////////////////////////////// -void GrMagnifierEffect::getGLProcessorKey(const GrGLSLCaps& caps, +void GrMagnifierEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { GrGLMagnifierEffect::GenKey(*this, caps, b); } diff --git a/src/effects/SkMorphologyImageFilter.cpp b/src/effects/SkMorphologyImageFilter.cpp index 20f76c1d93..eca5f00d0b 100644 --- a/src/effects/SkMorphologyImageFilter.cpp +++ b/src/effects/SkMorphologyImageFilter.cpp @@ -318,8 +318,6 @@ public: const char* name() const override { return "Morphology"; } - void getGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; - GrGLFragmentProcessor* createGLInstance() const override; protected: @@ -329,6 +327,8 @@ protected: float fRange[2]; private: + void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; + bool onIsEqual(const GrFragmentProcessor&) const override; void onComputeInvariantOutput(GrInvariantOutput* inout) const override; @@ -513,7 +513,7 @@ GrMorphologyEffect::GrMorphologyEffect(GrProcessorDataManager* procDataManager, GrMorphologyEffect::~GrMorphologyEffect() { } -void GrMorphologyEffect::getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { +void GrMorphologyEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { GrGLMorphologyEffect::GenKey(*this, caps, b); } diff --git a/src/effects/SkPerlinNoiseShader.cpp b/src/effects/SkPerlinNoiseShader.cpp index dba1778418..989bdd143d 100644 --- a/src/effects/SkPerlinNoiseShader.cpp +++ b/src/effects/SkPerlinNoiseShader.cpp @@ -527,11 +527,6 @@ public: const char* name() const override { return "PerlinNoise"; } - virtual void getGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const override { - GrGLPerlinNoise::GenKey(*this, caps, b); - } - GrGLFragmentProcessor* createGLInstance() const override { return SkNEW_ARGS(GrGLPerlinNoise, (*this)); } @@ -546,6 +541,11 @@ public: uint8_t alpha() const { return fAlpha; } private: + virtual void onGetGLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const override { + GrGLPerlinNoise::GenKey(*this, caps, b); + } + bool onIsEqual(const GrFragmentProcessor& sBase) const override { const GrPerlinNoiseEffect& s = sBase.cast<GrPerlinNoiseEffect>(); return fType == s.fType && diff --git a/src/effects/SkTableColorFilter.cpp b/src/effects/SkTableColorFilter.cpp index 8314f30c43..d74337250a 100644 --- a/src/effects/SkTableColorFilter.cpp +++ b/src/effects/SkTableColorFilter.cpp @@ -348,14 +348,14 @@ public: const char* name() const override { return "ColorTable"; } - void getGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; - GrGLFragmentProcessor* createGLInstance() const override; const GrTextureStripAtlas* atlas() const { return fAtlas; } int atlasRow() const { return fRow; } private: + void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; + bool onIsEqual(const GrFragmentProcessor&) const override; void onComputeInvariantOutput(GrInvariantOutput* inout) const override; @@ -500,7 +500,7 @@ ColorTableEffect::~ColorTableEffect() { } } -void ColorTableEffect::getGLProcessorKey(const GrGLSLCaps& caps, +void ColorTableEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { GLColorTableEffect::GenKey(*this, caps, b); } diff --git a/src/effects/gradients/SkLinearGradient.cpp b/src/effects/gradients/SkLinearGradient.cpp index f6b6f6a9b5..7ca1b60420 100644 --- a/src/effects/gradients/SkLinearGradient.cpp +++ b/src/effects/gradients/SkLinearGradient.cpp @@ -495,11 +495,6 @@ public: const char* name() const override { return "Linear Gradient"; } - virtual void getGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const override { - GrGLLinearGradient::GenKey(*this, caps, b); - } - GrGLFragmentProcessor* createGLInstance() const override { return SkNEW_ARGS(GrGLLinearGradient, (*this)); } @@ -513,6 +508,12 @@ private: : INHERITED(ctx, procDataManager, shader, matrix, tm) { this->initClassID<GrLinearGradient>(); } + + virtual void onGetGLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const override { + GrGLLinearGradient::GenKey(*this, caps, b); + } + GR_DECLARE_FRAGMENT_PROCESSOR_TEST; typedef GrGradientEffect INHERITED; diff --git a/src/effects/gradients/SkRadialGradient.cpp b/src/effects/gradients/SkRadialGradient.cpp index 1976382bf2..4f97e268d5 100644 --- a/src/effects/gradients/SkRadialGradient.cpp +++ b/src/effects/gradients/SkRadialGradient.cpp @@ -468,11 +468,6 @@ public: const char* name() const override { return "Radial Gradient"; } - virtual void getGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const override { - GrGLRadialGradient::GenKey(*this, caps, b); - } - GrGLFragmentProcessor* createGLInstance() const override { return SkNEW_ARGS(GrGLRadialGradient, (*this)); } @@ -487,6 +482,11 @@ private: this->initClassID<GrRadialGradient>(); } + virtual void onGetGLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const override { + GrGLRadialGradient::GenKey(*this, caps, b); + } + GR_DECLARE_FRAGMENT_PROCESSOR_TEST; typedef GrGradientEffect INHERITED; diff --git a/src/effects/gradients/SkSweepGradient.cpp b/src/effects/gradients/SkSweepGradient.cpp index c3278b2392..4936d31505 100644 --- a/src/effects/gradients/SkSweepGradient.cpp +++ b/src/effects/gradients/SkSweepGradient.cpp @@ -214,11 +214,6 @@ public: const char* name() const override { return "Sweep Gradient"; } - virtual void getGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const override { - GrGLSweepGradient::GenKey(*this, caps, b); - } - GrGLFragmentProcessor* createGLInstance() const override { return SkNEW_ARGS(GrGLSweepGradient, (*this)); } @@ -231,6 +226,12 @@ private: : INHERITED(ctx, procDataManager, shader, matrix, SkShader::kClamp_TileMode) { this->initClassID<GrSweepGradient>(); } + + virtual void onGetGLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const override { + GrGLSweepGradient::GenKey(*this, caps, b); + } + GR_DECLARE_FRAGMENT_PROCESSOR_TEST; typedef GrGradientEffect INHERITED; diff --git a/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp b/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp index 9461f13770..ffa60c80b1 100644 --- a/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp +++ b/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp @@ -72,8 +72,6 @@ public: return "Two-Point Conical Gradient Edge Touching"; } - void getGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; - GrGLFragmentProcessor* createGLInstance() const override; // The radial gradient parameters can collapse to a linear (instead of quadratic) equation. @@ -82,6 +80,8 @@ public: SkScalar radius() const { return fRadius0; } private: + void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; + bool onIsEqual(const GrFragmentProcessor& sBase) const override { const Edge2PtConicalEffect& s = sBase.cast<Edge2PtConicalEffect>(); return (INHERITED::onIsEqual(sBase) && @@ -168,7 +168,7 @@ private: }; -void Edge2PtConicalEffect::getGLProcessorKey(const GrGLSLCaps& caps, +void Edge2PtConicalEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { GLEdge2PtConicalEffect::GenKey(*this, caps, b); } @@ -385,14 +385,14 @@ public: return "Two-Point Conical Gradient Focal Outside"; } - void getGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; - GrGLFragmentProcessor* createGLInstance() const override; bool isFlipped() const { return fIsFlipped; } SkScalar focal() const { return fFocalX; } private: + void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; + bool onIsEqual(const GrFragmentProcessor& sBase) const override { const FocalOutside2PtConicalEffect& s = sBase.cast<FocalOutside2PtConicalEffect>(); return (INHERITED::onIsEqual(sBase) && @@ -450,7 +450,7 @@ private: }; -void FocalOutside2PtConicalEffect::getGLProcessorKey(const GrGLSLCaps& caps, +void FocalOutside2PtConicalEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { GLFocalOutside2PtConicalEffect::GenKey(*this, caps, b); } @@ -601,8 +601,6 @@ public: return "Two-Point Conical Gradient Focal Inside"; } - void getGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; - GrGLFragmentProcessor* createGLInstance() const override; SkScalar focal() const { return fFocalX; } @@ -610,6 +608,8 @@ public: typedef GLFocalInside2PtConicalEffect GLProcessor; private: + void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; + bool onIsEqual(const GrFragmentProcessor& sBase) const override { const FocalInside2PtConicalEffect& s = sBase.cast<FocalInside2PtConicalEffect>(); return (INHERITED::onIsEqual(sBase) && @@ -661,7 +661,7 @@ private: }; -void FocalInside2PtConicalEffect::getGLProcessorKey(const GrGLSLCaps& caps, +void FocalInside2PtConicalEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { GLFocalInside2PtConicalEffect::GenKey(*this, caps, b); } @@ -837,9 +837,6 @@ public: const char* name() const override { return "Two-Point Conical Gradient Inside"; } - virtual void getGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const override; - GrGLFragmentProcessor* createGLInstance() const override; SkScalar centerX() const { return fInfo.fCenterEnd.fX; } @@ -849,6 +846,9 @@ public: SkScalar C() const { return fInfo.fC; } private: + virtual void onGetGLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const override; + bool onIsEqual(const GrFragmentProcessor& sBase) const override { const CircleInside2PtConicalEffect& s = sBase.cast<CircleInside2PtConicalEffect>(); return (INHERITED::onIsEqual(sBase) && @@ -908,7 +908,7 @@ private: }; -void CircleInside2PtConicalEffect::getGLProcessorKey(const GrGLSLCaps& caps, +void CircleInside2PtConicalEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { GLCircleInside2PtConicalEffect::GenKey(*this, caps, b); } @@ -1053,8 +1053,6 @@ public: const char* name() const override { return "Two-Point Conical Gradient Outside"; } - void getGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; - GrGLFragmentProcessor* createGLInstance() const override; SkScalar centerX() const { return fInfo.fCenterEnd.fX; } @@ -1066,6 +1064,8 @@ public: bool isFlipped() const { return fIsFlipped; } private: + void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; + bool onIsEqual(const GrFragmentProcessor& sBase) const override { const CircleOutside2PtConicalEffect& s = sBase.cast<CircleOutside2PtConicalEffect>(); return (INHERITED::onIsEqual(sBase) && @@ -1139,7 +1139,7 @@ private: }; -void CircleOutside2PtConicalEffect::getGLProcessorKey(const GrGLSLCaps& caps, +void CircleOutside2PtConicalEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { GLCircleOutside2PtConicalEffect::GenKey(*this, caps, b); } diff --git a/src/gpu/GrProcessor.cpp b/src/gpu/GrProcessor.cpp index e3cfa78a6d..b990f9b285 100644 --- a/src/gpu/GrProcessor.cpp +++ b/src/gpu/GrProcessor.cpp @@ -135,6 +135,10 @@ void GrFragmentProcessor::addCoordTransform(const GrCoordTransform* transform) { SkDEBUGCODE(transform->setInProcessor();) } +void GrFragmentProcessor::registerChildProcessor(GrFragmentProcessor* child) { + fChildProcessors.push_back(child); +} + bool GrFragmentProcessor::hasSameTransforms(const GrFragmentProcessor& that) const { if (fCoordTransforms.count() != that.fCoordTransforms.count()) { return false; diff --git a/src/gpu/effects/GrBicubicEffect.cpp b/src/gpu/effects/GrBicubicEffect.cpp index cb82ea579c..d5cf03911b 100644 --- a/src/gpu/effects/GrBicubicEffect.cpp +++ b/src/gpu/effects/GrBicubicEffect.cpp @@ -152,7 +152,7 @@ GrBicubicEffect::GrBicubicEffect(GrProcessorDataManager* procDataManager, GrBicubicEffect::~GrBicubicEffect() { } -void GrBicubicEffect::getGLProcessorKey(const GrGLSLCaps& caps, +void GrBicubicEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { GrGLBicubicEffect::GenKey(*this, caps, b); } diff --git a/src/gpu/effects/GrBicubicEffect.h b/src/gpu/effects/GrBicubicEffect.h index 86118f7b78..810e443162 100644 --- a/src/gpu/effects/GrBicubicEffect.h +++ b/src/gpu/effects/GrBicubicEffect.h @@ -27,8 +27,6 @@ public: const char* name() const override { return "Bicubic"; } - void getGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; - GrGLFragmentProcessor* createGLInstance() const override; const GrTextureDomain& domain() const { return fDomain; } @@ -94,6 +92,9 @@ private: const SkMatrix &matrix, const SkShader::TileMode tileModes[2]); GrBicubicEffect(GrProcessorDataManager*, GrTexture*, const SkScalar coefficients[16], const SkMatrix &matrix, const SkRect& domain); + + void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; + bool onIsEqual(const GrFragmentProcessor&) const override; void onComputeInvariantOutput(GrInvariantOutput* inout) const override; diff --git a/src/gpu/effects/GrConfigConversionEffect.cpp b/src/gpu/effects/GrConfigConversionEffect.cpp index 704eb0c01d..c99351d6b3 100644 --- a/src/gpu/effects/GrConfigConversionEffect.cpp +++ b/src/gpu/effects/GrConfigConversionEffect.cpp @@ -146,7 +146,7 @@ GrFragmentProcessor* GrConfigConversionEffect::TestCreate(GrProcessorTestData* d /////////////////////////////////////////////////////////////////////////////// -void GrConfigConversionEffect::getGLProcessorKey(const GrGLSLCaps& caps, +void GrConfigConversionEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { GrGLConfigConversionEffect::GenKey(*this, caps, b); } diff --git a/src/gpu/effects/GrConfigConversionEffect.h b/src/gpu/effects/GrConfigConversionEffect.h index d87d009469..ba21c160c1 100644 --- a/src/gpu/effects/GrConfigConversionEffect.h +++ b/src/gpu/effects/GrConfigConversionEffect.h @@ -38,8 +38,6 @@ public: const char* name() const override { return "Config Conversion"; } - void getGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; - GrGLFragmentProcessor* createGLInstance() const override; bool swapsRedAndBlue() const { return fSwapRedAndBlue; } @@ -61,6 +59,8 @@ private: PMConversion pmConversion, const SkMatrix& matrix); + void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; + bool onIsEqual(const GrFragmentProcessor&) const override; void onComputeInvariantOutput(GrInvariantOutput* inout) const override; diff --git a/src/gpu/effects/GrConstColorProcessor.cpp b/src/gpu/effects/GrConstColorProcessor.cpp index e98a1ff33e..a909104b5a 100644 --- a/src/gpu/effects/GrConstColorProcessor.cpp +++ b/src/gpu/effects/GrConstColorProcessor.cpp @@ -85,7 +85,7 @@ void GrConstColorProcessor::onComputeInvariantOutput(GrInvariantOutput* inout) c } } -void GrConstColorProcessor::getGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder* b) const { +void GrConstColorProcessor::onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder* b) const { b->add32(fMode); } diff --git a/src/gpu/effects/GrConvexPolyEffect.cpp b/src/gpu/effects/GrConvexPolyEffect.cpp index 69c5862aa3..9c73e47322 100644 --- a/src/gpu/effects/GrConvexPolyEffect.cpp +++ b/src/gpu/effects/GrConvexPolyEffect.cpp @@ -24,7 +24,7 @@ public: const char* name() const override { return "AARect"; } - void getGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; + void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; GrGLFragmentProcessor* createGLInstance() const override; @@ -152,7 +152,7 @@ void GLAARectEffect::GenKey(const GrProcessor& processor, const GrGLSLCaps&, b->add32(aare.getEdgeType()); } -void AARectEffect::getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { +void AARectEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { GLAARectEffect::GenKey(*this, caps, b); } @@ -302,7 +302,7 @@ void GrConvexPolyEffect::onComputeInvariantOutput(GrInvariantOutput* inout) cons inout->mulByUnknownSingleComponent(); } -void GrConvexPolyEffect::getGLProcessorKey(const GrGLSLCaps& caps, +void GrConvexPolyEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { GrGLConvexPolyEffect::GenKey(*this, caps, b); } diff --git a/src/gpu/effects/GrConvexPolyEffect.h b/src/gpu/effects/GrConvexPolyEffect.h index d1fdd0fe03..d18ed517ed 100644 --- a/src/gpu/effects/GrConvexPolyEffect.h +++ b/src/gpu/effects/GrConvexPolyEffect.h @@ -69,13 +69,13 @@ public: const SkScalar* getEdges() const { return fEdges; } - void getGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; - GrGLFragmentProcessor* createGLInstance() const override; private: GrConvexPolyEffect(GrPrimitiveEdgeType edgeType, int n, const SkScalar edges[]); + void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; + bool onIsEqual(const GrFragmentProcessor& other) const override; void onComputeInvariantOutput(GrInvariantOutput* inout) const override; diff --git a/src/gpu/effects/GrConvolutionEffect.cpp b/src/gpu/effects/GrConvolutionEffect.cpp index 0f32c9c5e4..f99afc8619 100644 --- a/src/gpu/effects/GrConvolutionEffect.cpp +++ b/src/gpu/effects/GrConvolutionEffect.cpp @@ -194,7 +194,7 @@ GrConvolutionEffect::GrConvolutionEffect(GrProcessorDataManager* procDataManager GrConvolutionEffect::~GrConvolutionEffect() { } -void GrConvolutionEffect::getGLProcessorKey(const GrGLSLCaps& caps, +void GrConvolutionEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { GrGLConvolutionEffect::GenKey(*this, caps, b); } diff --git a/src/gpu/effects/GrConvolutionEffect.h b/src/gpu/effects/GrConvolutionEffect.h index 066da1975c..e65c4c43c9 100644 --- a/src/gpu/effects/GrConvolutionEffect.h +++ b/src/gpu/effects/GrConvolutionEffect.h @@ -63,8 +63,6 @@ public: const char* name() const override { return "Convolution"; } - void getGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; - GrGLFragmentProcessor* createGLInstance() const override; enum { @@ -100,6 +98,8 @@ private: bool useBounds, float bounds[2]); + void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; + bool onIsEqual(const GrFragmentProcessor&) const override; void onComputeInvariantOutput(GrInvariantOutput* inout) const override { diff --git a/src/gpu/effects/GrCustomXfermode.cpp b/src/gpu/effects/GrCustomXfermode.cpp index 76c285ff48..08a1e46552 100644 --- a/src/gpu/effects/GrCustomXfermode.cpp +++ b/src/gpu/effects/GrCustomXfermode.cpp @@ -487,7 +487,7 @@ GrCustomXferFP::GrCustomXferFP(GrProcessorDataManager*, SkXfermode::Mode mode, G this->addTextureAccess(&fBackgroundAccess); } -void GrCustomXferFP::getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { +void GrCustomXferFP::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { GLCustomXferFP::GenKey(*this, caps, b); } diff --git a/src/gpu/effects/GrCustomXfermodePriv.h b/src/gpu/effects/GrCustomXfermodePriv.h index ab9d041eba..2a4006bf67 100644 --- a/src/gpu/effects/GrCustomXfermodePriv.h +++ b/src/gpu/effects/GrCustomXfermodePriv.h @@ -29,8 +29,6 @@ class GrCustomXferFP : public GrFragmentProcessor { public: GrCustomXferFP(GrProcessorDataManager*, SkXfermode::Mode mode, GrTexture* background); - void getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; - GrGLFragmentProcessor* createGLInstance() const override; const char* name() const override { return "Custom Xfermode"; } @@ -39,6 +37,8 @@ public: const GrTextureAccess& backgroundAccess() const { return fBackgroundAccess; } private: + void onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; + bool onIsEqual(const GrFragmentProcessor& other) const override; void onComputeInvariantOutput(GrInvariantOutput* inout) const override; diff --git a/src/gpu/effects/GrDitherEffect.cpp b/src/gpu/effects/GrDitherEffect.cpp index e87014094a..6d39450631 100644 --- a/src/gpu/effects/GrDitherEffect.cpp +++ b/src/gpu/effects/GrDitherEffect.cpp @@ -25,8 +25,6 @@ public: const char* name() const override { return "Dither"; } - void getGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; - GrGLFragmentProcessor* createGLInstance() const override; private: @@ -35,6 +33,8 @@ private: this->setWillReadFragmentPosition(); } + void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; + // All dither effects are equal bool onIsEqual(const GrFragmentProcessor&) const override { return true; } @@ -92,7 +92,7 @@ void GLDitherEffect::emitCode(EmitArgs& args) { ////////////////////////////////////////////////////////////////////////////// -void DitherEffect::getGLProcessorKey(const GrGLSLCaps& caps, +void DitherEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { GLDitherEffect::GenKey(*this, caps, b); } diff --git a/src/gpu/effects/GrMatrixConvolutionEffect.cpp b/src/gpu/effects/GrMatrixConvolutionEffect.cpp index fb1b39ccbd..625a3e9dab 100644 --- a/src/gpu/effects/GrMatrixConvolutionEffect.cpp +++ b/src/gpu/effects/GrMatrixConvolutionEffect.cpp @@ -155,7 +155,7 @@ GrMatrixConvolutionEffect::GrMatrixConvolutionEffect(GrProcessorDataManager* pro GrMatrixConvolutionEffect::~GrMatrixConvolutionEffect() { } -void GrMatrixConvolutionEffect::getGLProcessorKey(const GrGLSLCaps& caps, +void GrMatrixConvolutionEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { GrGLMatrixConvolutionEffect::GenKey(*this, caps, b); } diff --git a/src/gpu/effects/GrMatrixConvolutionEffect.h b/src/gpu/effects/GrMatrixConvolutionEffect.h index 7a95df31b8..ff0a51ea12 100644 --- a/src/gpu/effects/GrMatrixConvolutionEffect.h +++ b/src/gpu/effects/GrMatrixConvolutionEffect.h @@ -65,8 +65,6 @@ public: const char* name() const override { return "MatrixConvolution"; } - void getGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; - GrGLFragmentProcessor* createGLInstance() const override; private: @@ -81,6 +79,8 @@ private: GrTextureDomain::Mode tileMode, bool convolveAlpha); + void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; + bool onIsEqual(const GrFragmentProcessor&) const override; void onComputeInvariantOutput(GrInvariantOutput* inout) const override { diff --git a/src/gpu/effects/GrOvalEffect.cpp b/src/gpu/effects/GrOvalEffect.cpp index 3b373cbda7..1fb54aede3 100644 --- a/src/gpu/effects/GrOvalEffect.cpp +++ b/src/gpu/effects/GrOvalEffect.cpp @@ -23,8 +23,6 @@ public: const char* name() const override { return "Circle"; } - void getGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; - GrGLFragmentProcessor* createGLInstance() const override; const SkPoint& getCenter() const { return fCenter; } @@ -35,6 +33,8 @@ public: private: CircleEffect(GrPrimitiveEdgeType, const SkPoint& center, SkScalar radius); + void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; + bool onIsEqual(const GrFragmentProcessor&) const override; void onComputeInvariantOutput(GrInvariantOutput* inout) const override; @@ -170,7 +170,7 @@ void GLCircleEffect::setData(const GrGLProgramDataManager& pdman, const GrProces /////////////////////////////////////////////////////////////////////////////////////////////////// -void CircleEffect::getGLProcessorKey(const GrGLSLCaps& caps, +void CircleEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { GLCircleEffect::GenKey(*this, caps, b); } @@ -190,8 +190,6 @@ public: const char* name() const override { return "Ellipse"; } - void getGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; - GrGLFragmentProcessor* createGLInstance() const override; const SkPoint& getCenter() const { return fCenter; } @@ -202,6 +200,8 @@ public: private: EllipseEffect(GrPrimitiveEdgeType, const SkPoint& center, SkScalar rx, SkScalar ry); + void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; + bool onIsEqual(const GrFragmentProcessor&) const override; void onComputeInvariantOutput(GrInvariantOutput* inout) const override; @@ -345,7 +345,7 @@ void GLEllipseEffect::setData(const GrGLProgramDataManager& pdman, const GrProce /////////////////////////////////////////////////////////////////////////////////////////////////// -void EllipseEffect::getGLProcessorKey(const GrGLSLCaps& caps, +void EllipseEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { GLEllipseEffect::GenKey(*this, caps, b); } diff --git a/src/gpu/effects/GrRRectEffect.cpp b/src/gpu/effects/GrRRectEffect.cpp index dcc8944a23..271a997065 100644 --- a/src/gpu/effects/GrRRectEffect.cpp +++ b/src/gpu/effects/GrRRectEffect.cpp @@ -49,8 +49,6 @@ public: const char* name() const override { return "CircularRRect"; } - void getGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; - GrGLFragmentProcessor* createGLInstance() const override; const SkRRect& getRRect() const { return fRRect; } @@ -62,6 +60,8 @@ public: private: CircularRRectEffect(GrPrimitiveEdgeType, uint32_t circularCornerFlags, const SkRRect&); + void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; + bool onIsEqual(const GrFragmentProcessor& other) const override; void onComputeInvariantOutput(GrInvariantOutput* inout) const override; @@ -361,7 +361,7 @@ void GLCircularRRectEffect::setData(const GrGLProgramDataManager& pdman, //////////////////////////////////////////////////////////////////////////////////////////////////// -void CircularRRectEffect::getGLProcessorKey(const GrGLSLCaps& caps, +void CircularRRectEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { GLCircularRRectEffect::GenKey(*this, caps, b); } @@ -380,8 +380,6 @@ public: const char* name() const override { return "EllipticalRRect"; } - void getGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; - GrGLFragmentProcessor* createGLInstance() const override; const SkRRect& getRRect() const { return fRRect; } @@ -391,6 +389,8 @@ public: private: EllipticalRRectEffect(GrPrimitiveEdgeType, const SkRRect&); + void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; + bool onIsEqual(const GrFragmentProcessor& other) const override; void onComputeInvariantOutput(GrInvariantOutput* inout) const override; @@ -609,7 +609,7 @@ void GLEllipticalRRectEffect::setData(const GrGLProgramDataManager& pdman, //////////////////////////////////////////////////////////////////////////////////////////////////// -void EllipticalRRectEffect::getGLProcessorKey(const GrGLSLCaps& caps, +void EllipticalRRectEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { GLEllipticalRRectEffect::GenKey(*this, caps, b); } diff --git a/src/gpu/effects/GrSimpleTextureEffect.cpp b/src/gpu/effects/GrSimpleTextureEffect.cpp index 066ccf7991..e3389bbce5 100644 --- a/src/gpu/effects/GrSimpleTextureEffect.cpp +++ b/src/gpu/effects/GrSimpleTextureEffect.cpp @@ -37,7 +37,7 @@ void GrSimpleTextureEffect::onComputeInvariantOutput(GrInvariantOutput* inout) c this->updateInvariantOutputForModulation(inout); } -void GrSimpleTextureEffect::getGLProcessorKey(const GrGLSLCaps& caps, +void GrSimpleTextureEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { GrGLSimpleTextureEffect::GenKey(*this, caps, b); } diff --git a/src/gpu/effects/GrSimpleTextureEffect.h b/src/gpu/effects/GrSimpleTextureEffect.h index 70d36224a5..c86b1365e7 100644 --- a/src/gpu/effects/GrSimpleTextureEffect.h +++ b/src/gpu/effects/GrSimpleTextureEffect.h @@ -53,8 +53,6 @@ public: const char* name() const override { return "SimpleTexture"; } - void getGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; - GrGLFragmentProcessor* createGLInstance() const override; private: @@ -76,6 +74,8 @@ private: this->initClassID<GrSimpleTextureEffect>(); } + void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; + bool onIsEqual(const GrFragmentProcessor& other) const override { return true; } void onComputeInvariantOutput(GrInvariantOutput* inout) const override; diff --git a/src/gpu/effects/GrTextureDomain.cpp b/src/gpu/effects/GrTextureDomain.cpp index bbc5dc9faa..7cc454ec0a 100644 --- a/src/gpu/effects/GrTextureDomain.cpp +++ b/src/gpu/effects/GrTextureDomain.cpp @@ -255,7 +255,7 @@ GrTextureDomainEffect::~GrTextureDomainEffect() { } -void GrTextureDomainEffect::getGLProcessorKey(const GrGLSLCaps& caps, +void GrTextureDomainEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { GrGLTextureDomainEffect::GenKey(*this, caps, b); } diff --git a/src/gpu/effects/GrTextureDomain.h b/src/gpu/effects/GrTextureDomain.h index 77c6ce3d3a..7cf75d6c25 100644 --- a/src/gpu/effects/GrTextureDomain.h +++ b/src/gpu/effects/GrTextureDomain.h @@ -169,8 +169,6 @@ public: const char* name() const override { return "TextureDomain"; } - void getGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; - GrGLFragmentProcessor* createGLInstance() const override; const GrTextureDomain& textureDomain() const { return fTextureDomain; } @@ -187,6 +185,8 @@ private: GrTextureParams::FilterMode, GrCoordSet); + void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; + bool onIsEqual(const GrFragmentProcessor&) const override; void onComputeInvariantOutput(GrInvariantOutput* inout) const override; diff --git a/src/gpu/effects/GrYUVtoRGBEffect.cpp b/src/gpu/effects/GrYUVtoRGBEffect.cpp index 3bfc216474..7d77c1f3b4 100644 --- a/src/gpu/effects/GrYUVtoRGBEffect.cpp +++ b/src/gpu/effects/GrYUVtoRGBEffect.cpp @@ -102,11 +102,6 @@ public: typedef GrGLFragmentProcessor INHERITED; }; - virtual void getGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const override { - GLProcessor::GenKey(*this, caps, b); - } - GrGLFragmentProcessor* createGLInstance() const override { return SkNEW_ARGS(GLProcessor, (*this)); } @@ -131,6 +126,11 @@ private: this->addTextureAccess(&fVAccess); } + virtual void onGetGLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const override { + GLProcessor::GenKey(*this, caps, b); + } + bool onIsEqual(const GrFragmentProcessor& sBase) const override { const YUVtoRGBEffect& s = sBase.cast<YUVtoRGBEffect>(); return fColorSpace == s.getColorSpace(); diff --git a/src/gpu/gl/GrGLProgramDesc.cpp b/src/gpu/gl/GrGLProgramDesc.cpp index 7eb4fe1517..2522f7a24f 100644 --- a/src/gpu/gl/GrGLProgramDesc.cpp +++ b/src/gpu/gl/GrGLProgramDesc.cpp @@ -115,7 +115,9 @@ bool GrGLProgramDescBuilder::Build(GrProgramDesc* desc, for (int s = 0; s < pipeline.numFragmentStages(); ++s) { const GrPendingFragmentStage& fps = pipeline.getFragmentStage(s); const GrFragmentProcessor& fp = *fps.processor(); + fp.getGLProcessorKey(*gpu->glCaps().glslCaps(), &b); + //**** use glslCaps here? if (!get_meta_key(fp, gpu->glCaps(), primProc.getTransformKey(fp.coordTransforms()), &b)) { glDesc->key().reset(); diff --git a/src/gpu/gl/builders/GrGLProgramBuilder.cpp b/src/gpu/gl/builders/GrGLProgramBuilder.cpp index 9c0e7ab526..daa24800d2 100644 --- a/src/gpu/gl/builders/GrGLProgramBuilder.cpp +++ b/src/gpu/gl/builders/GrGLProgramBuilder.cpp @@ -179,6 +179,18 @@ const GrGLContextInfo& GrGLProgramBuilder::ctxInfo() const { return fGpu->ctxInfo(); } +static void append_gr_fp_coord_transforms(const GrFragmentProcessor* processor, + SkTArray<const GrCoordTransform*, true>* procCoords) { + // add the coord transforms of this processor + for (int i = 0; i < processor->numTransforms(); ++i) { + procCoords->push_back(&processor->coordTransform(i)); + } + // recursively add the coord transforms of this processor's child processors + for (int i = 0; i < processor->numChildProcessors(); ++i) { + append_gr_fp_coord_transforms(processor->childProcessor(i), procCoords); + } +} + bool GrGLProgramBuilder::emitAndInstallProcs(GrGLSLExpr4* inputColor, GrGLSLExpr4* inputCoverage) { // First we loop over all of the installed processors and collect coord transforms. These will // be sent to the GrGLPrimitiveProcessor in its emitCode function @@ -189,11 +201,10 @@ bool GrGLProgramBuilder::emitAndInstallProcs(GrGLSLExpr4* inputColor, GrGLSLExpr for (int i = 0; i < this->pipeline().numFragmentStages(); i++) { const GrFragmentProcessor* processor = this->pipeline().getFragmentStage(i).processor(); SkSTArray<2, const GrCoordTransform*, true>& procCoords = fCoordTransforms.push_back(); - for (int t = 0; t < processor->numTransforms(); t++) { - procCoords.push_back(&processor->coordTransform(t)); - } - totalTextures += processor->numTextures(); + append_gr_fp_coord_transforms(processor, &procCoords); + + totalTextures += processor->numTexturesIncludeChildProcs(); if (totalTextures >= maxTextureUnits) { GrCapsDebugf(fGpu->caps(), "Program would use too many texture units\n"); return false; @@ -284,7 +295,7 @@ void GrGLProgramBuilder::emitAndInstallProc(const GrPendingFragmentStage& fs, const GrFragmentProcessor& fp = *fs.processor(); ifp->fGLProc.reset(fp.createGLInstance()); - SkSTArray<4, GrGLProcessor::TextureSampler> samplers(fp.numTextures()); + SkSTArray<4, GrGLProcessor::TextureSampler> samplers(fp.numTexturesIncludeChildProcs()); this->emitSamplers(fp, &samplers, ifp); GrGLFragmentProcessor::EmitArgs args(this, fp, outColor, inColor, fOutCoords[index], samplers); |