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 /src/effects/SkTableColorFilter.cpp | |
| parent | 6b90df6b1c6ed843be3ac09605050605f9ec9150 (diff) | |
Make all GrFragmentProcessors GL independent.
TBR=bsalomon@google.com
BUG=skia:
Review URL: https://codereview.chromium.org/1434313002
Diffstat (limited to 'src/effects/SkTableColorFilter.cpp')
| -rw-r--r-- | src/effects/SkTableColorFilter.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/effects/SkTableColorFilter.cpp b/src/effects/SkTableColorFilter.cpp index 872fdfddc2..55de828cca 100644 --- a/src/effects/SkTableColorFilter.cpp +++ b/src/effects/SkTableColorFilter.cpp @@ -335,7 +335,7 @@ SkColorFilter* SkTable_ColorFilter::newComposed(const SkColorFilter* innerFilter #include "GrInvariantOutput.h" #include "SkGr.h" #include "effects/GrTextureStripAtlas.h" -#include "gl/GrGLFragmentProcessor.h" +#include "glsl/GrGLSLFragmentProcessor.h" #include "glsl/GrGLSLFragmentShaderBuilder.h" #include "glsl/GrGLSLProgramBuilder.h" #include "glsl/GrGLSLProgramDataManager.h" @@ -352,7 +352,7 @@ public: int atlasRow() const { return fRow; } private: - GrGLFragmentProcessor* onCreateGLInstance() const override; + GrGLSLFragmentProcessor* onCreateGLInstance() const override; void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; @@ -375,7 +375,7 @@ private: typedef GrFragmentProcessor INHERITED; }; -class GLColorTableEffect : public GrGLFragmentProcessor { +class GLColorTableEffect : public GrGLSLFragmentProcessor { public: GLColorTableEffect(const GrProcessor&); @@ -388,7 +388,7 @@ protected: private: UniformHandle fRGBAYValuesUni; - typedef GrGLFragmentProcessor INHERITED; + typedef GrGLSLFragmentProcessor INHERITED; }; GLColorTableEffect::GLColorTableEffect(const GrProcessor&) { @@ -506,7 +506,7 @@ void ColorTableEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GLColorTableEffect::GenKey(*this, caps, b); } -GrGLFragmentProcessor* ColorTableEffect::onCreateGLInstance() const { +GrGLSLFragmentProcessor* ColorTableEffect::onCreateGLInstance() const { return new GLColorTableEffect(*this); } |