| Index: src/gpu/effects/GrConvolutionEffect.cpp
|
| diff --git a/src/gpu/effects/GrConvolutionEffect.cpp b/src/gpu/effects/GrConvolutionEffect.cpp
|
| index ef4e791fb225cab840a8bbadb3ebd7eefa12146d..96d1578f08932e990ffc8419da91d0d4925cbb68 100644
|
| --- a/src/gpu/effects/GrConvolutionEffect.cpp
|
| +++ b/src/gpu/effects/GrConvolutionEffect.cpp
|
| @@ -9,9 +9,10 @@
|
| #include "gl/GrGLFragmentProcessor.h"
|
| #include "gl/GrGLTexture.h"
|
| #include "gl/builders/GrGLProgramBuilder.h"
|
| +#include "glsl/GrGLSLProgramDataManager.h"
|
|
|
| // For brevity
|
| -typedef GrGLProgramDataManager::UniformHandle UniformHandle;
|
| +typedef GrGLSLProgramDataManager::UniformHandle UniformHandle;
|
|
|
| class GrGLConvolutionEffect : public GrGLFragmentProcessor {
|
| public:
|
| @@ -22,7 +23,7 @@ public:
|
| static inline void GenKey(const GrProcessor&, const GrGLSLCaps&, GrProcessorKeyBuilder*);
|
|
|
| protected:
|
| - void onSetData(const GrGLProgramDataManager& pdman, const GrProcessor&) override;
|
| + void onSetData(const GrGLSLProgramDataManager& pdman, const GrProcessor&) override;
|
|
|
| private:
|
| int width() const { return Gr1DKernelEffect::WidthFromRadius(fRadius); }
|
| @@ -100,8 +101,8 @@ void GrGLConvolutionEffect::emitCode(EmitArgs& args) {
|
| fsBuilder->codeAppend(modulate.c_str());
|
| }
|
|
|
| -void GrGLConvolutionEffect::onSetData(const GrGLProgramDataManager& pdman,
|
| - const GrProcessor& processor) {
|
| +void GrGLConvolutionEffect::onSetData(const GrGLSLProgramDataManager& pdman,
|
| + const GrProcessor& processor) {
|
| const GrConvolutionEffect& conv = processor.cast<GrConvolutionEffect>();
|
| GrTexture& texture = *conv.texture(0);
|
| // the code we generated was for a specific kernel radius
|
|
|