diff options
author | joshualitt <joshualitt@chromium.org> | 2014-09-23 09:50:21 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-09-23 09:50:21 -0700 |
commit | b0a8a377f832c59cee939ad721e1f87d378b7142 (patch) | |
tree | 7edeac33c817af28d73f3fbe1b31776ac34e8773 /src/gpu/effects/GrBicubicEffect.h | |
parent | e51ac563de24ed4b25fde97c225580a30a55e9ca (diff) |
Patch to create a distinct geometry processor. The vast majority of this patch
is just a rename. The meat is in GrGeometryProcessor, GrProcessor,
GrGL*Processor, GrProcessorStage, Gr*BackendProcessorFactory,
GrProcessUnitTestFactory, and the builders
BUG=skia:
R=bsalomon@google.com
Author: joshualitt@chromium.org
Review URL: https://codereview.chromium.org/582963002
Diffstat (limited to 'src/gpu/effects/GrBicubicEffect.h')
-rw-r--r-- | src/gpu/effects/GrBicubicEffect.h | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/src/gpu/effects/GrBicubicEffect.h b/src/gpu/effects/GrBicubicEffect.h index 2c1a299f5c..03476da38f 100644 --- a/src/gpu/effects/GrBicubicEffect.h +++ b/src/gpu/effects/GrBicubicEffect.h @@ -10,8 +10,8 @@ #include "GrSingleTextureEffect.h" #include "GrTextureDomain.h" -#include "gl/GrGLEffect.h" -#include "GrTBackendEffectFactory.h" +#include "gl/GrGLProcessor.h" +#include "GrTBackendProcessorFactory.h" class GrGLBicubicEffect; @@ -26,9 +26,9 @@ public: static const char* Name() { return "Bicubic"; } const float* coefficients() const { return fCoefficients; } - typedef GrGLBicubicEffect GLEffect; + typedef GrGLBicubicEffect GLProcessor; - virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE; + virtual const GrBackendFragmentProcessorFactory& getFactory() const SK_OVERRIDE; virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const SK_OVERRIDE; const GrTextureDomain& domain() const { return fDomain; } @@ -36,7 +36,7 @@ public: /** * Create a simple filter effect with custom bicubic coefficients and optional domain. */ - static GrEffect* Create(GrTexture* tex, const SkScalar coefficients[16], + static GrFragmentProcessor* Create(GrTexture* tex, const SkScalar coefficients[16], const SkRect* domain = NULL) { if (NULL == domain) { static const SkShader::TileMode kTileModes[] = { SkShader::kClamp_TileMode, @@ -53,7 +53,7 @@ public: /** * Create a Mitchell filter effect with specified texture matrix and x/y tile modes. */ - static GrEffect* Create(GrTexture* tex, const SkMatrix& matrix, + static GrFragmentProcessor* Create(GrTexture* tex, const SkMatrix& matrix, SkShader::TileMode tileModes[2]) { return Create(tex, gMitchellCoefficients, matrix, tileModes); } @@ -62,15 +62,17 @@ public: * Create a filter effect with custom bicubic coefficients, the texture matrix, and the x/y * tilemodes. */ - static GrEffect* Create(GrTexture* tex, const SkScalar coefficients[16], - const SkMatrix& matrix, const SkShader::TileMode tileModes[2]) { + static GrFragmentProcessor* Create(GrTexture* tex, const SkScalar coefficients[16], + const SkMatrix& matrix, + const SkShader::TileMode tileModes[2]) { return SkNEW_ARGS(GrBicubicEffect, (tex, coefficients, matrix, tileModes)); } /** * Create a Mitchell filter effect with a texture matrix and a domain. */ - static GrEffect* Create(GrTexture* tex, const SkMatrix& matrix, const SkRect& domain) { + static GrFragmentProcessor* Create(GrTexture* tex, const SkMatrix& matrix, + const SkRect& domain) { return SkNEW_ARGS(GrBicubicEffect, (tex, gMitchellCoefficients, matrix, domain)); } @@ -89,12 +91,12 @@ private: const SkMatrix &matrix, const SkShader::TileMode tileModes[2]); GrBicubicEffect(GrTexture*, const SkScalar coefficients[16], const SkMatrix &matrix, const SkRect& domain); - virtual bool onIsEqual(const GrEffect&) const SK_OVERRIDE; + virtual bool onIsEqual(const GrProcessor&) const SK_OVERRIDE; float fCoefficients[16]; GrTextureDomain fDomain; - GR_DECLARE_EFFECT_TEST; + GR_DECLARE_FRAGMENT_PROCESSOR_TEST; static const SkScalar gMitchellCoefficients[16]; |