Added GrGLFragmentProcessor::EmitArgs struct for use with emitCode()

samplecode/SampleLighting.cpp

 
 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SampleCode.h"
 #include "Resources.h"
 
@@ skipping 111 matching lines @@
 
         this->initClassID<LightingFP>();
     }
 
     class LightingGLFP : public GrGLFragmentProcessor {
     public:
         LightingGLFP() : fLightColor(GrColor_ILLEGAL) {
             fLightDir.fX = 10000.0f;
         }
 
-        void emitCode(GrGLFPBuilder* builder,
-                      const GrFragmentProcessor& fp,
-                      const char* outputColor,
-                      const char* inputColor,
-                      const TransformedCoordsArray& coords,
-                      const TextureSamplerArray& samplers) override {
+        void emitCode(EmitArgs& args) override {
 
-            GrGLFragmentBuilder* fpb = builder->getFragmentShaderBuilder();
+            GrGLFragmentBuilder* fpb = args.fBuilder->getFragmentShaderBuilder();
 
             // add uniforms
             const char* lightDirUniName = NULL;
-            fLightDirUni = builder->addUniform(GrGLProgramBuilder::kFragment_Visibility,
+            fLightDirUni = args.fBuilder->addUniform(GrGLProgramBuilder::kFragment_Visibility,
                                                kVec3f_GrSLType, kDefault_GrSLPrecision,
                                                "LightDir", &lightDirUniName);
 
             const char* lightColorUniName = NULL;
-            fLightColorUni = builder->addUniform(GrGLProgramBuilder::kFragment_Visibility,
+            fLightColorUni = args.fBuilder->addUniform(GrGLProgramBuilder::kFragment_Visibility,
                                                  kVec4f_GrSLType, kDefault_GrSLPrecision,
                                                  "LightColor", &lightColorUniName);
 
             const char* ambientColorUniName = NULL;
-            fAmbientColorUni = builder->addUniform(GrGLProgramBuilder::kFragment_Visibility,
+            fAmbientColorUni = args.fBuilder->addUniform(GrGLProgramBuilder::kFragment_Visibility,
                                                    kVec4f_GrSLType, kDefault_GrSLPrecision,
                                                    "AmbientColor", &ambientColorUniName);
 
             fpb->codeAppend("vec4 diffuseColor = ");
-            fpb->appendTextureLookupAndModulate(inputColor, samplers[0], 
-                                                coords[0].c_str(), coords[0].getType());
+            fpb->appendTextureLookupAndModulate(args.fInputColor, args.fSamplers[0],
+                                                args.fCoords[0].c_str(), args.fCoords[0].getType());
             fpb->codeAppend(";");
 
             fpb->codeAppend("vec4 normalColor = ");
-            fpb->appendTextureLookup(samplers[1], coords[0].c_str(), coords[0].getType());
+            fpb->appendTextureLookup(args.fSamplers[1], args.fCoords[0].c_str(), 
+                                     args.fCoords[0].getType());
             fpb->codeAppend(";");
 
             fpb->codeAppend("vec3 normal = normalize(2.0*(normalColor.rgb - vec3(0.5)));");
             fpb->codeAppendf("vec3 lightDir = normalize(%s);", lightDirUniName);
             fpb->codeAppend("float NdotL = dot(normal, lightDir);");
             // diffuse light
             fpb->codeAppendf("vec3 result = %s.rgb*diffuseColor.rgb*NdotL;", lightColorUniName);
             // ambient light
             fpb->codeAppendf("result += %s.rgb;", ambientColorUniName);
-            fpb->codeAppendf("%s = vec4(result.rgb, diffuseColor.a);", outputColor);
+            fpb->codeAppendf("%s = vec4(result.rgb, diffuseColor.a);", args.fOutputColor);
         }
 
         void setData(const GrGLProgramDataManager& pdman, const GrProcessor& proc) override {
             const LightingFP& lightingFP = proc.cast<LightingFP>();
 
             SkVector3 lightDir = lightingFP.lightDir();
             if (lightDir != fLightDir) {
                 pdman.set3fv(fLightDirUni, 1, &lightDir.fX);
                 fLightDir = lightDir;
             }
@@ skipping 225 matching lines @@
     }
 
 private:
     typedef SampleView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() { return new LightingView; }
 static SkViewRegister reg(MyFactory);