Merge GrGLSLProgramDesc into GrProgramDesc

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 128 matching lines @@
       '<(skia_src_path)/gpu/GrPathRendering.h',
       '<(skia_src_path)/gpu/GrPathUtils.cpp',
       '<(skia_src_path)/gpu/GrPathUtils.h',
       '<(skia_src_path)/gpu/GrPendingProgramElement.h',
       '<(skia_src_path)/gpu/GrPipeline.cpp',
       '<(skia_src_path)/gpu/GrPipeline.h',
       '<(skia_src_path)/gpu/GrPipelineBuilder.cpp',
       '<(skia_src_path)/gpu/GrPipelineBuilder.h',
       '<(skia_src_path)/gpu/GrPrimitiveProcessor.cpp',
       '<(skia_src_path)/gpu/GrPrimitiveProcessor.h',
+      '<(skia_src_path)/gpu/GrProgramDesc.cpp',
       '<(skia_src_path)/gpu/GrProgramDesc.h',
       '<(skia_src_path)/gpu/GrProgramElement.cpp',
       '<(skia_src_path)/gpu/GrProcessor.cpp',
       '<(skia_src_path)/gpu/GrProcessorUnitTest.cpp',
       '<(skia_src_path)/gpu/GrProcOptInfo.cpp',
       '<(skia_src_path)/gpu/GrProcOptInfo.h',
       '<(skia_src_path)/gpu/GrGpuResourceRef.cpp',
       '<(skia_src_path)/gpu/GrQuad.h',
       '<(skia_src_path)/gpu/GrRect.h',
       '<(skia_src_path)/gpu/GrRectanizer.h',
@@ skipping 255 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 94 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': [
     ],
   },
 }