| Index: src/effects/SkLumaColorFilter.cpp
|
| diff --git a/src/effects/SkLumaColorFilter.cpp b/src/effects/SkLumaColorFilter.cpp
|
| index 9ad5797f352cc0d5b625d03cdb4edd705c41230e..e009165ef36f759f73af81a629eb2e3e495e8e65 100644
|
| --- a/src/effects/SkLumaColorFilter.cpp
|
| +++ b/src/effects/SkLumaColorFilter.cpp
|
| @@ -11,11 +11,10 @@
|
| #include "SkString.h"
|
|
|
| #if SK_SUPPORT_GPU
|
| -#include "gl/GrGLProcessor.h"
|
| -#include "gl/builders/GrGLProgramBuilder.h"
|
| #include "GrContext.h"
|
| #include "GrInvariantOutput.h"
|
| -#include "GrTBackendProcessorFactory.h"
|
| +#include "gl/GrGLProcessor.h"
|
| +#include "gl/builders/GrGLProgramBuilder.h"
|
| #endif
|
|
|
| void SkLumaColorFilter::filterSpan(const SkPMColor src[], int count,
|
| @@ -64,18 +63,25 @@ public:
|
| return SkRef(gLumaEffect);
|
| }
|
|
|
| - static const char* Name() { return "Luminance-to-Alpha"; }
|
| + virtual const char* name() const SK_OVERRIDE { return "Luminance-to-Alpha"; }
|
|
|
| - virtual const GrBackendFragmentProcessorFactory& getFactory() const SK_OVERRIDE {
|
| - return GrTBackendFragmentProcessorFactory<LumaColorFilterEffect>::getInstance();
|
| + virtual void getGLProcessorKey(const GrGLCaps& caps,
|
| + GrProcessorKeyBuilder* b) const SK_OVERRIDE {
|
| + GLProcessor::GenKey(*this, caps, b);
|
| + }
|
| +
|
| + virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE {
|
| + return SkNEW_ARGS(GLProcessor, (*this));
|
| + }
|
| +
|
| + virtual uint32_t classID() const {
|
| + static uint32_t id = GenClassID();
|
| + return id;
|
| }
|
|
|
| class GLProcessor : public GrGLFragmentProcessor {
|
| public:
|
| - GLProcessor(const GrBackendProcessorFactory& factory,
|
| - const GrProcessor&)
|
| - : INHERITED(factory) {
|
| - }
|
| + GLProcessor(const GrProcessor&) {}
|
|
|
| static void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder* b) {}
|
|
|
|
|