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/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: