diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-04-04 10:15:51 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-04 15:27:44 +0000 |
| commit | ab015efc48c462ffdffebb45c02cd19efb254983 (patch) | |
| tree | 0b120fe0e4238f89f7e4bb73a88a00301ecf1378 /experimental | |
| parent | 19aff5dd5cd83141f12c234c4255a35f63e564cd (diff) | |
Move the ability to access textures, buffers, and image storages out from GrProcessor.
GrXferProcessor can no longer use this functionality so it is moved to a new intermediate class inherited by GrFragmentProcessor and GrPrimitiveProcessor.
Change-Id: I4f30c89bdceb2d77b602bf0646107e0780881c26
Reviewed-on: https://skia-review.googlesource.com/11202
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'experimental')
| -rw-r--r-- | experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp b/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp index da4c42f760..88ed0f10bf 100644 --- a/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp +++ b/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp @@ -608,7 +608,7 @@ public: static inline void GenKey(const GrProcessor&, const GrShaderCaps&, GrProcessorKeyBuilder* b); protected: - void onSetData(const GrGLSLProgramDataManager&, const GrProcessor&) override; + void onSetData(const GrGLSLProgramDataManager&, const GrFragmentProcessor&) override; private: GrGLSLProgramDataManager::UniformHandle fStitchDataUni; @@ -1003,7 +1003,7 @@ void GrGLPerlinNoise2::GenKey(const GrProcessor& processor, const GrShaderCaps&, } void GrGLPerlinNoise2::onSetData(const GrGLSLProgramDataManager& pdman, - const GrProcessor& processor) { + const GrFragmentProcessor& processor) { INHERITED::onSetData(pdman, processor); const GrPerlinNoise2Effect& turbulence = processor.cast<GrPerlinNoise2Effect>(); @@ -1027,7 +1027,7 @@ public: static inline void GenKey(const GrProcessor&, const GrShaderCaps&, GrProcessorKeyBuilder*); protected: - void onSetData(const GrGLSLProgramDataManager&, const GrProcessor&) override; + void onSetData(const GrGLSLProgramDataManager&, const GrFragmentProcessor&) override; private: GrGLSLProgramDataManager::UniformHandle fZUni; @@ -1277,7 +1277,7 @@ void GrGLImprovedPerlinNoise::GenKey(const GrProcessor& processor, const GrShade } void GrGLImprovedPerlinNoise::onSetData(const GrGLSLProgramDataManager& pdman, - const GrProcessor& processor) { + const GrFragmentProcessor& processor) { INHERITED::onSetData(pdman, processor); const GrImprovedPerlinNoiseEffect& noise = processor.cast<GrImprovedPerlinNoiseEffect>(); |