commit 4ca2e6034365ad280ec64473f7f1d72ebd8335e4
author egdaniel <egdaniel@google.com> Wed Nov 18 08:01:26 2015 -0800
committer Commit bot <commit-bot@chromium.org> Wed Nov 18 08:01:26 2015 -0800
tree 4f26d5322d7c2fe66d9f76a8f11bd5b3cd22968d
parent accaf480c39e80b71be82c0fefa5ea4e8be33fea

Add ShaderBuilders to EmitArgs and remove gettings from ProgBuilder.

BUG=skia:

Review URL: https://codereview.chromium.org/1457543003

src/gpu/glsl/GrGLSLFragmentProcessor.cpp

diff --git a/src/gpu/glsl/GrGLSLFragmentProcessor.cpp b/src/gpu/glsl/GrGLSLFragmentProcessor.cpp
index 5868043..f32dd09 100644
--- a/src/gpu/glsl/GrGLSLFragmentProcessor.cpp
+++ b/src/gpu/glsl/GrGLSLFragmentProcessor.cpp
@@ -25,20 +25,20 @@
 }
 
 void GrGLSLFragmentProcessor::emitChild(int childIndex, const char* inputColor,
-                                      SkString* outputColor, EmitArgs& args) {
+                                        SkString* outputColor, EmitArgs& args) {
 
     SkASSERT(outputColor);
-    GrGLSLFragmentBuilder* fb = args.fBuilder->getFragmentShaderBuilder();
-    outputColor->append(fb->getMangleString());
-    fb->codeAppendf("vec4 %s;", outputColor->c_str());
+    GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+    outputColor->append(fragBuilder->getMangleString());
+    fragBuilder->codeAppendf("vec4 %s;", outputColor->c_str());
     this->internalEmitChild(childIndex, inputColor, outputColor->c_str(), args);
 }
 
 void GrGLSLFragmentProcessor::internalEmitChild(int childIndex, const char* inputColor,
                                                 const char* outputColor, EmitArgs& args) {
-    GrGLSLFragmentBuilder* fb = args.fBuilder->getFragmentShaderBuilder();
+    GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
 
-    fb->onBeforeChildProcEmitCode();  // call first so mangleString is updated
+    fragBuilder->onBeforeChildProcEmitCode();  // call first so mangleString is updated
 
     const GrFragmentProcessor& childProc = args.fFp.childProcessor(childIndex);
 
@@ -90,17 +90,18 @@
     }
 
     // emit the code for the child in its own scope
-    fb->codeAppend("{\n");
-    fb->codeAppendf("// Child Index %d (mangle: %s): %s\n", childIndex,
-                    fb->getMangleString().c_str(), childProc.name());
+    fragBuilder->codeAppend("{\n");
+    fragBuilder->codeAppendf("// Child Index %d (mangle: %s): %s\n", childIndex,
+                             fragBuilder->getMangleString().c_str(), childProc.name());
     EmitArgs childArgs(args.fBuilder,
+                       fragBuilder,
                        childProc,
                        outputColor,
                        inputColor,
                        childCoords,
                        childSamplers);
     this->childProcessor(childIndex)->emitCode(childArgs);
-    fb->codeAppend("}\n");
+    fragBuilder->codeAppend("}\n");
 
-    fb->onAfterChildProcEmitCode();
+    fragBuilder->onAfterChildProcEmitCode();
 }