commit e659a581f63fdccb64dce2dc8a478cf56831feea
author egdaniel <egdaniel@google.com> Fri Nov 13 09:55:43 2015 -0800
committer Commit bot <commit-bot@chromium.org> Fri Nov 13 09:55:43 2015 -0800
tree efef38bff117135e343b7b2b192af10b1f2262e3
parent 60795d99fff8caedc2e82bebcfa8bd4fa07231b7

Move GrGLPrimitive/GeometryProc to GLSL

BUG=skia:

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

src/gpu/effects/GrBitmapTextGeoProc.cpp

diff --git a/src/gpu/effects/GrBitmapTextGeoProc.cpp b/src/gpu/effects/GrBitmapTextGeoProc.cpp
index 7b17924..b9c1c8d 100644
--- a/src/gpu/effects/GrBitmapTextGeoProc.cpp
+++ b/src/gpu/effects/GrBitmapTextGeoProc.cpp
@@ -8,14 +8,13 @@
 #include "GrBitmapTextGeoProc.h"
 #include "GrInvariantOutput.h"
 #include "GrTexture.h"
-#include "gl/GrGLGeometryProcessor.h"
-#include "glsl/GrGLSLFragmentProcessor.h"
 #include "glsl/GrGLSLFragmentShaderBuilder.h"
+#include "glsl/GrGLSLGeometryProcessor.h"
 #include "glsl/GrGLSLProgramBuilder.h"
 #include "glsl/GrGLSLProgramDataManager.h"
 #include "glsl/GrGLSLVertexShaderBuilder.h"
 
-class GrGLBitmapTextGeoProc : public GrGLGeometryProcessor {
+class GrGLBitmapTextGeoProc : public GrGLSLGeometryProcessor {
 public:
     GrGLBitmapTextGeoProc() : fColor(GrColor_ILLEGAL) {}
 
@@ -119,7 +118,7 @@
     GrColor fColor;
     UniformHandle fColorUniform;
 
-    typedef GrGLGeometryProcessor INHERITED;
+    typedef GrGLSLGeometryProcessor INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -151,7 +150,7 @@
     GrGLBitmapTextGeoProc::GenKey(*this, caps, b);
 }
 
-GrGLPrimitiveProcessor* GrBitmapTextGeoProc::createGLInstance(const GrGLSLCaps& caps) const {
+GrGLSLPrimitiveProcessor* GrBitmapTextGeoProc::createGLInstance(const GrGLSLCaps& caps) const {
     return new GrGLBitmapTextGeoProc();
 }