Index: src/effects/SkColorFilters.cpp |
diff --git a/src/effects/SkColorFilters.cpp b/src/effects/SkColorFilters.cpp |
index 92e6f432f17c24cf5c2d2b020ccc769b88ddeb8d..d28b348989bbfcae85103018933e270143efe2b5 100644 |
--- a/src/effects/SkColorFilters.cpp |
+++ b/src/effects/SkColorFilters.cpp |
@@ -115,10 +115,9 @@ SkFlattenable* SkModeColorFilter::CreateProc(SkReadBuffer& buffer) { |
#include "GrFragmentProcessor.h" |
#include "GrInvariantOutput.h" |
#include "GrProcessorUnitTest.h" |
-#include "GrTBackendProcessorFactory.h" |
+#include "SkGr.h" |
#include "gl/GrGLProcessor.h" |
#include "gl/builders/GrGLProgramBuilder.h" |
-#include "SkGr.h" |
namespace { |
/** |
@@ -195,19 +194,28 @@ public: |
return true; |
} |
- virtual const GrBackendFragmentProcessorFactory& getFactory() const SK_OVERRIDE { |
- return GrTBackendFragmentProcessorFactory<ModeColorFilterEffect>::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; |
} |
- static const char* Name() { return "ModeColorFilterEffect"; } |
+ virtual const char* name() const SK_OVERRIDE { return "ModeColorFilterEffect"; } |
SkXfermode::Mode mode() const { return fMode; } |
GrColor color() const { return fColor; } |
class GLProcessor : public GrGLFragmentProcessor { |
public: |
- GLProcessor(const GrBackendProcessorFactory& factory, const GrProcessor&) |
- : INHERITED(factory) { |
+ GLProcessor(const GrProcessor&) { |
} |
virtual void emitCode(GrGLFPBuilder* builder, |