Initial refactor of shaderbuilder

gyp/gpu.gypi

 # Include this gypi to include all 'gpu' files
 # The parent gyp/gypi file must define
 #       'skia_src_path'     e.g. skia/trunk/src
 #       'skia_include_path' e.g. skia/trunk/include
 #
 # The skia build defines these in common_variables.gypi
 #
 {
   'variables': {
     'skgpu_sources': [
@@ skipping 188 matching lines @@
       '<(skia_src_path)/gpu/gl/GrGLNameAllocator.cpp',
       '<(skia_src_path)/gpu/gl/GrGLNameAllocator.h',
       '<(skia_src_path)/gpu/gl/GrGLNoOpInterface.cpp',
       '<(skia_src_path)/gpu/gl/GrGLNoOpInterface.h',
       '<(skia_src_path)/gpu/gl/GrGLPath.cpp',
       '<(skia_src_path)/gpu/gl/GrGLPath.h',
       '<(skia_src_path)/gpu/gl/GrGLPathRange.cpp',
       '<(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',
       '<(skia_src_path)/gpu/gl/GrGLProgramDesc.h',
       '<(skia_src_path)/gpu/gl/GrGLProgramEffects.cpp',
       '<(skia_src_path)/gpu/gl/GrGLProgramEffects.h',
       '<(skia_src_path)/gpu/gl/GrGLProgramDataManager.cpp',
       '<(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',
       '<(skia_src_path)/gpu/gl/GrGLSL_impl.h',
       '<(skia_src_path)/gpu/gl/GrGLStencilBuffer.cpp',
       '<(skia_src_path)/gpu/gl/GrGLStencilBuffer.h',
       '<(skia_src_path)/gpu/gl/GrGLTexture.cpp',
       '<(skia_src_path)/gpu/gl/GrGLTexture.h',
       '<(skia_src_path)/gpu/gl/GrGLUtil.cpp',
       '<(skia_src_path)/gpu/gl/GrGLUtil.h',
       '<(skia_src_path)/gpu/gl/GrGLUniformHandle.h',
       '<(skia_src_path)/gpu/gl/GrGLVertexArray.cpp',
       '<(skia_src_path)/gpu/gl/GrGLVertexArray.h',
       '<(skia_src_path)/gpu/gl/GrGLVertexBuffer.cpp',
       '<(skia_src_path)/gpu/gl/GrGLVertexBuffer.h',
       '<(skia_src_path)/gpu/gl/GrGpuGL.cpp',
       '<(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',
       '<(skia_include_path)/gpu/SkGrPixelRef.h',
       '<(skia_include_path)/gpu/SkGrTexturePixelRef.h',
 
       '<(skia_include_path)/gpu/gl/SkGLContextHelper.h',
 
       '<(skia_src_path)/gpu/SkGpuDevice.cpp',
       '<(skia_src_path)/gpu/SkGr.cpp',
       '<(skia_src_path)/gpu/SkGrPixelRef.cpp',
       '<(skia_src_path)/gpu/SkGrTexturePixelRef.cpp',
 
@@ skipping 60 matching lines @@
     ],
     'skgpu_null_gl_sources': [
       '<(skia_src_path)/gpu/gl/GrGLCreateNullInterface.cpp',
 
       # Sk files
       '<(skia_include_path)/gpu/gl/SkNullGLContext.h',
       '<(skia_src_path)/gpu/gl/SkNullGLContext.cpp',
     ],
   },
 }