GrCustomStage Renaming Part 5
Stuff found by searching for "stage".
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6772043
git-svn-id: http://skia.googlecode.com/svn/trunk@6089 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/effects/SkTableColorFilter.cpp b/src/effects/SkTableColorFilter.cpp
index 1e7a8b6..076db5d 100644
--- a/src/effects/SkTableColorFilter.cpp
+++ b/src/effects/SkTableColorFilter.cpp
@@ -247,7 +247,7 @@
class GLColorTableEffect : public GrGLLegacyProgramStage {
public:
GLColorTableEffect(const GrProgramStageFactory& factory,
- const GrEffect& stage);
+ const GrEffect& effect);
virtual void setupVariables(GrGLShaderBuilder* state) SK_OVERRIDE {}
virtual void emitVS(GrGLShaderBuilder* state,
@@ -267,7 +267,7 @@
};
GLColorTableEffect::GLColorTableEffect(
- const GrProgramStageFactory& factory, const GrEffect& stage)
+ const GrProgramStageFactory& factory, const GrEffect& effect)
: INHERITED(factory) {
}
@@ -355,13 +355,13 @@
this->asComponentTable(&bitmap);
// passing NULL because this effect does no tiling or filtering.
GrTexture* texture = GrLockCachedBitmapTexture(context, bitmap, NULL);
- GrEffect* stage = SkNEW_ARGS(ColorTableEffect, (texture));
+ GrEffect* effect = SkNEW_ARGS(ColorTableEffect, (texture));
// Unlock immediately, this is not great, but we don't have a way of
// knowing when else to unlock it currently. TODO: Remove this when
// unref becomes the unlock replacement for all types of textures.
GrUnlockCachedBitmapTexture(texture);
- return stage;
+ return effect;
}
#endif // SK_SUPPORT_GPU