Merge ProgramDesc's for GL and Vulkan

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 340 matching lines @@
       '<(skia_src_path)/gpu/gl/GrGLInterface.cpp',
       '<(skia_src_path)/gpu/gl/GrGLIRect.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/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/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/GrGLSampler.h',
       '<(skia_src_path)/gpu/gl/GrGLStencilAttachment.cpp',
       '<(skia_src_path)/gpu/gl/GrGLStencilAttachment.h',
       '<(skia_src_path)/gpu/gl/GrGLTestInterface.cpp',
       '<(skia_src_path)/gpu/gl/GrGLTestInterface.h',
       '<(skia_src_path)/gpu/gl/GrGLTexture.cpp',
@@ skipping 33 matching lines @@
       '<(skia_src_path)/gpu/glsl/GrGLSLGeometryProcessor.h',
       '<(skia_src_path)/gpu/glsl/GrGLSLGeometryShaderBuilder.cpp',
       '<(skia_src_path)/gpu/glsl/GrGLSLGeometryShaderBuilder.h',
       '<(skia_src_path)/gpu/glsl/GrGLSLPrimitiveProcessor.cpp',
       '<(skia_src_path)/gpu/glsl/GrGLSLPrimitiveProcessor.h',
       '<(skia_src_path)/gpu/glsl/GrGLSLProcessorTypes.h',
       '<(skia_src_path)/gpu/glsl/GrGLSLProgramBuilder.cpp',
       '<(skia_src_path)/gpu/glsl/GrGLSLProgramBuilder.h',
       '<(skia_src_path)/gpu/glsl/GrGLSLProgramDataManager.cpp',
       '<(skia_src_path)/gpu/glsl/GrGLSLProgramDataManager.h',
+      '<(skia_src_path)/gpu/glsl/GrGLSLProgramDesc.cpp',
+      '<(skia_src_path)/gpu/glsl/GrGLSLProgramDesc.h',
       '<(skia_src_path)/gpu/glsl/GrGLSLSampler.h',
       '<(skia_src_path)/gpu/glsl/GrGLSLShaderBuilder.cpp',
       '<(skia_src_path)/gpu/glsl/GrGLSLShaderBuilder.h',
       '<(skia_src_path)/gpu/glsl/GrGLSLShaderVar.h',
       '<(skia_src_path)/gpu/glsl/GrGLSLUniformHandler.h',
       '<(skia_src_path)/gpu/glsl/GrGLSLUtil.cpp',
       '<(skia_src_path)/gpu/glsl/GrGLSLUtil.h',
       '<(skia_src_path)/gpu/glsl/GrGLSLVarying.cpp',
       '<(skia_src_path)/gpu/glsl/GrGLSLVarying.h',
       '<(skia_src_path)/gpu/glsl/GrGLSLVertexShaderBuilder.cpp',
@@ skipping 53 matching lines @@
       '<(skia_src_path)/gpu/vk/GrVkMemory.h',
       '<(skia_src_path)/gpu/vk/GrVkPipeline.cpp',
       '<(skia_src_path)/gpu/vk/GrVkPipeline.h',
       '<(skia_src_path)/gpu/vk/GrVkPipelineState.cpp',
       '<(skia_src_path)/gpu/vk/GrVkPipelineState.h',
       '<(skia_src_path)/gpu/vk/GrVkPipelineStateBuilder.cpp',
       '<(skia_src_path)/gpu/vk/GrVkPipelineStateBuilder.h',
       '<(skia_src_path)/gpu/vk/GrVkPipelineStateCache.cpp',
       '<(skia_src_path)/gpu/vk/GrVkPipelineStateDataManager.cpp',
       '<(skia_src_path)/gpu/vk/GrVkPipelineStateDataManager.h',
-      '<(skia_src_path)/gpu/vk/GrVkProgramDesc.cpp',
-      '<(skia_src_path)/gpu/vk/GrVkProgramDesc.h',
       '<(skia_src_path)/gpu/vk/GrVkRenderPass.cpp',
       '<(skia_src_path)/gpu/vk/GrVkRenderPass.h',
       '<(skia_src_path)/gpu/vk/GrVkRenderTarget.cpp',
       '<(skia_src_path)/gpu/vk/GrVkRenderTarget.h',
       '<(skia_src_path)/gpu/vk/GrVkResource.h',
       '<(skia_src_path)/gpu/vk/GrVkResourceProvider.cpp',
       '<(skia_src_path)/gpu/vk/GrVkResourceProvider.h',
       '<(skia_src_path)/gpu/vk/GrVkSampler.cpp',
       '<(skia_src_path)/gpu/vk/GrVkSampler.h',
       '<(skia_src_path)/gpu/vk/GrVkStencilAttachment.cpp',
@@ skipping 21 matching lines @@
       '<(skia_src_path)/gpu/gl/win/GrGLCreateNativeInterface_win.cpp',
       '<(skia_src_path)/gpu/gl/glx/GrGLCreateNativeInterface_glx.cpp',
       '<(skia_src_path)/gpu/gl/egl/GrGLCreateNativeInterface_egl.cpp',
       '<(skia_src_path)/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp',
       '<(skia_src_path)/gpu/gl/android/GrGLCreateNativeInterface_android.cpp',
     ],
     'skgpu_null_gl_sources': [
     ],
   },
 }