Make GrGLSLProgramBuilder base class for ProgramBuilder

src/gpu/gl/GrGLGeometryProcessor.h

Index: src/gpu/gl/GrGLGeometryProcessor.h
diff --git a/src/gpu/gl/GrGLGeometryProcessor.h b/src/gpu/gl/GrGLGeometryProcessor.h
index 1b3b8d9277d20c16548a58ffc1dac2c03a86b430..8151c32eefa18b4edb4a22370e799e2b333858a6 100644
--- a/src/gpu/gl/GrGLGeometryProcessor.h
+++ b/src/gpu/gl/GrGLGeometryProcessor.h
@@ -10,7 +10,7 @@
 
 #include "GrGLPrimitiveProcessor.h"
 
-class GrGLGPBuilder;
+class GrGLSLGPBuilder;
 
 /**
  * If a GL effect needs a GrGLFullShaderBuilder* object to emit vertex code, then it must inherit
@@ -42,7 +42,7 @@ public:
 
 protected:
     // Emit a uniform matrix for each coord transform.
-    void emitTransforms(GrGLGPBuilder* gp,
+    void emitTransforms(GrGLSLGPBuilder* gp,
                         const GrShaderVar& posVar,
                         const char* localCoords,
                         const TransformsIn& tin,
@@ -51,7 +51,7 @@ protected:
     }
 
     // Emit pre-transformed coords as a vertex attribute per coord-transform.
-    void emitTransforms(GrGLGPBuilder*,
+    void emitTransforms(GrGLSLGPBuilder*,
                         const GrShaderVar& posVar,
                         const char* localCoords,
                         const SkMatrix& localMatrix,
@@ -59,7 +59,7 @@ protected:
                         TransformsOut*);
 
     // caller has emitted transforms via attributes
-    void emitTransforms(GrGLGPBuilder*,
+    void emitTransforms(GrGLSLGPBuilder*,
                         const char* localCoords,
                         const TransformsIn& tin,
                         TransformsOut* tout);
@@ -71,8 +71,8 @@ protected:
     };
 
     // Create the correct type of position variable given the CTM
-    void setupPosition(GrGLGPBuilder*, GrGPArgs*, const char* posName);
-    void setupPosition(GrGLGPBuilder*, GrGPArgs*, const char* posName, const SkMatrix& mat,
+    void setupPosition(GrGLSLGPBuilder*, GrGPArgs*, const char* posName);
+    void setupPosition(GrGLSLGPBuilder*, GrGPArgs*, const char* posName, const SkMatrix& mat,
                        UniformHandle* viewMatrixUniform);
 
     static uint32_t ComputePosKey(const SkMatrix& mat) {