Move shader compiling to ProgramBuilder and various ShaderBuilder cleanups.

src/gpu/gl/builders/GrGLShaderBuilder.h

Index: src/gpu/gl/builders/GrGLShaderBuilder.h
diff --git a/src/gpu/gl/builders/GrGLShaderBuilder.h b/src/gpu/gl/builders/GrGLShaderBuilder.h
index b5efbf4f893fabf891fbedca7c02579daab7a6f7..2daea1515b622af2f34fe8a412b472e9bea279ee 100644
--- a/src/gpu/gl/builders/GrGLShaderBuilder.h
+++ b/src/gpu/gl/builders/GrGLShaderBuilder.h
@@ -8,16 +8,12 @@
 #ifndef GrGLShaderBuilder_DEFINED
 #define GrGLShaderBuilder_DEFINED
 
-#include "SkTArray.h"
-#include "gl/GrGLFragmentProcessor.h"
-#include "gl/GrGLProgramDesc.h"
-#include "gl/GrGLProgramDataManager.h"
-#include "gl/GrGLTypes.h"
+#include "GrAllocator.h"
+#include "glsl/GrGLSLShaderVar.h"
+#include "SkTDArray.h"
 
 #include <stdarg.h>
 
-class GrGLCaps;
-class GrGLContextInfo;
 class GrGLProgramBuilder;
 class GrGLSLTextureSampler;
 
@@ -27,6 +23,7 @@ class GrGLSLTextureSampler;
 class GrGLShaderBuilder {
 public:
     GrGLShaderBuilder(GrGLProgramBuilder* program);
+    virtual ~GrGLShaderBuilder() {}
 
     void addInput(const GrGLSLShaderVar& input) { fInputs.push_back(input); }
     void addOutput(const GrGLSLShaderVar& output) { fOutputs.push_back(output); }
@@ -65,10 +62,6 @@ public:
                                         const char* coordName,
                                         GrSLType coordType = kVec2f_GrSLType);
 
-    /** If texture swizzling is available using tex parameters then it is preferred over mangling
-        the generated shader code. This potentially allows greater reuse of cached shaders. */
-    static const GrGLenum* GetTexParamSwizzle(GrPixelConfig config, const GrGLCaps& caps);
-
     /**
     * Called by GrGLProcessors to add code to one of the shaders.
     */
@@ -102,6 +95,11 @@ public:
                       SkString* outName);
 
     /*
+     * Combines the various parts of the shader to create a single finalized shader string.
+     */
+    void finalize(uint32_t visibility);
+
+    /*
      * Get parent builder for adding uniforms
      */
     GrGLProgramBuilder* getProgramBuilder() { return fProgramBuilder; }
@@ -173,7 +171,8 @@ protected:
     SkString& functions() { return fShaderStrings[kFunctions]; }
     SkString& main() { return fShaderStrings[kMain]; }
     SkString& code() { return fShaderStrings[fCodeIndex]; }
-    bool finalize(GrGLuint programId, GrGLenum type, SkTDArray<GrGLuint>* shaderIds);
+
+    virtual void onFinalize() = 0;
 
     enum {
         kVersionDecl,