Move GrGLPrimitive/GeometryProc to GLSL

src/gpu/gl/builders/GrGLProgramBuilder.h

Index: src/gpu/gl/builders/GrGLProgramBuilder.h
diff --git a/src/gpu/gl/builders/GrGLProgramBuilder.h b/src/gpu/gl/builders/GrGLProgramBuilder.h
index 02fa88688b3f0657b058a35f672adbcc97f09184..3a8dcd8500a8eff7e4ee1f8ae1245ee4e728c9b5 100644
--- a/src/gpu/gl/builders/GrGLProgramBuilder.h
+++ b/src/gpu/gl/builders/GrGLProgramBuilder.h
@@ -9,8 +9,8 @@
 #define GrGLProgramBuilder_DEFINED
 
 #include "GrPipeline.h"
-#include "gl/GrGLPrimitiveProcessor.h"
 #include "gl/GrGLProgramDataManager.h"
+#include "glsl/GrGLSLPrimitiveProcessor.h"
 #include "glsl/GrGLSLProgramBuilder.h"
 #include "glsl/GrGLSLProgramDataManager.h"
 #include "glsl/GrGLSLTextureSampler.h"
@@ -30,7 +30,7 @@ struct GrGLInstalledProc {
     SkAutoTDelete<Proc> fGLProc;
 };
 
-typedef GrGLInstalledProc<GrGLPrimitiveProcessor> GrGLInstalledGeoProc;
+typedef GrGLInstalledProc<GrGLSLPrimitiveProcessor> GrGLInstalledGeoProc;
 typedef GrGLInstalledProc<GrGLSLXferProcessor> GrGLInstalledXferProc;
 typedef GrGLInstalledProc<GrGLSLFragmentProcessor> GrGLInstalledFragProc;
 
@@ -176,8 +176,8 @@ private:
 
     GrGLGpu* fGpu;
     UniformInfoArray fUniforms;
-    GrGLPrimitiveProcessor::TransformsIn fCoordTransforms;
-    GrGLPrimitiveProcessor::TransformsOut fOutCoords;
+    GrGLSLPrimitiveProcessor::TransformsIn fCoordTransforms;
+    GrGLSLPrimitiveProcessor::TransformsOut fOutCoords;
     SkTArray<UniformHandle> fSamplerUniforms;
     SeparableVaryingInfoArray fSeparableVaryingInfos;