Rename GrProgramStageFactory to GrBackendEffectFactory.
Review URL: https://codereview.appspot.com/6773044
git-svn-id: http://skia.googlecode.com/svn/trunk@6125 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/effects/SkBlendImageFilter.cpp b/src/effects/SkBlendImageFilter.cpp
index 60f334a..10104cc 100644
--- a/src/effects/SkBlendImageFilter.cpp
+++ b/src/effects/SkBlendImageFilter.cpp
@@ -112,7 +112,7 @@
#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 @@
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 @@
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 ae9cfb0..5e2b960 100644
--- a/src/effects/SkColorMatrixFilter.cpp
+++ b/src/effects/SkColorMatrixFilter.cpp
@@ -328,8 +328,8 @@
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 @@
// 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 67403bc..8464f6e 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 @@
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 @@
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 @@
class GrGLLightingEffect : public GrGLLegacyEffect {
public:
- GrGLLightingEffect(const GrProgramStageFactory& factory,
+ GrGLLightingEffect(const GrBackendEffectFactory& factory,
const GrEffect& effect);
virtual ~GrGLLightingEffect();
@@ -971,7 +971,7 @@
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 @@
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 @@
: 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 @@
///////////////////////////////////////////////////////////////////////////////
-GrGLLightingEffect::GrGLLightingEffect(const GrProgramStageFactory& factory,
+GrGLLightingEffect::GrGLLightingEffect(const GrBackendEffectFactory& factory,
const GrEffect& effect)
: INHERITED(factory)
, fImageIncrementUni(kInvalidUniformHandle)
@@ -1187,7 +1187,7 @@
///////////////////////////////////////////////////////////////////////////////
-GrGLDiffuseLightingEffect::GrGLDiffuseLightingEffect(const GrProgramStageFactory& factory,
+GrGLDiffuseLightingEffect::GrGLDiffuseLightingEffect(const GrBackendEffectFactory& factory,
const GrEffect& effect)
: INHERITED(factory, effect)
, fKDUni(kInvalidUniformHandle) {
@@ -1232,8 +1232,8 @@
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 @@
///////////////////////////////////////////////////////////////////////////////
-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 187fbe7..67ae13c 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 @@
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 @@
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 @@
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 @@
///////////////////////////////////////////////////////////////////////////////
-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 607d8c8..c650539 100644
--- a/src/effects/SkMatrixConvolutionImageFilter.cpp
+++ b/src/effects/SkMatrixConvolutionImageFilter.cpp
@@ -262,7 +262,7 @@
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 @@
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 @@
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 @@
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 8eaf86a..d623c6f 100644
--- a/src/effects/SkMorphologyImageFilter.cpp
+++ b/src/effects/SkMorphologyImageFilter.cpp
@@ -251,7 +251,7 @@
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 @@
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 @@
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() {
}
-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 39e3762..fe90f02 100644
--- a/src/effects/SkTableColorFilter.cpp
+++ b/src/effects/SkTableColorFilter.cpp
@@ -229,7 +229,7 @@
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 @@
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 @@
};
GLColorTableEffect::GLColorTableEffect(
- const GrProgramStageFactory& factory, const GrEffect& effect)
+ const GrBackendEffectFactory& factory, const GrEffect& effect)
: INHERITED(factory) {
}
@@ -327,8 +327,8 @@
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 079623a..dfef878 100644
--- a/src/effects/gradients/SkGradientShader.cpp
+++ b/src/effects/gradients/SkGradientShader.cpp
@@ -675,7 +675,7 @@
#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 c24b3cb..04f1aa1 100644
--- a/src/effects/gradients/SkGradientShaderPriv.h
+++ b/src/effects/gradients/SkGradientShaderPriv.h
@@ -195,7 +195,7 @@
#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 @@
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 26079c3..1154d13 100644
--- a/src/effects/gradients/SkLinearGradient.cpp
+++ b/src/effects/gradients/SkLinearGradient.cpp
@@ -479,7 +479,7 @@
class GrGLLinearGradient : public GrGLGradientStage {
public:
- GrGLLinearGradient(const GrProgramStageFactory& factory,
+ GrGLLinearGradient(const GrBackendEffectFactory& factory,
const GrEffect&)
: INHERITED (factory) { }
@@ -508,8 +508,8 @@
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 6cbc412..dac1dc0 100644
--- a/src/effects/gradients/SkRadialGradient.cpp
+++ b/src/effects/gradients/SkRadialGradient.cpp
@@ -476,7 +476,7 @@
class GrGLRadialGradient : public GrGLGradientStage {
public:
- GrGLRadialGradient(const GrProgramStageFactory& factory,
+ GrGLRadialGradient(const GrBackendEffectFactory& factory,
const GrEffect&) : INHERITED (factory) { }
virtual ~GrGLRadialGradient() { }
@@ -507,8 +507,8 @@
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 4b7ea88..768f59d 100644
--- a/src/effects/gradients/SkSweepGradient.cpp
+++ b/src/effects/gradients/SkSweepGradient.cpp
@@ -385,7 +385,7 @@
class GrGLSweepGradient : public GrGLGradientStage {
public:
- GrGLSweepGradient(const GrProgramStageFactory& factory,
+ GrGLSweepGradient(const GrBackendEffectFactory& factory,
const GrEffect&) : INHERITED (factory) { }
virtual ~GrGLSweepGradient() { }
@@ -415,8 +415,8 @@
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 e1a7cf5..4150d2c 100644
--- a/src/effects/gradients/SkTwoPointConicalGradient.cpp
+++ b/src/effects/gradients/SkTwoPointConicalGradient.cpp
@@ -322,7 +322,7 @@
class GrGLConical2Gradient : public GrGLGradientStage {
public:
- GrGLConical2Gradient(const GrProgramStageFactory& factory,
+ GrGLConical2Gradient(const GrBackendEffectFactory& factory,
const GrEffect&);
virtual ~GrGLConical2Gradient() { }
@@ -378,8 +378,8 @@
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 @@
/////////////////////////////////////////////////////////////////////
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 adca94f..e367276 100644
--- a/src/effects/gradients/SkTwoPointRadialGradient.cpp
+++ b/src/effects/gradients/SkTwoPointRadialGradient.cpp
@@ -357,7 +357,7 @@
public:
- GrGLRadial2Gradient(const GrProgramStageFactory& factory,
+ GrGLRadial2Gradient(const GrBackendEffectFactory& factory,
const GrEffect&);
virtual ~GrGLRadial2Gradient() { }
@@ -410,8 +410,8 @@
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 @@
/////////////////////////////////////////////////////////////////////
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 396f5d1..6423aef 100644
--- a/src/gpu/GrEffect.cpp
+++ b/src/gpu/GrEffect.cpp
@@ -35,7 +35,7 @@
}
};
-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 b09c8ea..652c6bc 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 @@
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 9a01435..7c5f03f 100644
--- a/src/gpu/effects/GrConfigConversionEffect.h
+++ b/src/gpu/effects/GrConfigConversionEffect.h
@@ -41,7 +41,7 @@
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 0afdbb8..4c42987 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 @@
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 @@
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() {
}
-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 a719c77..5ff6d16 100644
--- a/src/gpu/effects/GrConvolutionEffect.h
+++ b/src/gpu/effects/GrConvolutionEffect.h
@@ -36,7 +36,7 @@
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 03a36f6..0ba748c 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 @@
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 64066bf..346a6f4 100644
--- a/src/gpu/effects/GrSingleTextureEffect.h
+++ b/src/gpu/effects/GrSingleTextureEffect.h
@@ -34,7 +34,7 @@
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 c7a9eb2..bfbab29 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 @@
typedef GrGLLegacyEffect INHERITED;
};
-GrGLTextureDomainEffect::GrGLTextureDomainEffect(const GrProgramStageFactory& factory,
+GrGLTextureDomainEffect::GrGLTextureDomainEffect(const GrBackendEffectFactory& factory,
const GrEffect&)
: INHERITED(factory)
, fNameUni(GrGLUniformManager::kInvalidUniformHandle) {
@@ -100,8 +100,8 @@
}
-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 520e90f..322f8d0 100644
--- a/src/gpu/effects/GrTextureDomainEffect.h
+++ b/src/gpu/effects/GrTextureDomainEffect.h
@@ -30,7 +30,7 @@
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 eb11909..3f8417c 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 5ac4f3c..404f275 100644
--- a/src/gpu/gl/GrGLEffect.h
+++ b/src/gpu/gl/GrGLEffect.h
@@ -36,12 +36,12 @@
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 @@
protected:
- const GrProgramStageFactory& fFactory;
+ const GrBackendEffectFactory& fFactory;
};
/**
@@ -95,7 +95,7 @@
*/
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 e817c1a..cbcd2d5 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 91239ac..57c6d22 100644
--- a/src/gpu/gl/GrGLProgram.h
+++ b/src/gpu/gl/GrGLProgram.h
@@ -98,7 +98,7 @@
/** 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 c6a8e90..dfb1123 100644
--- a/src/gpu/gl/GrGpuGL_program.cpp
+++ b/src/gpu/gl/GrGpuGL_program.cpp
@@ -572,7 +572,7 @@
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 {