Revert of Cleanup of shader building system

src/gpu/gl/builders/GrGLGeometryShaderBuilder.cpp

Index: src/gpu/gl/builders/GrGLGeometryShaderBuilder.cpp
diff --git a/src/gpu/gl/builders/GrGLGeometryShaderBuilder.cpp b/src/gpu/gl/builders/GrGLGeometryShaderBuilder.cpp
index 8a3b1f4a6eb7df27dd8826509c637e4601afb565..117497b9ee9f3ebd6cc63b9bb37dd256cbe888bb 100644
--- a/src/gpu/gl/builders/GrGLGeometryShaderBuilder.cpp
+++ b/src/gpu/gl/builders/GrGLGeometryShaderBuilder.cpp
@@ -10,12 +10,12 @@
 #include "GrGLProgramBuilder.h"
 #include "../GrGpuGL.h"
 
-GrGLGeometryBuilder::GrGLGeometryBuilder(GrGLProgramBuilder* program)
+GrGLGeometryShaderBuilder::GrGLGeometryShaderBuilder(GrGLFullProgramBuilder* program)
     : INHERITED(program) {
 
 }
 
-void GrGLGeometryBuilder::addVarying(GrSLType type,
+void GrGLGeometryShaderBuilder::addVarying(GrSLType type,
                const char* name,
                const char** gsOutName) {
     // if we have a GS take each varying in as an array
@@ -35,15 +35,15 @@
 }
 
 
-bool GrGLGeometryBuilder::compileAndAttachShaders(GrGLuint programId,
+bool GrGLGeometryShaderBuilder::compileAndAttachShaders(GrGLuint programId,
         SkTDArray<GrGLuint>* shaderIds) const {
     const GrGLContext& glCtx = fProgramBuilder->gpu()->glContext();
     SkASSERT(fProgramBuilder->ctxInfo().glslGeneration() >= k150_GrGLSLGeneration);
     SkString geomShaderSrc(GrGetGLSLVersionDecl(fProgramBuilder->ctxInfo()));
     geomShaderSrc.append("layout(triangles) in;\n"
                          "layout(triangle_strip, max_vertices = 6) out;\n");
-    this->appendDecls(fInputs, &geomShaderSrc);
-    this->appendDecls(fOutputs, &geomShaderSrc);
+    fProgramBuilder->appendDecls(fInputs, &geomShaderSrc);
+    fProgramBuilder->appendDecls(fOutputs, &geomShaderSrc);
     geomShaderSrc.append("void main() {\n");
     geomShaderSrc.append("\tfor (int i = 0; i < 3; ++i) {\n"
                          "\t\tgl_Position = gl_in[i].gl_Position;\n");