Move GrGLPrimitive/GeometryProc to GLSL

src/gpu/gl/builders/GrGLProgramBuilder.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrGLProgramBuilder_DEFINED
 #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"
 #include "glsl/GrGLSLXferProcessor.h"
 
 class GrFragmentProcessor;
 class GrGLContextInfo;
 class GrGLSLShaderBuilder;
 class GrGLSLCaps;
 
 /**
  * The below struct represent processors installed in programs.
  */
 template <class Proc>
 struct GrGLInstalledProc {
     SkDEBUGCODE(int fSamplersIdx;)
     SkAutoTDelete<Proc> fGLProc;
 };
 
-typedef GrGLInstalledProc<GrGLPrimitiveProcessor> GrGLInstalledGeoProc;
+typedef GrGLInstalledProc<GrGLSLPrimitiveProcessor> GrGLInstalledGeoProc;
 typedef GrGLInstalledProc<GrGLSLXferProcessor> GrGLInstalledXferProc;
 typedef GrGLInstalledProc<GrGLSLFragmentProcessor> GrGLInstalledFragProc;
 
 struct GrGLInstalledFragProcs : public SkRefCnt {
     virtual ~GrGLInstalledFragProcs();
     SkSTArray<8, GrGLInstalledFragProc*, true> fProcs;
 };
 
 /*
  * Please note - no diamond problems because of virtual inheritance.  Also, both base classes
@@ skipping 125 matching lines @@
     private:
         GrGLProgramBuilder* fPB;
     };
 
     GrGLInstalledGeoProc* fGeometryProcessor;
     GrGLInstalledXferProc* fXferProcessor;
     SkAutoTUnref<GrGLInstalledFragProcs> fFragmentProcessors;
 
     GrGLGpu* fGpu;
     UniformInfoArray fUniforms;
-    GrGLPrimitiveProcessor::TransformsIn fCoordTransforms;
-    GrGLPrimitiveProcessor::TransformsOut fOutCoords;
+    GrGLSLPrimitiveProcessor::TransformsIn fCoordTransforms;
+    GrGLSLPrimitiveProcessor::TransformsOut fOutCoords;
     SkTArray<UniformHandle> fSamplerUniforms;
     SeparableVaryingInfoArray fSeparableVaryingInfos;
 
     friend class GrGLSLShaderBuilder;
     friend class GrGLSLVertexBuilder;
     friend class GrGLSLFragmentShaderBuilder;
     friend class GrGLSLGeometryBuilder;
 
    typedef GrGLSLProgramBuilder INHERITED; 
 };
 #endif