diff options
| author |  egdaniel <egdaniel@google.com> | 2015-11-13 06:54:19 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-11-13 06:54:19 -0800 |
| commit | 64c4728c70001ed074fecf5c4e083781987b12e9 (patch) | |
| tree | 9c46b7028d1d04b526cca0671deb88aa003fc8d6 /experimental | |
| parent | 6b90df6b1c6ed843be3ac09605050605f9ec9150 (diff) | |
Make all GrFragmentProcessors GL independent.
TBR=bsalomon@google.com
BUG=skia:
Review URL: https://codereview.chromium.org/1434313002
Diffstat (limited to 'experimental')
| -rw-r--r-- | experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp b/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp index 6504df2629..f4429dbe3b 100644 --- a/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp +++ b/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp @@ -20,7 +20,7 @@ #include "GrInvariantOutput.h" #include "SkGr.h" #include "effects/GrConstColorProcessor.h" -#include "gl/GrGLFragmentProcessor.h" +#include "glsl/GrGLSLFragmentProcessor.h" #include "glsl/GrGLSLFragmentShaderBuilder.h" #include "glsl/GrGLSLProgramBuilder.h" #include "glsl/GrGLSLProgramDataManager.h" @@ -620,7 +620,7 @@ void SkPerlinNoiseShader2::PerlinNoiseShaderContext::shadeSpan16( #if SK_SUPPORT_GPU -class GrGLPerlinNoise2 : public GrGLFragmentProcessor { +class GrGLPerlinNoise2 : public GrGLSLFragmentProcessor { public: GrGLPerlinNoise2(const GrProcessor&); virtual ~GrGLPerlinNoise2() {} @@ -641,7 +641,7 @@ private: GrGLSLProgramDataManager::UniformHandle fBaseFrequencyUni; private: - typedef GrGLFragmentProcessor INHERITED; + typedef GrGLSLFragmentProcessor INHERITED; }; ///////////////////////////////////////////////////////////////////// @@ -670,7 +670,7 @@ public: const SkMatrix& matrix() const { return fCoordTransform.getMatrix(); } private: - GrGLFragmentProcessor* onCreateGLInstance() const override { + GrGLSLFragmentProcessor* onCreateGLInstance() const override { return new GrGLPerlinNoise2(*this); } @@ -1050,7 +1050,7 @@ void GrGLPerlinNoise2::onSetData(const GrGLSLProgramDataManager& pdman, ///////////////////////////////////////////////////////////////////// -class GrGLImprovedPerlinNoise : public GrGLFragmentProcessor { +class GrGLImprovedPerlinNoise : public GrGLSLFragmentProcessor { public: GrGLImprovedPerlinNoise(const GrProcessor&); virtual ~GrGLImprovedPerlinNoise() {} @@ -1070,7 +1070,7 @@ private: GrGLSLProgramDataManager::UniformHandle fBaseFrequencyUni; private: - typedef GrGLFragmentProcessor INHERITED; + typedef GrGLSLFragmentProcessor INHERITED; }; ///////////////////////////////////////////////////////////////////// @@ -1095,7 +1095,7 @@ public: const SkMatrix& matrix() const { return fCoordTransform.getMatrix(); } private: - GrGLFragmentProcessor* onCreateGLInstance() const override { + GrGLSLFragmentProcessor* onCreateGLInstance() const override { return new GrGLImprovedPerlinNoise(*this); } |