Misc stage->effect renaming

R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6787043

git-svn-id: http://skia.googlecode.com/svn/trunk@6132 2bbb7eff-a529-9590-31e7-b0007b416f81

2 files changed, 12 insertions, 12 deletions

diff --git a/src/gpu/GrDrawState.h b/src/gpu/GrDrawState.h
index 54f2179fd5..6f7ebcd6a5 100644
--- a/src/gpu/GrDrawState.h
+++ b/src/gpu/GrDrawState.h
@@ -473,7 +473,7 @@ public:
 
     /**
      * Preconcats the current view matrix and restores the previous view matrix in the destructor.
-     * Stage matrices are automatically adjusted to compensate.
+     * Effect matrices are automatically adjusted to compensate.
      */
     class AutoViewMatrixRestore : public ::GrNoncopyable {
     public:
diff --git a/src/gpu/gl/GrGLProgram.cpp b/src/gpu/gl/GrGLProgram.cpp
index fd01e0d233..30959072ea 100644
--- a/src/gpu/gl/GrGLProgram.cpp
+++ b/src/gpu/gl/GrGLProgram.cpp
@@ -904,7 +904,7 @@ GrGLEffect* GrGLProgram::GenStageCode(const GrEffect* effect,
                                             const char* vsInCoord,
                                             GrGLShaderBuilder* builder) {
 
-    GrGLEffect* glStage = effect->getFactory().createGLInstance(*effect);
+    GrGLEffect* glEffect = effect->getFactory().createGLInstance(*effect);
 
     /// Vertex Shader Stuff
 
@@ -953,19 +953,19 @@ GrGLEffect* GrGLProgram::GenStageCode(const GrEffect* effect,
     }
 
     // Enclose custom code in a block to avoid namespace conflicts
-    builder->fVSCode.appendf("\t{ // %s\n", glStage->name());
-    builder->fFSCode.appendf("\t{ // %s \n", glStage->name());
-    glStage->emitCode(builder,
-                      *effect,
-                      desc.fEffectKey,
-                      varyingVSName,
-                      fsOutColor,
-                      fsInColor,
-                      textureSamplers);
+    builder->fVSCode.appendf("\t{ // %s\n", glEffect->name());
+    builder->fFSCode.appendf("\t{ // %s \n", glEffect->name());
+    glEffect->emitCode(builder,
+                       *effect,
+                       desc.fEffectKey,
+                       varyingVSName,
+                       fsOutColor,
+                       fsInColor,
+                       textureSamplers);
     builder->fVSCode.appendf("\t}\n");
     builder->fFSCode.appendf("\t}\n");
 
-    return glStage;
+    return glEffect;
 }
 
 void GrGLProgram::setData(const GrDrawState& drawState) {