diff options
Diffstat (limited to 'src')
28 files changed, 92 insertions, 92 deletions
diff --git a/src/effects/SkBlendImageFilter.cpp b/src/effects/SkBlendImageFilter.cpp index 60f334ab7b..10104cc5b2 100644 --- a/src/effects/SkBlendImageFilter.cpp +++ b/src/effects/SkBlendImageFilter.cpp @@ -112,7 +112,7 @@ bool SkBlendImageFilter::onFilterImage(Proxy* proxy, #if SK_SUPPORT_GPU class GrGLBlendEffect : public GrGLLegacyEffect { public: - GrGLBlendEffect(const GrProgramStageFactory& factory, + GrGLBlendEffect(const GrBackendEffectFactory& factory, const GrEffect& effect); virtual ~GrGLBlendEffect(); @@ -139,7 +139,7 @@ public: virtual ~GrBlendEffect(); virtual bool isEqual(const GrEffect&) const SK_OVERRIDE; - const GrProgramStageFactory& getFactory() const; + const GrBackendEffectFactory& getFactory() const; SkBlendImageFilter::Mode mode() const { return fMode; } typedef GrGLBlendEffect GLEffect; @@ -230,13 +230,13 @@ bool GrBlendEffect::isEqual(const GrEffect& sBase) const { fMode == s.fMode; } -const GrProgramStageFactory& GrBlendEffect::getFactory() const { - return GrTProgramStageFactory<GrBlendEffect>::getInstance(); +const GrBackendEffectFactory& GrBlendEffect::getFactory() const { + return GrTBackendEffectFactory<GrBlendEffect>::getInstance(); } /////////////////////////////////////////////////////////////////////////////// -GrGLBlendEffect::GrGLBlendEffect(const GrProgramStageFactory& factory, +GrGLBlendEffect::GrGLBlendEffect(const GrBackendEffectFactory& factory, const GrEffect& effect) : INHERITED(factory), fMode(static_cast<const GrBlendEffect&>(effect).mode()) { diff --git a/src/effects/SkColorMatrixFilter.cpp b/src/effects/SkColorMatrixFilter.cpp index ae9cfb0056..5e2b960d0a 100644 --- a/src/effects/SkColorMatrixFilter.cpp +++ b/src/effects/SkColorMatrixFilter.cpp @@ -328,8 +328,8 @@ public: ColorMatrixEffect(const SkColorMatrix& matrix) : GrEffect(0), fMatrix(matrix) {} - virtual const GrProgramStageFactory& getFactory() const SK_OVERRIDE { - return GrTProgramStageFactory<ColorMatrixEffect>::getInstance(); + virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE { + return GrTBackendEffectFactory<ColorMatrixEffect>::getInstance(); } virtual bool isEqual(const GrEffect& s) const { @@ -344,7 +344,7 @@ public: // this class always generates the same code. static StageKey GenKey(const GrEffect& s, const GrGLCaps&) { return 0; } - GLEffect(const GrProgramStageFactory& factory, + GLEffect(const GrBackendEffectFactory& factory, const GrEffect& effect) : INHERITED(factory) , fMatrixHandle(GrGLUniformManager::kInvalidUniformHandle) diff --git a/src/effects/SkLightingImageFilter.cpp b/src/effects/SkLightingImageFilter.cpp index 67403bc5e4..8464f6e42c 100644 --- a/src/effects/SkLightingImageFilter.cpp +++ b/src/effects/SkLightingImageFilter.cpp @@ -14,7 +14,7 @@ #include "SkTypes.h" #if SK_SUPPORT_GPU -#include "GrProgramStageFactory.h" +#include "GrBackendEffectFactory.h" #include "effects/GrSingleTextureEffect.h" #include "gl/GrGLEffect.h" #include "gl/GrGLTexture.h" @@ -328,7 +328,7 @@ public: typedef GrGLDiffuseLightingEffect GLEffect; - virtual const GrProgramStageFactory& getFactory() const SK_OVERRIDE; + virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE; virtual bool isEqual(const GrEffect&) const SK_OVERRIDE; SkScalar kd() const { return fKD; } private: @@ -349,7 +349,7 @@ public: typedef GrGLSpecularLightingEffect GLEffect; - virtual const GrProgramStageFactory& getFactory() const SK_OVERRIDE; + virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE; virtual bool isEqual(const GrEffect&) const SK_OVERRIDE; SkScalar ks() const { return fKS; } SkScalar shininess() const { return fShininess; } @@ -941,7 +941,7 @@ SkLight* create_random_light(SkRandom* random) { class GrGLLightingEffect : public GrGLLegacyEffect { public: - GrGLLightingEffect(const GrProgramStageFactory& factory, + GrGLLightingEffect(const GrBackendEffectFactory& factory, const GrEffect& effect); virtual ~GrGLLightingEffect(); @@ -971,7 +971,7 @@ private: class GrGLDiffuseLightingEffect : public GrGLLightingEffect { public: - GrGLDiffuseLightingEffect(const GrProgramStageFactory& factory, + GrGLDiffuseLightingEffect(const GrBackendEffectFactory& factory, const GrEffect& effect); virtual void setupVariables(GrGLShaderBuilder* builder) SK_OVERRIDE; virtual void emitLightFunc(GrGLShaderBuilder*, SkString* funcName) SK_OVERRIDE; @@ -987,7 +987,7 @@ private: class GrGLSpecularLightingEffect : public GrGLLightingEffect { public: - GrGLSpecularLightingEffect(const GrProgramStageFactory& factory, + GrGLSpecularLightingEffect(const GrBackendEffectFactory& factory, const GrEffect& effect); virtual void setupVariables(GrGLShaderBuilder* builder) SK_OVERRIDE; virtual void emitLightFunc(GrGLShaderBuilder*, SkString* funcName) SK_OVERRIDE; @@ -1027,8 +1027,8 @@ GrDiffuseLightingEffect::GrDiffuseLightingEffect(GrTexture* texture, const SkLig : INHERITED(texture, light, surfaceScale), fKD(kd) { } -const GrProgramStageFactory& GrDiffuseLightingEffect::getFactory() const { - return GrTProgramStageFactory<GrDiffuseLightingEffect>::getInstance(); +const GrBackendEffectFactory& GrDiffuseLightingEffect::getFactory() const { + return GrTBackendEffectFactory<GrDiffuseLightingEffect>::getInstance(); } bool GrDiffuseLightingEffect::isEqual(const GrEffect& sBase) const { @@ -1053,7 +1053,7 @@ GrEffect* GrDiffuseLightingEffect::TestCreate(SkRandom* random, /////////////////////////////////////////////////////////////////////////////// -GrGLLightingEffect::GrGLLightingEffect(const GrProgramStageFactory& factory, +GrGLLightingEffect::GrGLLightingEffect(const GrBackendEffectFactory& factory, const GrEffect& effect) : INHERITED(factory) , fImageIncrementUni(kInvalidUniformHandle) @@ -1187,7 +1187,7 @@ void GrGLLightingEffect::setData(const GrGLUniformManager& uman, const GrEffect& /////////////////////////////////////////////////////////////////////////////// -GrGLDiffuseLightingEffect::GrGLDiffuseLightingEffect(const GrProgramStageFactory& factory, +GrGLDiffuseLightingEffect::GrGLDiffuseLightingEffect(const GrBackendEffectFactory& factory, const GrEffect& effect) : INHERITED(factory, effect) , fKDUni(kInvalidUniformHandle) { @@ -1232,8 +1232,8 @@ GrSpecularLightingEffect::GrSpecularLightingEffect(GrTexture* texture, const SkL fShininess(shininess) { } -const GrProgramStageFactory& GrSpecularLightingEffect::getFactory() const { - return GrTProgramStageFactory<GrSpecularLightingEffect>::getInstance(); +const GrBackendEffectFactory& GrSpecularLightingEffect::getFactory() const { + return GrTBackendEffectFactory<GrSpecularLightingEffect>::getInstance(); } bool GrSpecularLightingEffect::isEqual(const GrEffect& sBase) const { @@ -1259,7 +1259,7 @@ GrEffect* GrSpecularLightingEffect::TestCreate(SkRandom* random, /////////////////////////////////////////////////////////////////////////////// -GrGLSpecularLightingEffect::GrGLSpecularLightingEffect(const GrProgramStageFactory& factory, +GrGLSpecularLightingEffect::GrGLSpecularLightingEffect(const GrBackendEffectFactory& factory, const GrEffect& effect) : GrGLLightingEffect(factory, effect) , fKSUni(kInvalidUniformHandle) diff --git a/src/effects/SkMagnifierImageFilter.cpp b/src/effects/SkMagnifierImageFilter.cpp index 187fbe7991..67ae13c3ec 100644 --- a/src/effects/SkMagnifierImageFilter.cpp +++ b/src/effects/SkMagnifierImageFilter.cpp @@ -18,7 +18,7 @@ #include "gl/GrGLEffect.h" #include "gl/GrGLSL.h" #include "gl/GrGLTexture.h" -#include "GrProgramStageFactory.h" +#include "GrBackendEffectFactory.h" class GrGLMagnifierEffect; @@ -44,7 +44,7 @@ public: static const char* Name() { return "Magnifier"; } - virtual const GrProgramStageFactory& getFactory() const SK_OVERRIDE; + virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE; virtual bool isEqual(const GrEffect&) const SK_OVERRIDE; float x_offset() const { return fXOffset; } @@ -74,7 +74,7 @@ typedef GrGLUniformManager::UniformHandle UniformHandle; class GrGLMagnifierEffect : public GrGLLegacyEffect { public: - GrGLMagnifierEffect(const GrProgramStageFactory& factory, + GrGLMagnifierEffect(const GrBackendEffectFactory& factory, const GrEffect& effect); virtual void setupVariables(GrGLShaderBuilder* state) SK_OVERRIDE; @@ -99,7 +99,7 @@ private: typedef GrGLLegacyEffect INHERITED; }; -GrGLMagnifierEffect::GrGLMagnifierEffect(const GrProgramStageFactory& factory, +GrGLMagnifierEffect::GrGLMagnifierEffect(const GrBackendEffectFactory& factory, const GrEffect& effect) : INHERITED(factory) , fOffsetVar(GrGLUniformManager::kInvalidUniformHandle) @@ -209,8 +209,8 @@ GrEffect* GrMagnifierEffect::TestCreate(SkRandom* random, /////////////////////////////////////////////////////////////////////////////// -const GrProgramStageFactory& GrMagnifierEffect::getFactory() const { - return GrTProgramStageFactory<GrMagnifierEffect>::getInstance(); +const GrBackendEffectFactory& GrMagnifierEffect::getFactory() const { + return GrTBackendEffectFactory<GrMagnifierEffect>::getInstance(); } bool GrMagnifierEffect::isEqual(const GrEffect& sBase) const { diff --git a/src/effects/SkMatrixConvolutionImageFilter.cpp b/src/effects/SkMatrixConvolutionImageFilter.cpp index 607d8c8feb..c650539b86 100644 --- a/src/effects/SkMatrixConvolutionImageFilter.cpp +++ b/src/effects/SkMatrixConvolutionImageFilter.cpp @@ -262,7 +262,7 @@ public: typedef GrGLMatrixConvolutionEffect GLEffect; - virtual const GrProgramStageFactory& getFactory() const SK_OVERRIDE; + virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE; virtual bool isEqual(const GrEffect&) const SK_OVERRIDE; private: @@ -281,7 +281,7 @@ private: class GrGLMatrixConvolutionEffect : public GrGLLegacyEffect { public: - GrGLMatrixConvolutionEffect(const GrProgramStageFactory& factory, + GrGLMatrixConvolutionEffect(const GrBackendEffectFactory& factory, const GrEffect& effect); virtual void setupVariables(GrGLShaderBuilder* builder) SK_OVERRIDE; virtual void emitVS(GrGLShaderBuilder* state, @@ -311,7 +311,7 @@ private: typedef GrGLLegacyEffect INHERITED; }; -GrGLMatrixConvolutionEffect::GrGLMatrixConvolutionEffect(const GrProgramStageFactory& factory, +GrGLMatrixConvolutionEffect::GrGLMatrixConvolutionEffect(const GrBackendEffectFactory& factory, const GrEffect& effect) : INHERITED(factory) , fKernelUni(GrGLUniformManager::kInvalidUniformHandle) @@ -469,8 +469,8 @@ GrMatrixConvolutionEffect::~GrMatrixConvolutionEffect() { delete[] fKernel; } -const GrProgramStageFactory& GrMatrixConvolutionEffect::getFactory() const { - return GrTProgramStageFactory<GrMatrixConvolutionEffect>::getInstance(); +const GrBackendEffectFactory& GrMatrixConvolutionEffect::getFactory() const { + return GrTBackendEffectFactory<GrMatrixConvolutionEffect>::getInstance(); } bool GrMatrixConvolutionEffect::isEqual(const GrEffect& sBase) const { diff --git a/src/effects/SkMorphologyImageFilter.cpp b/src/effects/SkMorphologyImageFilter.cpp index 8eaf86a152..d623c6f059 100644 --- a/src/effects/SkMorphologyImageFilter.cpp +++ b/src/effects/SkMorphologyImageFilter.cpp @@ -251,7 +251,7 @@ public: typedef GrGLMorphologyEffect GLEffect; - virtual const GrProgramStageFactory& getFactory() const SK_OVERRIDE; + virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE; virtual bool isEqual(const GrEffect&) const SK_OVERRIDE; protected: @@ -268,7 +268,7 @@ private: class GrGLMorphologyEffect : public GrGLLegacyEffect { public: - GrGLMorphologyEffect (const GrProgramStageFactory& factory, + GrGLMorphologyEffect (const GrBackendEffectFactory& factory, const GrEffect& effect); virtual void setupVariables(GrGLShaderBuilder* builder) SK_OVERRIDE; @@ -293,7 +293,7 @@ private: typedef GrGLLegacyEffect INHERITED; }; -GrGLMorphologyEffect::GrGLMorphologyEffect(const GrProgramStageFactory& factory, +GrGLMorphologyEffect::GrGLMorphologyEffect(const GrBackendEffectFactory& factory, const GrEffect& effect) : INHERITED(factory) , fImageIncrementUni(GrGLUniformManager::kInvalidUniformHandle) { @@ -383,8 +383,8 @@ GrMorphologyEffect::GrMorphologyEffect(GrTexture* texture, GrMorphologyEffect::~GrMorphologyEffect() { } -const GrProgramStageFactory& GrMorphologyEffect::getFactory() const { - return GrTProgramStageFactory<GrMorphologyEffect>::getInstance(); +const GrBackendEffectFactory& GrMorphologyEffect::getFactory() const { + return GrTBackendEffectFactory<GrMorphologyEffect>::getInstance(); } bool GrMorphologyEffect::isEqual(const GrEffect& sBase) const { diff --git a/src/effects/SkTableColorFilter.cpp b/src/effects/SkTableColorFilter.cpp index 39e37621e9..fe90f022f1 100644 --- a/src/effects/SkTableColorFilter.cpp +++ b/src/effects/SkTableColorFilter.cpp @@ -229,7 +229,7 @@ public: virtual ~ColorTableEffect(); static const char* Name() { return "ColorTable"; } - virtual const GrProgramStageFactory& getFactory() const SK_OVERRIDE; + virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE; virtual bool isEqual(const GrEffect&) const SK_OVERRIDE; virtual const GrTextureAccess& textureAccess(int index) const SK_OVERRIDE; @@ -246,7 +246,7 @@ private: class GLColorTableEffect : public GrGLLegacyEffect { public: - GLColorTableEffect(const GrProgramStageFactory& factory, + GLColorTableEffect(const GrBackendEffectFactory& factory, const GrEffect& effect); virtual void setupVariables(GrGLShaderBuilder* state) SK_OVERRIDE {} @@ -267,7 +267,7 @@ private: }; GLColorTableEffect::GLColorTableEffect( - const GrProgramStageFactory& factory, const GrEffect& effect) + const GrBackendEffectFactory& factory, const GrEffect& effect) : INHERITED(factory) { } @@ -327,8 +327,8 @@ ColorTableEffect::ColorTableEffect(GrTexture* texture) ColorTableEffect::~ColorTableEffect() { } -const GrProgramStageFactory& ColorTableEffect::getFactory() const { - return GrTProgramStageFactory<ColorTableEffect>::getInstance(); +const GrBackendEffectFactory& ColorTableEffect::getFactory() const { + return GrTBackendEffectFactory<ColorTableEffect>::getInstance(); } bool ColorTableEffect::isEqual(const GrEffect& sBase) const { diff --git a/src/effects/gradients/SkGradientShader.cpp b/src/effects/gradients/SkGradientShader.cpp index 079623a02e..dfef878a33 100644 --- a/src/effects/gradients/SkGradientShader.cpp +++ b/src/effects/gradients/SkGradientShader.cpp @@ -675,7 +675,7 @@ SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END #include "effects/GrTextureStripAtlas.h" #include "SkGr.h" -GrGLGradientStage::GrGLGradientStage(const GrProgramStageFactory& factory) +GrGLGradientStage::GrGLGradientStage(const GrBackendEffectFactory& factory) : INHERITED(factory) , fCachedYCoord(GR_ScalarMax) , fFSYUni(GrGLUniformManager::kInvalidUniformHandle) { } diff --git a/src/effects/gradients/SkGradientShaderPriv.h b/src/effects/gradients/SkGradientShaderPriv.h index c24b3cb6f5..04f1aa1233 100644 --- a/src/effects/gradients/SkGradientShaderPriv.h +++ b/src/effects/gradients/SkGradientShaderPriv.h @@ -195,7 +195,7 @@ private: #include "gl/GrGLEffect.h" class GrSamplerState; -class GrProgramStageFactory; +class GrBackendEffectFactory; /* * The intepretation of the texture matrix depends on the sample mode. The @@ -274,7 +274,7 @@ private: class GrGLGradientStage : public GrGLLegacyEffect { public: - GrGLGradientStage(const GrProgramStageFactory& factory); + GrGLGradientStage(const GrBackendEffectFactory& factory); virtual ~GrGLGradientStage(); virtual void setupVariables(GrGLShaderBuilder* builder) SK_OVERRIDE; diff --git a/src/effects/gradients/SkLinearGradient.cpp b/src/effects/gradients/SkLinearGradient.cpp index 26079c3b27..1154d13f32 100644 --- a/src/effects/gradients/SkLinearGradient.cpp +++ b/src/effects/gradients/SkLinearGradient.cpp @@ -479,7 +479,7 @@ void SkLinearGradient::shadeSpan16(int x, int y, class GrGLLinearGradient : public GrGLGradientStage { public: - GrGLLinearGradient(const GrProgramStageFactory& factory, + GrGLLinearGradient(const GrBackendEffectFactory& factory, const GrEffect&) : INHERITED (factory) { } @@ -508,8 +508,8 @@ public: virtual ~GrLinearGradient() { } static const char* Name() { return "Linear Gradient"; } - const GrProgramStageFactory& getFactory() const SK_OVERRIDE { - return GrTProgramStageFactory<GrLinearGradient>::getInstance(); + const GrBackendEffectFactory& getFactory() const SK_OVERRIDE { + return GrTBackendEffectFactory<GrLinearGradient>::getInstance(); } typedef GrGLLinearGradient GLEffect; diff --git a/src/effects/gradients/SkRadialGradient.cpp b/src/effects/gradients/SkRadialGradient.cpp index 6cbc412c43..dac1dc070b 100644 --- a/src/effects/gradients/SkRadialGradient.cpp +++ b/src/effects/gradients/SkRadialGradient.cpp @@ -476,7 +476,7 @@ void SkRadialGradient::shadeSpan(int x, int y, class GrGLRadialGradient : public GrGLGradientStage { public: - GrGLRadialGradient(const GrProgramStageFactory& factory, + GrGLRadialGradient(const GrBackendEffectFactory& factory, const GrEffect&) : INHERITED (factory) { } virtual ~GrGLRadialGradient() { } @@ -507,8 +507,8 @@ public: virtual ~GrRadialGradient() { } static const char* Name() { return "Radial Gradient"; } - virtual const GrProgramStageFactory& getFactory() const SK_OVERRIDE { - return GrTProgramStageFactory<GrRadialGradient>::getInstance(); + virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE { + return GrTBackendEffectFactory<GrRadialGradient>::getInstance(); } typedef GrGLRadialGradient GLEffect; diff --git a/src/effects/gradients/SkSweepGradient.cpp b/src/effects/gradients/SkSweepGradient.cpp index 4b7ea8822b..768f59d5de 100644 --- a/src/effects/gradients/SkSweepGradient.cpp +++ b/src/effects/gradients/SkSweepGradient.cpp @@ -385,7 +385,7 @@ void SkSweepGradient::shadeSpan16(int x, int y, uint16_t* SK_RESTRICT dstC, class GrGLSweepGradient : public GrGLGradientStage { public: - GrGLSweepGradient(const GrProgramStageFactory& factory, + GrGLSweepGradient(const GrBackendEffectFactory& factory, const GrEffect&) : INHERITED (factory) { } virtual ~GrGLSweepGradient() { } @@ -415,8 +415,8 @@ public: virtual ~GrSweepGradient() { } static const char* Name() { return "Sweep Gradient"; } - virtual const GrProgramStageFactory& getFactory() const SK_OVERRIDE { - return GrTProgramStageFactory<GrSweepGradient>::getInstance(); + virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE { + return GrTBackendEffectFactory<GrSweepGradient>::getInstance(); } typedef GrGLSweepGradient GLEffect; diff --git a/src/effects/gradients/SkTwoPointConicalGradient.cpp b/src/effects/gradients/SkTwoPointConicalGradient.cpp index e1a7cf5f97..4150d2cdf6 100644 --- a/src/effects/gradients/SkTwoPointConicalGradient.cpp +++ b/src/effects/gradients/SkTwoPointConicalGradient.cpp @@ -322,7 +322,7 @@ static const UniformHandle kInvalidUniformHandle = GrGLUniformManager::kInvalidU class GrGLConical2Gradient : public GrGLGradientStage { public: - GrGLConical2Gradient(const GrProgramStageFactory& factory, + GrGLConical2Gradient(const GrBackendEffectFactory& factory, const GrEffect&); virtual ~GrGLConical2Gradient() { } @@ -378,8 +378,8 @@ public: virtual ~GrConical2Gradient() { } static const char* Name() { return "Two-Point Conical Gradient"; } - virtual const GrProgramStageFactory& getFactory() const SK_OVERRIDE { - return GrTProgramStageFactory<GrConical2Gradient>::getInstance(); + virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE { + return GrTBackendEffectFactory<GrConical2Gradient>::getInstance(); } virtual bool isEqual(const GrEffect& sBase) const SK_OVERRIDE { const GrConical2Gradient& s = static_cast<const GrConical2Gradient&>(sBase); @@ -449,7 +449,7 @@ GrEffect* GrConical2Gradient::TestCreate(SkRandom* random, ///////////////////////////////////////////////////////////////////// GrGLConical2Gradient::GrGLConical2Gradient( - const GrProgramStageFactory& factory, + const GrBackendEffectFactory& factory, const GrEffect& baseData) : INHERITED(factory) , fVSParamUni(kInvalidUniformHandle) diff --git a/src/effects/gradients/SkTwoPointRadialGradient.cpp b/src/effects/gradients/SkTwoPointRadialGradient.cpp index adca94f17e..e36727611c 100644 --- a/src/effects/gradients/SkTwoPointRadialGradient.cpp +++ b/src/effects/gradients/SkTwoPointRadialGradient.cpp @@ -357,7 +357,7 @@ class GrGLRadial2Gradient : public GrGLGradientStage { public: - GrGLRadial2Gradient(const GrProgramStageFactory& factory, + GrGLRadial2Gradient(const GrBackendEffectFactory& factory, const GrEffect&); virtual ~GrGLRadial2Gradient() { } @@ -410,8 +410,8 @@ public: virtual ~GrRadial2Gradient() { } static const char* Name() { return "Two-Point Radial Gradient"; } - virtual const GrProgramStageFactory& getFactory() const SK_OVERRIDE { - return GrTProgramStageFactory<GrRadial2Gradient>::getInstance(); + virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE { + return GrTBackendEffectFactory<GrRadial2Gradient>::getInstance(); } virtual bool isEqual(const GrEffect& sBase) const SK_OVERRIDE { const GrRadial2Gradient& s = static_cast<const GrRadial2Gradient&>(sBase); @@ -482,7 +482,7 @@ GrEffect* GrRadial2Gradient::TestCreate(SkRandom* random, ///////////////////////////////////////////////////////////////////// GrGLRadial2Gradient::GrGLRadial2Gradient( - const GrProgramStageFactory& factory, + const GrBackendEffectFactory& factory, const GrEffect& baseData) : INHERITED(factory) , fVSParamUni(kInvalidUniformHandle) diff --git a/src/gpu/GrEffect.cpp b/src/gpu/GrEffect.cpp index 396f5d1058..6423aef5dc 100644 --- a/src/gpu/GrEffect.cpp +++ b/src/gpu/GrEffect.cpp @@ -35,7 +35,7 @@ private: } }; -int32_t GrProgramStageFactory::fCurrEffectClassID = GrProgramStageFactory::kIllegalEffectClassID; +int32_t GrBackendEffectFactory::fCurrEffectClassID = GrBackendEffectFactory::kIllegalEffectClassID; GrEffect::GrEffect(int numTextures) : fNumTextures(numTextures) { diff --git a/src/gpu/effects/GrConfigConversionEffect.cpp b/src/gpu/effects/GrConfigConversionEffect.cpp index b09c8eab09..652c6bc292 100644 --- a/src/gpu/effects/GrConfigConversionEffect.cpp +++ b/src/gpu/effects/GrConfigConversionEffect.cpp @@ -10,7 +10,7 @@ class GrGLConfigConversionEffect : public GrGLLegacyEffect { public: - GrGLConfigConversionEffect(const GrProgramStageFactory& factory, + GrGLConfigConversionEffect(const GrBackendEffectFactory& factory, const GrEffect& s) : INHERITED (factory) { const GrConfigConversionEffect& effect = static_cast<const GrConfigConversionEffect&>(s); fSwapRedAndBlue = effect.swapsRedAndBlue(); @@ -85,8 +85,8 @@ GrConfigConversionEffect::GrConfigConversionEffect(GrTexture* texture, GrAssert(swapRedAndBlue || kNone_PMConversion != pmConversion); } -const GrProgramStageFactory& GrConfigConversionEffect::getFactory() const { - return GrTProgramStageFactory<GrConfigConversionEffect>::getInstance(); +const GrBackendEffectFactory& GrConfigConversionEffect::getFactory() const { + return GrTBackendEffectFactory<GrConfigConversionEffect>::getInstance(); } bool GrConfigConversionEffect::isEqual(const GrEffect& s) const { diff --git a/src/gpu/effects/GrConfigConversionEffect.h b/src/gpu/effects/GrConfigConversionEffect.h index 9a014353f6..7c5f03fa2b 100644 --- a/src/gpu/effects/GrConfigConversionEffect.h +++ b/src/gpu/effects/GrConfigConversionEffect.h @@ -41,7 +41,7 @@ public: static const char* Name() { return "Config Conversion"; } typedef GrGLConfigConversionEffect GLEffect; - virtual const GrProgramStageFactory& getFactory() const SK_OVERRIDE; + virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE; virtual bool isEqual(const GrEffect&) const SK_OVERRIDE; bool swapsRedAndBlue() const { return fSwapRedAndBlue; } diff --git a/src/gpu/effects/GrConvolutionEffect.cpp b/src/gpu/effects/GrConvolutionEffect.cpp index 0afdbb8a81..4c42987d93 100644 --- a/src/gpu/effects/GrConvolutionEffect.cpp +++ b/src/gpu/effects/GrConvolutionEffect.cpp @@ -9,7 +9,7 @@ #include "gl/GrGLEffect.h" #include "gl/GrGLSL.h" #include "gl/GrGLTexture.h" -#include "GrProgramStageFactory.h" +#include "GrBackendEffectFactory.h" // For brevity typedef GrGLUniformManager::UniformHandle UniformHandle; @@ -17,7 +17,7 @@ static const UniformHandle kInvalidUniformHandle = GrGLUniformManager::kInvalidU class GrGLConvolutionEffect : public GrGLLegacyEffect { public: - GrGLConvolutionEffect(const GrProgramStageFactory&, const GrEffect&); + GrGLConvolutionEffect(const GrBackendEffectFactory&, const GrEffect&); virtual void setupVariables(GrGLShaderBuilder* builder) SK_OVERRIDE; virtual void emitVS(GrGLShaderBuilder* builder, @@ -41,7 +41,7 @@ private: typedef GrGLLegacyEffect INHERITED; }; -GrGLConvolutionEffect::GrGLConvolutionEffect(const GrProgramStageFactory& factory, +GrGLConvolutionEffect::GrGLConvolutionEffect(const GrBackendEffectFactory& factory, const GrEffect& effect) : INHERITED(factory) , fKernelUni(kInvalidUniformHandle) @@ -156,8 +156,8 @@ GrConvolutionEffect::GrConvolutionEffect(GrTexture* texture, GrConvolutionEffect::~GrConvolutionEffect() { } -const GrProgramStageFactory& GrConvolutionEffect::getFactory() const { - return GrTProgramStageFactory<GrConvolutionEffect>::getInstance(); +const GrBackendEffectFactory& GrConvolutionEffect::getFactory() const { + return GrTBackendEffectFactory<GrConvolutionEffect>::getInstance(); } bool GrConvolutionEffect::isEqual(const GrEffect& sBase) const { diff --git a/src/gpu/effects/GrConvolutionEffect.h b/src/gpu/effects/GrConvolutionEffect.h index a719c77517..5ff6d16c8a 100644 --- a/src/gpu/effects/GrConvolutionEffect.h +++ b/src/gpu/effects/GrConvolutionEffect.h @@ -36,7 +36,7 @@ public: typedef GrGLConvolutionEffect GLEffect; - virtual const GrProgramStageFactory& getFactory() const SK_OVERRIDE; + virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE; virtual bool isEqual(const GrEffect&) const SK_OVERRIDE; enum { diff --git a/src/gpu/effects/GrSingleTextureEffect.cpp b/src/gpu/effects/GrSingleTextureEffect.cpp index 03a36f6aaf..0ba748c3f0 100644 --- a/src/gpu/effects/GrSingleTextureEffect.cpp +++ b/src/gpu/effects/GrSingleTextureEffect.cpp @@ -9,12 +9,12 @@ #include "gl/GrGLEffect.h" #include "gl/GrGLSL.h" #include "gl/GrGLTexture.h" -#include "GrProgramStageFactory.h" +#include "GrBackendEffectFactory.h" #include "GrTexture.h" class GrGLSingleTextureEffect : public GrGLLegacyEffect { public: - GrGLSingleTextureEffect(const GrProgramStageFactory& factory, const GrEffect&) + GrGLSingleTextureEffect(const GrBackendEffectFactory& factory, const GrEffect&) : INHERITED (factory) { } @@ -61,8 +61,8 @@ const GrTextureAccess& GrSingleTextureEffect::textureAccess(int index) const { return fTextureAccess; } -const GrProgramStageFactory& GrSingleTextureEffect::getFactory() const { - return GrTProgramStageFactory<GrSingleTextureEffect>::getInstance(); +const GrBackendEffectFactory& GrSingleTextureEffect::getFactory() const { + return GrTBackendEffectFactory<GrSingleTextureEffect>::getInstance(); } /////////////////////////////////////////////////////////////////////////////// diff --git a/src/gpu/effects/GrSingleTextureEffect.h b/src/gpu/effects/GrSingleTextureEffect.h index 64066bfaaa..346a6f48d8 100644 --- a/src/gpu/effects/GrSingleTextureEffect.h +++ b/src/gpu/effects/GrSingleTextureEffect.h @@ -34,7 +34,7 @@ public: typedef GrGLSingleTextureEffect GLEffect; - virtual const GrProgramStageFactory& getFactory() const SK_OVERRIDE; + virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE; private: GR_DECLARE_EFFECT_TEST; diff --git a/src/gpu/effects/GrTextureDomainEffect.cpp b/src/gpu/effects/GrTextureDomainEffect.cpp index c7a9eb215c..bfbab2995f 100644 --- a/src/gpu/effects/GrTextureDomainEffect.cpp +++ b/src/gpu/effects/GrTextureDomainEffect.cpp @@ -7,11 +7,11 @@ #include "GrTextureDomainEffect.h" #include "gl/GrGLEffect.h" -#include "GrProgramStageFactory.h" +#include "GrBackendEffectFactory.h" class GrGLTextureDomainEffect : public GrGLLegacyEffect { public: - GrGLTextureDomainEffect(const GrProgramStageFactory&, const GrEffect&); + GrGLTextureDomainEffect(const GrBackendEffectFactory&, const GrEffect&); virtual void setupVariables(GrGLShaderBuilder* builder) SK_OVERRIDE; virtual void emitVS(GrGLShaderBuilder* builder, @@ -31,7 +31,7 @@ private: typedef GrGLLegacyEffect INHERITED; }; -GrGLTextureDomainEffect::GrGLTextureDomainEffect(const GrProgramStageFactory& factory, +GrGLTextureDomainEffect::GrGLTextureDomainEffect(const GrBackendEffectFactory& factory, const GrEffect&) : INHERITED(factory) , fNameUni(GrGLUniformManager::kInvalidUniformHandle) { @@ -100,8 +100,8 @@ GrTextureDomainEffect::~GrTextureDomainEffect() { } -const GrProgramStageFactory& GrTextureDomainEffect::getFactory() const { - return GrTProgramStageFactory<GrTextureDomainEffect>::getInstance(); +const GrBackendEffectFactory& GrTextureDomainEffect::getFactory() const { + return GrTBackendEffectFactory<GrTextureDomainEffect>::getInstance(); } bool GrTextureDomainEffect::isEqual(const GrEffect& sBase) const { diff --git a/src/gpu/effects/GrTextureDomainEffect.h b/src/gpu/effects/GrTextureDomainEffect.h index 520e90fdf7..322f8d05cf 100644 --- a/src/gpu/effects/GrTextureDomainEffect.h +++ b/src/gpu/effects/GrTextureDomainEffect.h @@ -30,7 +30,7 @@ public: typedef GrGLTextureDomainEffect GLEffect; - virtual const GrProgramStageFactory& getFactory() const SK_OVERRIDE; + virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE; virtual bool isEqual(const GrEffect&) const SK_OVERRIDE; const GrRect& domain() const { return fTextureDomain; } diff --git a/src/gpu/gl/GrGLEffect.cpp b/src/gpu/gl/GrGLEffect.cpp index eb11909060..3f8417c448 100644 --- a/src/gpu/gl/GrGLEffect.cpp +++ b/src/gpu/gl/GrGLEffect.cpp @@ -8,7 +8,7 @@ #include "GrGLSL.h" #include "GrGLEffect.h" -GrGLEffect::GrGLEffect(const GrProgramStageFactory& factory) +GrGLEffect::GrGLEffect(const GrBackendEffectFactory& factory) : fFactory(factory) { } diff --git a/src/gpu/gl/GrGLEffect.h b/src/gpu/gl/GrGLEffect.h index 5ac4f3c19c..404f275b30 100644 --- a/src/gpu/gl/GrGLEffect.h +++ b/src/gpu/gl/GrGLEffect.h @@ -36,12 +36,12 @@ public: typedef GrEffect::StageKey StageKey; enum { // the number of bits in StageKey available to GenKey - kProgramStageKeyBits = GrProgramStageFactory::kProgramStageKeyBits, + kProgramStageKeyBits = GrBackendEffectFactory::kProgramStageKeyBits, }; typedef GrGLShaderBuilder::TextureSamplerArray TextureSamplerArray; - GrGLEffect(const GrProgramStageFactory&); + GrGLEffect(const GrBackendEffectFactory&); virtual ~GrGLEffect(); @@ -85,7 +85,7 @@ public: protected: - const GrProgramStageFactory& fFactory; + const GrBackendEffectFactory& fFactory; }; /** @@ -95,7 +95,7 @@ protected: */ class GrGLLegacyEffect : public GrGLEffect { public: - GrGLLegacyEffect(const GrProgramStageFactory& factory) : GrGLEffect(factory) {} + GrGLLegacyEffect(const GrBackendEffectFactory& factory) : GrGLEffect(factory) {} virtual void setupVariables(GrGLShaderBuilder* builder) {}; virtual void emitVS(GrGLShaderBuilder* builder, diff --git a/src/gpu/gl/GrGLProgram.cpp b/src/gpu/gl/GrGLProgram.cpp index e817c1afc3..cbcd2d5057 100644 --- a/src/gpu/gl/GrGLProgram.cpp +++ b/src/gpu/gl/GrGLProgram.cpp @@ -12,7 +12,7 @@ #include "GrGLEffect.h" #include "gl/GrGLShaderBuilder.h" #include "GrGLShaderVar.h" -#include "GrProgramStageFactory.h" +#include "GrBackendEffectFactory.h" #include "SkTrace.h" #include "SkXfermode.h" diff --git a/src/gpu/gl/GrGLProgram.h b/src/gpu/gl/GrGLProgram.h index 91239acaa9..57c6d22a63 100644 --- a/src/gpu/gl/GrGLProgram.h +++ b/src/gpu/gl/GrGLProgram.h @@ -98,7 +98,7 @@ public: /** Non-zero if user-supplied code will write the stage's contribution to the fragment shader. */ - GrProgramStageFactory::StageKey fCustomStageKey; + GrBackendEffectFactory::StageKey fCustomStageKey; inline bool isEnabled() const { return SkToBool(fOptFlags & kIsEnabled_OptFlagBit); diff --git a/src/gpu/gl/GrGpuGL_program.cpp b/src/gpu/gl/GrGpuGL_program.cpp index c6a8e90f0b..dfb1123a3a 100644 --- a/src/gpu/gl/GrGpuGL_program.cpp +++ b/src/gpu/gl/GrGpuGL_program.cpp @@ -572,7 +572,7 @@ void setup_effect(GrGLProgram::Desc::StageDesc* stage, GrGLProgram* program, int index) { const GrEffect* effect = sampler.getEffect(); if (effect) { - const GrProgramStageFactory& factory = effect->getFactory(); + const GrBackendEffectFactory& factory = effect->getFactory(); stage->fCustomStageKey = factory.glStageKey(*effect, caps); effects[index] = effect; } else { |