Add ShaderBuilders to EmitArgs and remove gettings from ProgBuilder.

src/gpu/glsl/GrGLSLProgramBuilder.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrGLSLProgramBuilder_DEFINED
 #define GrGLSLProgramBuilder_DEFINED
 
@@ skipping 147 matching lines @@
                                          const char* output) = 0;
 
     /*
      * Creates a fragment shader varying that can be referred to.
      * Comparable to GrGLSLUniformBuilder::addUniform().
      */
     virtual SeparableVaryingHandle addSeparableVarying(
         const char* name, GrGLSLVertToFrag*,
         GrSLPrecision fsPrecision = kDefault_GrSLPrecision) = 0;
 
-    // TODO rename getFragmentBuilder
-    virtual GrGLSLFragmentBuilder* getFragmentShaderBuilder() = 0;
-    virtual GrGLSLVertexBuilder* getVertexShaderBuilder() = 0;
-
     /*
      * *NOTE* NO MEMBERS ALLOWED, MULTIPLE INHERITANCE
      */
 };
 
 
 /* a specializations for FPs. Lets the user add uniforms and FS code */
 class GrGLSLFPBuilder : public virtual GrGLSLUniformBuilder {
 public:
-    virtual GrGLSLFragmentBuilder* getFragmentShaderBuilder() = 0;
-
     /*
      * *NOTE* NO MEMBERS ALLOWED, MULTIPLE INHERITANCE
      */
 };
 
 /* a specializations for XPs. Lets the user add uniforms and FS code */
 class GrGLSLXPBuilder : public virtual GrGLSLUniformBuilder {
 public:
-    virtual GrGLSLXPFragmentBuilder* getFragmentShaderBuilder() = 0;
-
     /*
      * *NOTE* NO MEMBERS ALLOWED, MULTIPLE INHERITANCE
      */
 };
 
 class GrGLSLProgramBuilder : public GrGLSLGPBuilder,
                              public GrGLSLFPBuilder,
                              public GrGLSLXPBuilder {
 public:
     typedef GrGpu::DrawArgs DrawArgs;
 
-    GrGLSLXPFragmentBuilder* getFragmentShaderBuilder() override { return &fFS; }
-    GrGLSLVertexBuilder* getVertexShaderBuilder() override { return &fVS; }
-
     // Handles for program uniforms (other than per-effect uniforms)
     struct BuiltinUniformHandles {
         UniformHandle       fRTAdjustmentUni;
 
         // We use the render target height to provide a y-down frag coord when specifying
         // origin_upper_left is not supported.
         UniformHandle       fRTHeightUni;
     };
 
 protected:
@@ skipping 38 matching lines @@
 private:
     virtual void onAppendUniformDecls(ShaderVisibility visibility, SkString* out) const = 0;
 
     friend class GrGLSLShaderBuilder;
     friend class GrGLSLVertexBuilder;
     friend class GrGLSLFragmentShaderBuilder;
     friend class GrGLSLGeometryBuilder;
 };
 
 #endif