Isolate VertexBuilder from GrGLShaderBuilder

src/gpu/gl/GrGLProgram.h

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef GrGLProgram_DEFINED
 #define GrGLProgram_DEFINED
 
 #include "GrDrawState.h"
 #include "GrGLContext.h"
 #include "GrGLProgramDesc.h"
+#include "GrGLShaderBuilder.h"
 #include "GrGLSL.h"
 #include "GrGLTexture.h"
 #include "GrGLUniformManager.h"
 
 #include "SkString.h"
 #include "SkXfermode.h"
 
 class GrBinHashKeyBuilder;
 class GrGLEffect;
 class GrGLShaderBuilder;
@@ skipping 130 matching lines @@
     /**
      * This is the heavy initialization routine for building a GLProgram. colorStages and
      * coverageStages correspond to the output of GrGLProgramDesc::Build().
      */
     bool genProgram(const GrEffectStage* colorStages[], const GrEffectStage* coverageStages[]);
 
     GrSLConstantVec genInputColor(GrGLShaderBuilder* builder, SkString* inColor);
 
     GrSLConstantVec genInputCoverage(GrGLShaderBuilder* builder, SkString* inCoverage);
 
-    void genGeometryShader(GrGLShaderBuilder* segments) const;
+    void genGeometryShader(GrGLShaderBuilder::VertexBuilder* vertexBuilder) const;
 
     // Creates a GL program ID, binds shader attributes to GL vertex attrs, and links the program
     bool bindOutputsAttribsAndLinkProgram(const GrGLShaderBuilder& builder,
                                           bool bindColorOut,
                                           bool bindDualSrcOut);
 
     // Sets the texture units for samplers
     void initSamplerUniforms();
     void initEffectSamplerUniforms(EffectAndSamplers* effect, int* texUnitIdx);
 
@@ skipping 34 matching lines @@
     GrGLProgramDesc             fDesc;
     const GrGLContext&          fContext;
 
     GrGLUniformManager          fUniformManager;
     UniformHandles              fUniformHandles;
 
     typedef GrRefCnt INHERITED;
 };
 
 #endif