Initial refactor of shaderbuilder

gyp/gpu.gypi

Index: gyp/gpu.gypi
diff --git a/gyp/gpu.gypi b/gyp/gpu.gypi
index ec2a07fc97001c241415617ae0ff265b6d3c7d2e..2f0227e8439070b267a3513229bdc8ff54066d78 100644
--- a/gyp/gpu.gypi
+++ b/gyp/gpu.gypi
@@ -206,7 +206,6 @@
       '<(skia_src_path)/gpu/gl/GrGLPathRange.h',
       '<(skia_src_path)/gpu/gl/GrGLPathRendering.cpp',
       '<(skia_src_path)/gpu/gl/GrGLPathRendering.h',
-      '<(skia_src_path)/gpu/gl/GrGLSLPrettyPrint.cpp',
       '<(skia_src_path)/gpu/gl/GrGLProgram.cpp',
       '<(skia_src_path)/gpu/gl/GrGLProgram.h',
       '<(skia_src_path)/gpu/gl/GrGLProgramDesc.cpp',
@@ -217,8 +216,6 @@
       '<(skia_src_path)/gpu/gl/GrGLProgramDataManager.h',
       '<(skia_src_path)/gpu/gl/GrGLRenderTarget.cpp',
       '<(skia_src_path)/gpu/gl/GrGLRenderTarget.h',
-      '<(skia_src_path)/gpu/gl/GrGLShaderBuilder.cpp',
-      '<(skia_src_path)/gpu/gl/GrGLShaderBuilder.h',
       '<(skia_src_path)/gpu/gl/GrGLShaderVar.h',
       '<(skia_src_path)/gpu/gl/GrGLSL.cpp',
       '<(skia_src_path)/gpu/gl/GrGLSL.h',
@@ -238,6 +235,31 @@
       '<(skia_src_path)/gpu/gl/GrGpuGL.h',
       '<(skia_src_path)/gpu/gl/GrGpuGL_program.cpp',
 
+      # Files for building GLSL shaders
+      '<(skia_src_path)/gpu/gl/builders/GrGLSLPrettyPrint.cpp',
+      '<(skia_src_path)/gpu/gl/builders/GrGLShaderBuilder.cpp',
+      '<(skia_src_path)/gpu/gl/builders/GrGLShaderBuilder.h',
+      '<(skia_src_path)/gpu/gl/builders/GrGLProgramBuilder.cpp',
+      '<(skia_src_path)/gpu/gl/builders/GrGLProgramBuilder.h',
+      '<(skia_src_path)/gpu/gl/builders/GrGLShaderStringBuilder.cpp',
+      '<(skia_src_path)/gpu/gl/builders/GrGLShaderStringBuilder.h',
+      '<(skia_src_path)/gpu/gl/builders/GrGLVertexShaderBuilder.cpp',
+      '<(skia_src_path)/gpu/gl/builders/GrGLVertexShaderBuilder.h',
+      '<(skia_src_path)/gpu/gl/builders/GrGLFragmentShaderBuilder.cpp',
+      '<(skia_src_path)/gpu/gl/builders/GrGLFragmentShaderBuilder.h',
+      '<(skia_src_path)/gpu/gl/builders/GrGLGeometryShaderBuilder.cpp',
+      '<(skia_src_path)/gpu/gl/builders/GrGLGeometryShaderBuilder.h',
+
+      # Sk files

[bsalomon, 2014/08/21 20:21:01]

Did these get duplicated?

+      '<(skia_include_path)/gpu/SkGpuDevice.h',
+      '<(skia_include_path)/gpu/SkGr.h',
+      '<(skia_include_path)/gpu/SkGrPixelRef.h',
+      '<(skia_include_path)/gpu/SkGrTexturePixelRef.h',
+      '<(skia_src_path)/gpu/gl/builders/GrGLShaderStringBuilder.cpp',
+      '<(skia_src_path)/gpu/gl/builders/GrGLShaderStringBuilder.h',
+      '<(skia_src_path)/gpu/gl/builders/GrGLVertexShaderBuilder.cpp',
+      '<(skia_src_path)/gpu/gl/builders/GrGLVertexShaderBuilder.h',
+
       # Sk files
       '<(skia_include_path)/gpu/SkGpuDevice.h',
       '<(skia_include_path)/gpu/SkGr.h',