| Index: src/effects/SkColorMatrixFilter.cpp
|
| diff --git a/src/effects/SkColorMatrixFilter.cpp b/src/effects/SkColorMatrixFilter.cpp
|
| index bc72b1fa6339d83c3e33e111dfb4c8d3f367cbed..bb7dd94910176d022fd4c3e4e833c7c8356b3e4a 100644
|
| --- a/src/effects/SkColorMatrixFilter.cpp
|
| +++ b/src/effects/SkColorMatrixFilter.cpp
|
| @@ -400,12 +400,12 @@ public:
|
|
|
| GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
|
|
|
| - class GLProcessor : public GrGLSLFragmentProcessor {
|
| + class GLSLProcessor : public GrGLSLFragmentProcessor {
|
| public:
|
| // this class always generates the same code.
|
| static void GenKey(const GrProcessor&, const GrGLSLCaps&, GrProcessorKeyBuilder* b) {}
|
|
|
| - GLProcessor(const GrProcessor&) {}
|
| + GLSLProcessor(const GrProcessor&) {}
|
|
|
| virtual void emitCode(EmitArgs& args) override {
|
| fMatrixHandle = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
|
| @@ -466,11 +466,13 @@ private:
|
| this->initClassID<ColorMatrixEffect>();
|
| }
|
|
|
| - GrGLSLFragmentProcessor* onCreateGLInstance() const override { return new GLProcessor(*this); }
|
| + GrGLSLFragmentProcessor* onCreateGLSLInstance() const override {
|
| + return new GLSLProcessor(*this);
|
| + }
|
|
|
| - virtual void onGetGLProcessorKey(const GrGLSLCaps& caps,
|
| - GrProcessorKeyBuilder* b) const override {
|
| - GLProcessor::GenKey(*this, caps, b);
|
| + virtual void onGetGLSLProcessorKey(const GrGLSLCaps& caps,
|
| + GrProcessorKeyBuilder* b) const override {
|
| + GLSLProcessor::GenKey(*this, caps, b);
|
| }
|
|
|
| bool onIsEqual(const GrFragmentProcessor& s) const override {
|
|
|