diff options
author | joshualitt <joshualitt@chromium.org> | 2014-12-04 11:35:33 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-12-04 11:35:34 -0800 |
commit | eb2a6761654307e8aeeeaabdd63c6bf9ab0411e9 (patch) | |
tree | 9567dc32598c1c0df5f5cf4a3d6594c61b95fd93 /src/effects/SkTableColorFilter.cpp | |
parent | e109145bf31d63963b3f78c6af6e404d5464a55b (diff) |
Remove backend factories
BUG=skia:
Review URL: https://codereview.chromium.org/778453002
Diffstat (limited to 'src/effects/SkTableColorFilter.cpp')
-rw-r--r-- | src/effects/SkTableColorFilter.cpp | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/src/effects/SkTableColorFilter.cpp b/src/effects/SkTableColorFilter.cpp index 7cd628fd2d..db25a6fa04 100644 --- a/src/effects/SkTableColorFilter.cpp +++ b/src/effects/SkTableColorFilter.cpp @@ -253,25 +253,22 @@ bool SkTable_ColorFilter::asComponentTable(SkBitmap* table) const { #include "GrFragmentProcessor.h" #include "GrInvariantOutput.h" -#include "GrTBackendProcessorFactory.h" #include "SkGr.h" #include "effects/GrTextureStripAtlas.h" #include "gl/GrGLProcessor.h" #include "gl/builders/GrGLProgramBuilder.h" - -class GLColorTableEffect; - class ColorTableEffect : public GrFragmentProcessor { public: static GrFragmentProcessor* Create(GrContext* context, SkBitmap bitmap, unsigned flags); virtual ~ColorTableEffect(); - static const char* Name() { return "ColorTable"; } - virtual const GrBackendFragmentProcessorFactory& getFactory() const SK_OVERRIDE; + virtual const char* name() const SK_OVERRIDE { return "ColorTable"; } - typedef GLColorTableEffect GLProcessor; + virtual void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; + + virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; const GrTextureStripAtlas* atlas() const { return fAtlas; } int atlasRow() const { return fRow; } @@ -298,7 +295,7 @@ private: class GLColorTableEffect : public GrGLFragmentProcessor { public: - GLColorTableEffect(const GrBackendProcessorFactory&, const GrProcessor&); + GLColorTableEffect(const GrProcessor&); virtual void emitCode(GrGLFPBuilder*, const GrFragmentProcessor&, @@ -316,9 +313,8 @@ private: typedef GrGLFragmentProcessor INHERITED; }; -GLColorTableEffect::GLColorTableEffect(const GrBackendProcessorFactory& factory, const GrProcessor&) - : INHERITED(factory) { - } +GLColorTableEffect::GLColorTableEffect(const GrProcessor&) { +} void GLColorTableEffect::setData(const GrGLProgramDataManager& pdm, const GrProcessor& proc) { // The textures are organized in a strip where the rows are ordered a, r, g, b. @@ -420,7 +416,7 @@ ColorTableEffect::ColorTableEffect(GrTexture* texture, GrTextureStripAtlas* atla , fFlags(flags) , fAtlas(atlas) , fRow(row) { - + this->initClassID<ColorTableEffect>(); this->addTextureAccess(&fTextureAccess); } @@ -430,8 +426,13 @@ ColorTableEffect::~ColorTableEffect() { } } -const GrBackendFragmentProcessorFactory& ColorTableEffect::getFactory() const { - return GrTBackendFragmentProcessorFactory<ColorTableEffect>::getInstance(); +void ColorTableEffect::getGLProcessorKey(const GrGLCaps& caps, + GrProcessorKeyBuilder* b) const { + GLColorTableEffect::GenKey(*this, caps, b); +} + +GrGLFragmentProcessor* ColorTableEffect::createGLInstance() const { + return SkNEW_ARGS(GLColorTableEffect, (*this)); } bool ColorTableEffect::onIsEqual(const GrFragmentProcessor& other) const { |