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/gpu/effects/GrConvolutionEffect.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/gpu/effects/GrConvolutionEffect.cpp')
| -rw-r--r-- | src/gpu/effects/GrConvolutionEffect.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/gpu/effects/GrConvolutionEffect.cpp b/src/gpu/effects/GrConvolutionEffect.cpp index 5367b27902..55b44b7f56 100644 --- a/src/gpu/effects/GrConvolutionEffect.cpp +++ b/src/gpu/effects/GrConvolutionEffect.cpp @@ -6,8 +6,7 @@ */ #include "GrConvolutionEffect.h" -#include "gl/GrGLFragmentProcessor.h" -#include "gl/GrGLTexture.h" +#include "glsl/GrGLSLFragmentProcessor.h" #include "glsl/GrGLSLFragmentShaderBuilder.h" #include "glsl/GrGLSLProgramBuilder.h" #include "glsl/GrGLSLProgramDataManager.h" @@ -15,7 +14,7 @@ // For brevity typedef GrGLSLProgramDataManager::UniformHandle UniformHandle; -class GrGLConvolutionEffect : public GrGLFragmentProcessor { +class GrGLConvolutionEffect : public GrGLSLFragmentProcessor { public: GrGLConvolutionEffect(const GrProcessor&); @@ -38,7 +37,7 @@ private: UniformHandle fImageIncrementUni; UniformHandle fBoundsUni; - typedef GrGLFragmentProcessor INHERITED; + typedef GrGLSLFragmentProcessor INHERITED; }; GrGLConvolutionEffect::GrGLConvolutionEffect(const GrProcessor& processor) { @@ -200,7 +199,7 @@ void GrConvolutionEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GrGLConvolutionEffect::GenKey(*this, caps, b); } -GrGLFragmentProcessor* GrConvolutionEffect::onCreateGLInstance() const { +GrGLSLFragmentProcessor* GrConvolutionEffect::onCreateGLInstance() const { return new GrGLConvolutionEffect(*this); } |