Move GrGLShaderVar to GrGLSL

gyp/gpu.gypi

 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 # 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
@@ skipping 346 matching lines @@
       '<(skia_src_path)/gpu/gl/builders/GrGLShaderStringBuilder.h',
       '<(skia_src_path)/gpu/gl/builders/GrGLSLPrettyPrint.cpp',
       '<(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',
 
       # GLSL
-      '<(skia_src_path)/gpu/glsl/GrGLSLCaps.cpp',
-      '<(skia_src_path)/gpu/glsl/GrGLSLCaps.h',
       '<(skia_src_path)/gpu/glsl/GrGLSL.cpp',
       '<(skia_src_path)/gpu/glsl/GrGLSL.h',
       '<(skia_src_path)/gpu/glsl/GrGLSL_impl.h',
+      '<(skia_src_path)/gpu/glsl/GrGLSLCaps.cpp',
+      '<(skia_src_path)/gpu/glsl/GrGLSLCaps.h',
+      '<(skia_src_path)/gpu/gl/GrGLSLShaderVar.h',
 
       # Sk files
       '<(skia_include_path)/gpu/SkGr.h',
       '<(skia_include_path)/gpu/SkGrPixelRef.h',
       '<(skia_include_path)/gpu/SkGrTexturePixelRef.h',
 
       '<(skia_include_path)/gpu/gl/SkGLContext.h',
 
       '<(skia_src_path)/gpu/SkGpuDevice.cpp',
       '<(skia_src_path)/gpu/SkGpuDevice.h',
@@ skipping 69 matching lines @@
       '<(skia_src_path)/gpu/gl/debug/SkDebugGLContext.cpp',
       '<(skia_src_path)/gpu/gl/debug/SkDebugGLContext.h',
     ],
     'skgpu_null_gl_sources': [
       '<(skia_src_path)/gpu/gl/GrGLCreateNullInterface.cpp',
       '<(skia_src_path)/gpu/gl/SkNullGLContext.cpp',
       '<(skia_include_path)/gpu/gl/SkNullGLContext.h',
     ],
   },
 }