commit c196b522d06919885c6bbe28b7b06d2e5b2cb9bf
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Oct 25 21:52:43 2012 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Oct 25 21:52:43 2012 +0000
tree 2c1d8f7ea77d74c4633b88f95caee5eb3b48dc36
parent 0707c29413a5a3cc1c2d14b8c65b3692af5c7411

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

src/gpu/gl/GrGLProgram.cpp

diff --git a/src/gpu/gl/GrGLProgram.cpp b/src/gpu/gl/GrGLProgram.cpp
index fd01e0d..3095907 100644
--- a/src/gpu/gl/GrGLProgram.cpp
+++ b/src/gpu/gl/GrGLProgram.cpp
@@ -904,7 +904,7 @@
                                             const char* vsInCoord,
                                             GrGLShaderBuilder* builder) {
 
-    GrGLEffect* glStage = effect->getFactory().createGLInstance(*effect);
+    GrGLEffect* glEffect = effect->getFactory().createGLInstance(*effect);
 
     /// Vertex Shader Stuff
 
@@ -953,19 +953,19 @@
     }
 
     // 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) {