diff options
author | Brian Salomon <bsalomon@google.com> | 2016-11-29 13:43:05 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-29 19:32:31 +0000 |
commit | 94efbf51f5a88d9e8aa961d3fbe38c5e335d6108 (patch) | |
tree | 2723f6ec5bfc291d4a52adf961165e3e74a098ca /experimental | |
parent | e11b614795bbe707d131ad599ead5be452e7c06f (diff) |
Merge GrGLSLCaps into GrShaderCaps
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=5121
Change-Id: If8d13638f80f42161cbc766a2666c5789e5772c8
Reviewed-on: https://skia-review.googlesource.com/5121
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'experimental')
-rw-r--r-- | experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp b/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp index 1dcd8de888..f3040673fc 100644 --- a/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp +++ b/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp @@ -614,7 +614,7 @@ class GrGLPerlinNoise2 : public GrGLSLFragmentProcessor { public: void emitCode(EmitArgs&) override; - static inline void GenKey(const GrProcessor&, const GrGLSLCaps&, GrProcessorKeyBuilder* b); + static inline void GenKey(const GrProcessor&, const GrShaderCaps&, GrProcessorKeyBuilder* b); protected: void onSetData(const GrGLSLProgramDataManager&, const GrProcessor&) override; @@ -657,7 +657,7 @@ private: return new GrGLPerlinNoise2; } - virtual void onGetGLSLProcessorKey(const GrGLSLCaps& caps, + virtual void onGetGLSLProcessorKey(const GrShaderCaps& caps, GrProcessorKeyBuilder* b) const override { GrGLPerlinNoise2::GenKey(*this, caps, b); } @@ -983,7 +983,7 @@ void GrGLPerlinNoise2::emitCode(EmitArgs& args) { args.fOutputColor, args.fOutputColor); } -void GrGLPerlinNoise2::GenKey(const GrProcessor& processor, const GrGLSLCaps&, +void GrGLPerlinNoise2::GenKey(const GrProcessor& processor, const GrShaderCaps&, GrProcessorKeyBuilder* b) { const GrPerlinNoise2Effect& turbulence = processor.cast<GrPerlinNoise2Effect>(); @@ -1032,7 +1032,7 @@ class GrGLImprovedPerlinNoise : public GrGLSLFragmentProcessor { public: void emitCode(EmitArgs&) override; - static inline void GenKey(const GrProcessor&, const GrGLSLCaps&, GrProcessorKeyBuilder*); + static inline void GenKey(const GrProcessor&, const GrShaderCaps&, GrProcessorKeyBuilder*); protected: void onSetData(const GrGLSLProgramDataManager&, const GrProcessor&) override; @@ -1073,7 +1073,7 @@ private: return new GrGLImprovedPerlinNoise; } - void onGetGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override { + void onGetGLSLProcessorKey(const GrShaderCaps& caps, GrProcessorKeyBuilder* b) const override { GrGLImprovedPerlinNoise::GenKey(*this, caps, b); } @@ -1278,7 +1278,7 @@ void GrGLImprovedPerlinNoise::emitCode(EmitArgs& args) { args.fOutputColor, args.fOutputColor); } -void GrGLImprovedPerlinNoise::GenKey(const GrProcessor& processor, const GrGLSLCaps&, +void GrGLImprovedPerlinNoise::GenKey(const GrProcessor& processor, const GrShaderCaps&, GrProcessorKeyBuilder* b) { } |