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/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; }