commit 2d721d33aad192cc8a7a1321504b39bdca2a57ce
author egdaniel <egdaniel@google.com> Wed Nov 11 13:06:05 2015 -0800
committer Commit bot <commit-bot@chromium.org> Wed Nov 11 13:06:05 2015 -0800
tree 9346095693532367c5c5944d77d584b7ba08b52d
parent 33bee090fa332b2f3db366ae0ecc3231bd8e112e

Move all ShaderBuilder files to GLSL

BUG=skia:

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

src/gpu/gl/GrGLPrimitiveProcessor.cpp

diff --git a/src/gpu/gl/GrGLPrimitiveProcessor.cpp b/src/gpu/gl/GrGLPrimitiveProcessor.cpp
index 35fa235..66d3892 100644
--- a/src/gpu/gl/GrGLPrimitiveProcessor.cpp
+++ b/src/gpu/gl/GrGLPrimitiveProcessor.cpp
@@ -7,7 +7,8 @@
 
 #include "GrGLPrimitiveProcessor.h"
 
-#include "builders/GrGLProgramBuilder.h"
+#include "glsl/GrGLSLProgramBuilder.h"
+#include "glsl/GrGLSLFragmentShaderBuilder.h"
 
 SkMatrix GrGLPrimitiveProcessor::GetTransformMatrix(const SkMatrix& localMatrix,
                                                     const GrCoordTransform& coordTransform) {
@@ -34,10 +35,10 @@
 void GrGLPrimitiveProcessor::setupUniformColor(GrGLSLGPBuilder* pb,
                                                const char* outputName,
                                                UniformHandle* colorUniform) {
-    GrGLFragmentBuilder* fs = pb->getFragmentShaderBuilder();
+    GrGLSLFragmentBuilder* fs = pb->getFragmentShaderBuilder();
     SkASSERT(colorUniform);
     const char* stagedLocalVarName;
-    *colorUniform = pb->addUniform(GrGLProgramBuilder::kFragment_Visibility,
+    *colorUniform = pb->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
                                    kVec4f_GrSLType,
                                    kDefault_GrSLPrecision,
                                    "Color",