Make GrGLSLProgramBuilder base class for GrGLProgramBuilder.

This CL still keeps the weird diamond shape we have for all our ProgramBuilders.
However, the GrGLSL base class will allow us to pull multiple other parts
of our program setup away from GL which will eventually allow us to break up
the diamond.

As part of this all ShaderBuilder subclass have been made gl independent,
however I will move them to GLSL files/class names in a follow on CL.

BUG=skia:

Review URL: https://codereview.chromium.org/1416423003

1 files changed, 3 insertions, 9 deletions

diff --git a/src/gpu/gl/builders/GrGLVertexShaderBuilder.h b/src/gpu/gl/builders/GrGLVertexShaderBuilder.h
index 81aebd41b8..4662c403e5 100644
--- a/src/gpu/gl/builders/GrGLVertexShaderBuilder.h
+++ b/src/gpu/gl/builders/GrGLVertexShaderBuilder.h
@@ -9,14 +9,13 @@
 #define GrGLVertexShader_DEFINED
 
 #include "GrGLShaderBuilder.h"
-#include "gl/GrGLTypes.h"
 #include "GrGeometryProcessor.h"
 
-class GrGLVarying;
+class GrGLSLVarying;
 
 class GrGLVertexBuilder : public GrGLShaderBuilder {
 public:
-    GrGLVertexBuilder(GrGLProgramBuilder* program);
+    GrGLVertexBuilder(GrGLSLProgramBuilder* program);
 
     void transformToNormalizedDeviceSpace(const GrShaderVar& posVar);
     void emitAttributes(const GrGeometryProcessor& gp);
@@ -33,12 +32,7 @@ private:
     /*
      * Internal call for GrGLProgramBuilder.addVarying
      */
-    void addVarying(const char* name, GrSLPrecision, GrGLVarying*);
-
-    /*
-     * private helpers for compilation by GrGLProgramBuilder
-     */
-    void bindVertexAttributes(GrGLuint programID);
+    void addVarying(const char* name, GrSLPrecision, GrGLSLVarying*);
 
     // an internal call which checks for uniquness of a var before adding it to the list of inputs
     bool addAttribute(const GrShaderVar& var);