Index: src/effects/SkColorMatrixFilter.cpp |
diff --git a/src/effects/SkColorMatrixFilter.cpp b/src/effects/SkColorMatrixFilter.cpp |
index 27231b1466312402ae4930f34db39ed7ed85a79f..627cf8cb39bb939f0610bcb3833c0d15cee9a57b 100644 |
--- a/src/effects/SkColorMatrixFilter.cpp |
+++ b/src/effects/SkColorMatrixFilter.cpp |
@@ -325,7 +325,6 @@ bool SkColorMatrixFilter::asColorMatrix(SkScalar matrix[20]) const { |
#if SK_SUPPORT_GPU |
#include "GrFragmentProcessor.h" |
#include "GrInvariantOutput.h" |
-#include "GrTBackendProcessorFactory.h" |
#include "gl/GrGLProcessor.h" |
#include "gl/builders/GrGLProgramBuilder.h" |
@@ -335,12 +334,23 @@ public: |
return SkNEW_ARGS(ColorMatrixEffect, (matrix)); |
} |
- static const char* Name() { return "Color Matrix"; } |
+ virtual const char* name() const SK_OVERRIDE { return "Color Matrix"; } |
- virtual const GrBackendFragmentProcessorFactory& getFactory() const SK_OVERRIDE { |
- return GrTBackendFragmentProcessorFactory<ColorMatrixEffect>::getInstance(); |
+ virtual uint32_t classID() const { |
+ static uint32_t id = GenClassID(); |
+ return id; |
} |
+ 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)); |
+ } |
+ |
+ |
GR_DECLARE_FRAGMENT_PROCESSOR_TEST; |
class GLProcessor : public GrGLFragmentProcessor { |
@@ -348,10 +358,7 @@ public: |
// this class always generates the same code. |
static void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder* b) {} |
- GLProcessor(const GrBackendProcessorFactory& factory, |
- const GrProcessor&) |
- : INHERITED(factory) { |
- } |
+ GLProcessor(const GrProcessor&) {} |
virtual void emitCode(GrGLFPBuilder* builder, |
const GrFragmentProcessor&, |