Revert of Cleanup of shader building system

src/gpu/gl/builders/GrGLShaderBuilder.cpp

Index: src/gpu/gl/builders/GrGLShaderBuilder.cpp
diff --git a/src/gpu/gl/builders/GrGLShaderBuilder.cpp b/src/gpu/gl/builders/GrGLShaderBuilder.cpp
index 36d124f3873ec3a79c1bb2ba462339a9a35a92c8..33474e60d4366e029e4db798248fa42f355c4713 100644
--- a/src/gpu/gl/builders/GrGLShaderBuilder.cpp
+++ b/src/gpu/gl/builders/GrGLShaderBuilder.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "GrGLShaderBuilder.h"
-#include "GrGLProgramBuilder.h"
+#include "GrGLFullProgramBuilder.h"
 #include "GrGLProgramBuilder.h"
 #include "../GrGpuGL.h"
 #include "../GrGLShaderVar.h"
@@ -53,12 +53,13 @@
         out->appendf(".%s", swizzle);
     }
 }
+static const int kVarsPerBlock = 8;
 }
 
 GrGLShaderBuilder::GrGLShaderBuilder(GrGLProgramBuilder* program)
     : fProgramBuilder(program)
-    , fInputs(GrGLProgramBuilder::kVarsPerBlock)
-    , fOutputs(GrGLProgramBuilder::kVarsPerBlock)
+    , fInputs(kVarsPerBlock)
+    , fOutputs(kVarsPerBlock)
     , fFeaturesAddedMask(0) {
 }
 
@@ -142,13 +143,6 @@
     }
 }
 
-void GrGLShaderBuilder::appendDecls(const VarArray& vars, SkString* out) const {
-    for (int i = 0; i < vars.count(); ++i) {
-        vars[i].appendDecl(fProgramBuilder->ctxInfo(), out);
-        out->append(";\n");
-    }
-}
-
 void GrGLShaderBuilder::appendTextureLookup(const char* samplerName,
                                             const char* coordName,
                                             uint32_t configComponentMask,
@@ -161,3 +155,8 @@
                           swizzle,
                           kVec2f_GrSLType);
 }
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+GrGLFullShaderBuilder::GrGLFullShaderBuilder(GrGLFullProgramBuilder* program)
+    : INHERITED(program)
+    , fFullProgramBuilder(program) {}