diff options
author | robertphillips <robertphillips@google.com> | 2016-02-04 06:11:53 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-02-04 06:11:53 -0800 |
commit | bf536af15f4c176d3bef65b77b7592718bfd9068 (patch) | |
tree | 80457c99422dad84b6444ba1151f6897ab407824 /experimental | |
parent | 29e5a8932d7dae782f2e58d312a038f8888dab30 (diff) |
Next round of GrGLSLFragmentProcessor-derived class cleanup
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1661143003
Review URL: https://codereview.chromium.org/1661143003
Diffstat (limited to 'experimental')
-rw-r--r-- | experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp b/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp index 29391fc287..8afbee0827 100644 --- a/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp +++ b/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp @@ -610,9 +610,8 @@ void SkPerlinNoiseShader2::PerlinNoiseShaderContext::shadeSpan( class GrGLPerlinNoise2 : public GrGLSLFragmentProcessor { public: GrGLPerlinNoise2(const GrProcessor&); - virtual ~GrGLPerlinNoise2() {} - virtual void emitCode(EmitArgs&) override; + void emitCode(EmitArgs&) override; static inline void GenKey(const GrProcessor&, const GrGLSLCaps&, GrProcessorKeyBuilder* b); @@ -1040,24 +1039,18 @@ void GrGLPerlinNoise2::onSetData(const GrGLSLProgramDataManager& pdman, class GrGLImprovedPerlinNoise : public GrGLSLFragmentProcessor { public: - GrGLImprovedPerlinNoise(const GrProcessor&); - virtual ~GrGLImprovedPerlinNoise() {} + void emitCode(EmitArgs&) override; - virtual void emitCode(EmitArgs&) override; - - static inline void GenKey(const GrProcessor&, const GrGLSLCaps&, GrProcessorKeyBuilder* b); + static inline void GenKey(const GrProcessor&, const GrGLSLCaps&, GrProcessorKeyBuilder*); protected: void onSetData(const GrGLSLProgramDataManager&, const GrProcessor&) override; private: - - SkScalar fZ; GrGLSLProgramDataManager::UniformHandle fZUni; GrGLSLProgramDataManager::UniformHandle fOctavesUni; GrGLSLProgramDataManager::UniformHandle fBaseFrequencyUni; -private: typedef GrGLSLFragmentProcessor INHERITED; }; @@ -1084,11 +1077,10 @@ public: private: GrGLSLFragmentProcessor* onCreateGLSLInstance() const override { - return new GrGLImprovedPerlinNoise(*this); + return new GrGLImprovedPerlinNoise; } - virtual void onGetGLSLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const override { + void onGetGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override { GrGLImprovedPerlinNoise::GenKey(*this, caps, b); } @@ -1153,10 +1145,6 @@ const GrFragmentProcessor* GrImprovedPerlinNoiseEffect::TestCreate(GrProcessorTe kNone_SkFilterQuality); } -GrGLImprovedPerlinNoise::GrGLImprovedPerlinNoise(const GrProcessor& processor) - : fZ(processor.cast<GrImprovedPerlinNoiseEffect>().z()) { -} - void GrGLImprovedPerlinNoise::emitCode(EmitArgs& args) { GrGLSLFragmentBuilder* fsBuilder = args.fFragBuilder; GrGLSLUniformHandler* uniformHandler = args.fUniformHandler; |