GrGLProgramStage Renaming Part 3
s/GLProgramStage/GLEffect
minor whitespace/spelling fixup
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6767054
git-svn-id: http://skia.googlecode.com/svn/trunk@6095 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/effects/SkBlendImageFilter.cpp b/src/effects/SkBlendImageFilter.cpp
index 9722684..60f334a 100644
--- a/src/effects/SkBlendImageFilter.cpp
+++ b/src/effects/SkBlendImageFilter.cpp
@@ -142,7 +142,7 @@
const GrProgramStageFactory& getFactory() const;
SkBlendImageFilter::Mode mode() const { return fMode; }
- typedef GrGLBlendEffect GLProgramStage;
+ typedef GrGLBlendEffect GLEffect;
static const char* Name() { return "Blend"; }
private:
diff --git a/src/effects/SkColorMatrixFilter.cpp b/src/effects/SkColorMatrixFilter.cpp
index b7d479a..ae9cfb0 100644
--- a/src/effects/SkColorMatrixFilter.cpp
+++ b/src/effects/SkColorMatrixFilter.cpp
@@ -339,13 +339,13 @@
GR_DECLARE_EFFECT_TEST;
- class GLProgramStage : public GrGLLegacyEffect {
+ class GLEffect : public GrGLLegacyEffect {
public:
// this class always generates the same code.
static StageKey GenKey(const GrEffect& s, const GrGLCaps&) { return 0; }
- GLProgramStage(const GrProgramStageFactory& factory,
- const GrEffect& effect)
+ GLEffect(const GrProgramStageFactory& factory,
+ const GrEffect& effect)
: INHERITED(factory)
, fMatrixHandle(GrGLUniformManager::kInvalidUniformHandle)
, fVectorHandle(GrGLUniformManager::kInvalidUniformHandle) {
diff --git a/src/effects/SkLightingImageFilter.cpp b/src/effects/SkLightingImageFilter.cpp
index 53a3ac9..67403bc 100644
--- a/src/effects/SkLightingImageFilter.cpp
+++ b/src/effects/SkLightingImageFilter.cpp
@@ -326,7 +326,7 @@
static const char* Name() { return "DiffuseLighting"; }
- typedef GrGLDiffuseLightingEffect GLProgramStage;
+ typedef GrGLDiffuseLightingEffect GLEffect;
virtual const GrProgramStageFactory& getFactory() const SK_OVERRIDE;
virtual bool isEqual(const GrEffect&) const SK_OVERRIDE;
@@ -347,7 +347,7 @@
static const char* Name() { return "SpecularLighting"; }
- typedef GrGLSpecularLightingEffect GLProgramStage;
+ typedef GrGLSpecularLightingEffect GLEffect;
virtual const GrProgramStageFactory& getFactory() const SK_OVERRIDE;
virtual bool isEqual(const GrEffect&) const SK_OVERRIDE;
diff --git a/src/effects/SkMagnifierImageFilter.cpp b/src/effects/SkMagnifierImageFilter.cpp
index 93ec733..187fbe7 100644
--- a/src/effects/SkMagnifierImageFilter.cpp
+++ b/src/effects/SkMagnifierImageFilter.cpp
@@ -54,7 +54,7 @@
float x_inset() const { return fXInset; }
float y_inset() const { return fYInset; }
- typedef GrGLMagnifierEffect GLProgramStage;
+ typedef GrGLMagnifierEffect GLEffect;
private:
GR_DECLARE_EFFECT_TEST;
diff --git a/src/effects/SkMatrixConvolutionImageFilter.cpp b/src/effects/SkMatrixConvolutionImageFilter.cpp
index b96d556..607d8c8 100644
--- a/src/effects/SkMatrixConvolutionImageFilter.cpp
+++ b/src/effects/SkMatrixConvolutionImageFilter.cpp
@@ -260,7 +260,7 @@
TileMode tileMode() const { return fTileMode; }
bool convolveAlpha() const { return fConvolveAlpha; }
- typedef GrGLMatrixConvolutionEffect GLProgramStage;
+ typedef GrGLMatrixConvolutionEffect GLEffect;
virtual const GrProgramStageFactory& getFactory() const SK_OVERRIDE;
virtual bool isEqual(const GrEffect&) const SK_OVERRIDE;
diff --git a/src/effects/SkMorphologyImageFilter.cpp b/src/effects/SkMorphologyImageFilter.cpp
index bc5bf46..8eaf86a 100644
--- a/src/effects/SkMorphologyImageFilter.cpp
+++ b/src/effects/SkMorphologyImageFilter.cpp
@@ -249,7 +249,7 @@
static const char* Name() { return "Morphology"; }
- typedef GrGLMorphologyEffect GLProgramStage;
+ typedef GrGLMorphologyEffect GLEffect;
virtual const GrProgramStageFactory& getFactory() const SK_OVERRIDE;
virtual bool isEqual(const GrEffect&) const SK_OVERRIDE;
diff --git a/src/effects/SkTableColorFilter.cpp b/src/effects/SkTableColorFilter.cpp
index 09c3ec1..39e3762 100644
--- a/src/effects/SkTableColorFilter.cpp
+++ b/src/effects/SkTableColorFilter.cpp
@@ -234,7 +234,7 @@
virtual const GrTextureAccess& textureAccess(int index) const SK_OVERRIDE;
- typedef GLColorTableEffect GLProgramStage;
+ typedef GLColorTableEffect GLEffect;
private:
GR_DECLARE_EFFECT_TEST;
diff --git a/src/effects/gradients/SkLinearGradient.cpp b/src/effects/gradients/SkLinearGradient.cpp
index 019dcbc..26079c3 100644
--- a/src/effects/gradients/SkLinearGradient.cpp
+++ b/src/effects/gradients/SkLinearGradient.cpp
@@ -512,7 +512,7 @@
return GrTProgramStageFactory<GrLinearGradient>::getInstance();
}
- typedef GrGLLinearGradient GLProgramStage;
+ typedef GrGLLinearGradient GLEffect;
private:
GR_DECLARE_EFFECT_TEST;
diff --git a/src/effects/gradients/SkRadialGradient.cpp b/src/effects/gradients/SkRadialGradient.cpp
index 04deeba..6cbc412 100644
--- a/src/effects/gradients/SkRadialGradient.cpp
+++ b/src/effects/gradients/SkRadialGradient.cpp
@@ -511,7 +511,7 @@
return GrTProgramStageFactory<GrRadialGradient>::getInstance();
}
- typedef GrGLRadialGradient GLProgramStage;
+ typedef GrGLRadialGradient GLEffect;
private:
GR_DECLARE_EFFECT_TEST;
diff --git a/src/effects/gradients/SkSweepGradient.cpp b/src/effects/gradients/SkSweepGradient.cpp
index 4f63f64..4b7ea88 100644
--- a/src/effects/gradients/SkSweepGradient.cpp
+++ b/src/effects/gradients/SkSweepGradient.cpp
@@ -419,7 +419,7 @@
return GrTProgramStageFactory<GrSweepGradient>::getInstance();
}
- typedef GrGLSweepGradient GLProgramStage;
+ typedef GrGLSweepGradient GLEffect;
private:
GR_DECLARE_EFFECT_TEST;
diff --git a/src/effects/gradients/SkTwoPointConicalGradient.cpp b/src/effects/gradients/SkTwoPointConicalGradient.cpp
index 13f3dbb..e1a7cf5 100644
--- a/src/effects/gradients/SkTwoPointConicalGradient.cpp
+++ b/src/effects/gradients/SkTwoPointConicalGradient.cpp
@@ -395,7 +395,7 @@
GrScalar diffRadius() const { return fDiffRadius; }
GrScalar radius() const { return fRadius0; }
- typedef GrGLConical2Gradient GLProgramStage;
+ typedef GrGLConical2Gradient GLEffect;
private:
GR_DECLARE_EFFECT_TEST;
diff --git a/src/effects/gradients/SkTwoPointRadialGradient.cpp b/src/effects/gradients/SkTwoPointRadialGradient.cpp
index d7651ff..adca94f 100644
--- a/src/effects/gradients/SkTwoPointRadialGradient.cpp
+++ b/src/effects/gradients/SkTwoPointRadialGradient.cpp
@@ -427,7 +427,7 @@
GrScalar radius() const { return fRadius0; }
bool isPosRoot() const { return SkToBool(fPosRoot); }
- typedef GrGLRadial2Gradient GLProgramStage;
+ typedef GrGLRadial2Gradient GLEffect;
private:
GR_DECLARE_EFFECT_TEST;
diff --git a/src/gpu/effects/GrConfigConversionEffect.h b/src/gpu/effects/GrConfigConversionEffect.h
index 511f595..9a01435 100644
--- a/src/gpu/effects/GrConfigConversionEffect.h
+++ b/src/gpu/effects/GrConfigConversionEffect.h
@@ -39,7 +39,7 @@
PMConversion pmConversion = kNone_PMConversion);
static const char* Name() { return "Config Conversion"; }
- typedef GrGLConfigConversionEffect GLProgramStage;
+ typedef GrGLConfigConversionEffect GLEffect;
virtual const GrProgramStageFactory& getFactory() const SK_OVERRIDE;
virtual bool isEqual(const GrEffect&) const SK_OVERRIDE;
diff --git a/src/gpu/effects/GrConvolutionEffect.h b/src/gpu/effects/GrConvolutionEffect.h
index 7f2ead5..a719c77 100644
--- a/src/gpu/effects/GrConvolutionEffect.h
+++ b/src/gpu/effects/GrConvolutionEffect.h
@@ -34,7 +34,7 @@
static const char* Name() { return "Convolution"; }
- typedef GrGLConvolutionEffect GLProgramStage;
+ typedef GrGLConvolutionEffect GLEffect;
virtual const GrProgramStageFactory& getFactory() const SK_OVERRIDE;
virtual bool isEqual(const GrEffect&) const SK_OVERRIDE;
diff --git a/src/gpu/effects/GrSingleTextureEffect.h b/src/gpu/effects/GrSingleTextureEffect.h
index 230bf5b..64066bf 100644
--- a/src/gpu/effects/GrSingleTextureEffect.h
+++ b/src/gpu/effects/GrSingleTextureEffect.h
@@ -32,7 +32,7 @@
static const char* Name() { return "Single Texture"; }
- typedef GrGLSingleTextureEffect GLProgramStage;
+ typedef GrGLSingleTextureEffect GLEffect;
virtual const GrProgramStageFactory& getFactory() const SK_OVERRIDE;
diff --git a/src/gpu/effects/GrTextureDomainEffect.h b/src/gpu/effects/GrTextureDomainEffect.h
index e045ab1..520e90f 100644
--- a/src/gpu/effects/GrTextureDomainEffect.h
+++ b/src/gpu/effects/GrTextureDomainEffect.h
@@ -28,7 +28,7 @@
static const char* Name() { return "TextureDomain"; }
- typedef GrGLTextureDomainEffect GLProgramStage;
+ typedef GrGLTextureDomainEffect GLEffect;
virtual const GrProgramStageFactory& getFactory() const SK_OVERRIDE;
virtual bool isEqual(const GrEffect&) const SK_OVERRIDE;
diff --git a/src/gpu/gl/GrGLEffect.h b/src/gpu/gl/GrGLEffect.h
index 06dfad7..5ac4f3c 100644
--- a/src/gpu/gl/GrGLEffect.h
+++ b/src/gpu/gl/GrGLEffect.h
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#ifndef GrGLProgramStage_DEFINED
-#define GrGLProgramStage_DEFINED
+#ifndef GrGLEffect_DEFINED
+#define GrGLEffect_DEFINED
#include "GrAllocator.h"
#include "GrEffect.h"
@@ -25,7 +25,7 @@
must have a function:
static inline StageKey GenKey(const GrEffect&, const GrGLCaps&)
that is used to implement a program cache. When two GrEffects produce the same key this means
- that their GrGLProgramStages would emit the same GLSL code.
+ that their GrGLEffects would emit the same GLSL code.
These objects are created by the factory object returned by the GrEffect::getFactory().
*/
diff --git a/src/gpu/gl/GrGLShaderBuilder.h b/src/gpu/gl/GrGLShaderBuilder.h
index cb38247..d60f33f 100644
--- a/src/gpu/gl/GrGLShaderBuilder.h
+++ b/src/gpu/gl/GrGLShaderBuilder.h
@@ -23,7 +23,7 @@
class GrGLShaderBuilder {
public:
/**
- * Used by GrGLProgramStages to add texture reads to their shader code.
+ * Used by GrGLEffects to add texture reads to their shader code.
*/
class TextureSampler {
public: