Incorporate Vulkan files into main gpu.gyp/gpu.gypi

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1718273002

Review URL: https://codereview.chromium.org/1718273002

diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp
index 4179e1f7997ea72f9645400d77d9202d9bc3c6f5..e2b70648d42407ded44dbf2be8bd07fc6a77022a 100644 (file)
--- a/gyp/gpu.gyp
+++ b/gyp/gpu.gyp
@@ -107,6 +107,7 @@
         '<@(skgpu_mesa_gl_sources)',
         '<@(skgpu_debug_gl_sources)',
         '<@(skgpu_null_gl_sources)',
+        '<@(skgpu_vk_sources)',
         'gpu.gypi', # Makes the gypi appear in IDEs (but does not modify the build).
       ],
       'conditions': [
@@ -233,6 +234,84 @@
             ],
           },
         }],
+        [ 'skia_vulkan', {
+          'include_dirs': [
+            '../third_party/' # To include files under third_party/vulkan
+          ],
+          'direct_dependent_settings': {
+            'include_dirs': [
+              '../third_party/' # To include files under third_party/vulkan
+            ],
+          },
+          'conditions' : [
+            ['skia_os == "win"', {
+              'all_dependent_settings': {
+                'msvs_settings': {
+                  'VCLinkerTool': {
+                    'AdditionalDependencies': [
+                      'vulkan-1.lib',
+                      'shaderc.lib',
+                      'shaderc_util.lib',
+                      'glslang.lib',
+                      'OSDependent.lib',
+                      'OGLCompiler.lib',
+                      'SPIRV-Tools.lib',
+                      'SPIRV.lib',
+                    ],
+                  },
+                },
+              },
+              'link_settings': {
+                'configurations': {
+                  'Debug': {
+                    'msvs_settings': {
+                      'VCLinkerTool': {
+                      'AdditionalLibraryDirectories': [
+                          '../third_party/vulkan',
+                          '../third_party/shaderc/Debug',
+                        ],
+                      },
+                    },
+                  },
+                  'Release': {
+                    'msvs_settings': {
+                      'VCLinkerTool': {
+                        'AdditionalLibraryDirectories': [
+                          '../third_party/vulkan',
+                          '../third_party/shaderc/Release',
+                        ],
+                      },
+                    },
+                  },
+                  'Debug_x64': {
+                    'msvs_settings': {
+                      'VCLinkerTool': {
+                        'AdditionalLibraryDirectories': [
+                          '../third_party/vulkan',
+                          '../third_party/shaderc/Debug',
+                        ],
+                      },
+                    },
+                  },
+                  'Release_x64': {
+                      'msvs_settings': {
+                      'VCLinkerTool': {
+                        'AdditionalLibraryDirectories': [
+                          '../third_party/vulkan',
+                          '../third_party/shaderc/Release',
+                        ],
+                      },
+                    },
+                  },
+                },
+              },
+            }],
+          ],
+        }, {
+          'sources!': [
+            '<@(skgpu_vk_sources)',
+          ],
+        }],
       ],
     },
   ],

diff --git a/gyp/gpu.gypi b/gyp/gpu.gypi
index 13ca46d01e32578dc09a4a28972008203edc616a..c20ef040f8e4fed9246f58d0a324ed92e3f67d5c 100644 (file)
--- a/gyp/gpu.gypi
+++ b/gyp/gpu.gypi
@@ -433,6 +433,67 @@
 
       '<(skia_src_path)/gpu/gl/SkGLContext.cpp'
     ],
+    'skgpu_vk_sources': [
+      '<(skia_include_path)/gpu/vk/GrVkInterface.h',
+      '<(skia_src_path)/gpu/vk/GrVkBuffer.cpp',
+      '<(skia_src_path)/gpu/vk/GrVkBuffer.h',
+      '<(skia_src_path)/gpu/vk/GrVkCaps.cpp',
+      '<(skia_src_path)/gpu/vk/GrVkCaps.h',
+      '<(skia_src_path)/gpu/vk/GrVkCommandBuffer.cpp',
+      '<(skia_src_path)/gpu/vk/GrVkCommandBuffer.h',
+      '<(skia_src_path)/gpu/vk/GrVkDescriptorPool.cpp',
+      '<(skia_src_path)/gpu/vk/GrVkDescriptorPool.h',
+      '<(skia_src_path)/gpu/vk/GrVkFramebuffer.cpp',
+      '<(skia_src_path)/gpu/vk/GrVkFramebuffer.h',
+      '<(skia_src_path)/gpu/vk/GrVkGpu.cpp',
+      '<(skia_src_path)/gpu/vk/GrVkGpu.h',
+      '<(skia_src_path)/gpu/vk/GrVkImage.cpp',
+      '<(skia_src_path)/gpu/vk/GrVkImage.h',
+      '<(skia_src_path)/gpu/vk/GrVkImageView.cpp',
+      '<(skia_src_path)/gpu/vk/GrVkImageView.h',
+      '<(skia_src_path)/gpu/vk/GrVkIndexBuffer.cpp',
+      '<(skia_src_path)/gpu/vk/GrVkIndexBuffer.h',
+      '<(skia_src_path)/gpu/vk/GrVkInterface.cpp',
+      '<(skia_src_path)/gpu/vk/GrVkMemory.cpp',
+      '<(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/GrVkProgram.cpp',
+      '<(skia_src_path)/gpu/vk/GrVkProgram.h',
+      '<(skia_src_path)/gpu/vk/GrVkProgramBuilder.cpp',
+      '<(skia_src_path)/gpu/vk/GrVkProgramBuilder.h',
+      '<(skia_src_path)/gpu/vk/GrVkProgramDataManager.cpp',
+      '<(skia_src_path)/gpu/vk/GrVkProgramDataManager.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',
+      '<(skia_src_path)/gpu/vk/GrVkStencilAttachment.h',
+      '<(skia_src_path)/gpu/vk/GrVkTexture.cpp',
+      '<(skia_src_path)/gpu/vk/GrVkTexture.h',
+      '<(skia_src_path)/gpu/vk/GrVkTextureRenderTarget.cpp',
+      '<(skia_src_path)/gpu/vk/GrVkTextureRenderTarget.h',
+      '<(skia_src_path)/gpu/vk/GrVkTransferBuffer.cpp',
+      '<(skia_src_path)/gpu/vk/GrVkTransferBuffer.h',
+      '<(skia_src_path)/gpu/vk/GrVkUniformBuffer.cpp',
+      '<(skia_src_path)/gpu/vk/GrVkUniformBuffer.h',
+      '<(skia_src_path)/gpu/vk/GrVkUniformHandler.cpp',
+      '<(skia_src_path)/gpu/vk/GrVkUniformHandler.h',
+      '<(skia_src_path)/gpu/vk/GrVkUtil.cpp',
+      '<(skia_src_path)/gpu/vk/GrVkUtil.h',
+      '<(skia_src_path)/gpu/vk/GrVkVaryingHandler.cpp',
+      '<(skia_src_path)/gpu/vk/GrVkVaryingHandler.h',
+      '<(skia_src_path)/gpu/vk/GrVkVertexBuffer.cpp',
+      '<(skia_src_path)/gpu/vk/GrVkVertexBuffer.h',
+    ],
     'skgpu_native_gl_sources': [
       '<(skia_src_path)/gpu/gl/GrGLDefaultInterface_native.cpp',
       '<(skia_src_path)/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp',

diff --git a/gyp/gpuVk.gyp b/gyp/gpuVk.gyp
deleted file mode 100644 (file)
index 6f57441..0000000
--- a/gyp/gpuVk.gyp
+++ /dev/null
@@ -1,202 +0,0 @@
-#
-# Copyright 2015 Google Inc.
-#
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-#
-
-# GYP for building gpu
-{
-  'variables': {
-    'variables':
-    {
-      'vulkan_merged_into_skia%': '0',
-    },
-    'vulkan_merged_into_skia%': '<(vulkan_merged_into_skia)',
-    'conditions' : [
-      [ 'vulkan_merged_into_skia == 1', {
-        'skia_gyp_path%': '../gyp',
-        'skia_root_path%': '../',
-        'vulkan_third_party_path%': '..\\third_party',
-      }, {
-        'skia_gyp_path%': '../skia/gyp',
-        'skia_root_path%': '../skia',
-        'vulkan_third_party_path%': '..\\..\\third_party',
-      }],
-    ],
-  },
-  'target_defaults': {
-    'defines': [
-      'VK_PROTOTYPES',
-    ],
-    'conditions': [
-      ['skia_os == "win"', {
-        'all_dependent_settings': {
-          'msvs_settings': {
-            'VCLinkerTool': {
-              'AdditionalDependencies': [
-                'vulkan-1.lib',
-                'shaderc.lib',
-                'shaderc_util.lib',
-                'glslang.lib',
-                'OSDependent.lib',
-                'OGLCompiler.lib',
-                'SPIRV-Tools.lib',
-                'SPIRV.lib',
-              ],
-            },
-          },
-        },
-        'link_settings': {
-          'configurations': {
-            'Debug': {
-              'msvs_settings': {
-                'VCLinkerTool': {
-                'AdditionalLibraryDirectories': [
-                    '<(vulkan_third_party_path)\\vulkan\\',
-                    '<(vulkan_third_party_path)\\shaderc\\Debug\\',
-                  ],
-                },
-              },
-            },
-            'Release': {
-              'msvs_settings': {
-                'VCLinkerTool': {
-                  'AdditionalLibraryDirectories': [
-                    '<(vulkan_third_party_path)\\vulkan\\',
-                    '<(vulkan_third_party_path)\\shaderc\\Release\\',
-                  ],
-                },
-              },
-            },
-            'Debug_x64': {
-              'msvs_settings': {
-                'VCLinkerTool': {
-                  'AdditionalLibraryDirectories': [
-                    '<(vulkan_third_party_path)\\vulkan\\',
-                    '<(vulkan_third_party_path)\\shaderc\\Debug\\',
-                  ],
-                },
-              },
-            },
-            'Release_x64': {
-              'msvs_settings': {
-                'VCLinkerTool': {
-                  'AdditionalLibraryDirectories': [
-                    '<(vulkan_third_party_path)\\vulkan\\',
-                    '<(vulkan_third_party_path)\\shaderc\\Release\\',
-                  ],
-                },
-              },
-            },
-          },
-        },
-      }],
-      ['skia_os != "win"', {
-        'sources/': [ ['exclude', '_win.(h|cpp)$'],
-        ],
-      }],
-      ['skia_os != "mac"', {
-        'sources/': [ ['exclude', '_mac.(h|cpp|m|mm)$'],
-        ],
-      }],
-      ['skia_os != "linux" and skia_os != "chromeos"', {
-        'sources/': [ ['exclude', '_glx.(h|cpp)$'],
-        ],
-      }],
-      ['skia_os != "ios"', {
-        'sources/': [ ['exclude', '_iOS.(h|cpp|m|mm)$'],
-        ],
-      }],
-      ['skia_os != "android"', {
-        'sources/': [ ['exclude', '_android.(h|cpp)$'],
-        ],
-      }],
-      ['skia_os != "nacl"', {
-        'sources/': [ ['exclude', '_nacl.(h|cpp)$'],
-        ],
-      }],
-      ['skia_os == "nacl" or skia_egl == 0', {
-        'sources/': [ ['exclude', '_egl.(h|cpp)$'],
-        ],
-      }],
-      ['skia_os == "android"', {
-        'sources/': [ ['exclude', 'GrGLCreateNativeInterface_egl.cpp'],
-        ],
-      }],
-      ['skia_egl == 1', {
-        'sources/': [ ['exclude', '_glx.(h|cpp)$'],
-        ],
-      }],
-      # nullify the targets in this gyp file if skia_gpu is 0
-      [ 'skia_gpu == 0', {
-        'sources/': [
-          ['exclude', '.*'],
-        ],
-        'defines/': [
-          ['exclude', '.*'],
-        ],
-        'include_dirs/': [
-           ['exclude', '.*'],
-        ],
-        'link_settings': {
-          'libraries/': [
-            ['exclude', '.*'],
-          ],
-        },
-        'direct_dependent_settings': {
-          'defines/': [
-            ['exclude', '.*'],
-          ],
-          'include_dirs/': [
-            ['exclude', '.*'],
-          ],
-        },
-      }],
-    ],
-    'direct_dependent_settings': {
-      'conditions': [
-        [ 'skia_os == "win"', {
-          'defines': [
-            'GR_GL_FUNCTION_TYPE=__stdcall',
-          ],
-        }],
-      ],
-      'include_dirs': [
-        '../include/gpu',
-        '../third_party/'
-      ],
-    },
-  },
-  'targets': [
-    {
-      'target_name': 'skgpu_vk',
-      'product_name': 'skia_skgpu_vk',
-      'type': 'static_library',
-      'standalone_static_library': 1,
-      'dependencies': [
-        '<(skia_gyp_path)/core.gyp:*',
-        '<(skia_gyp_path)/utils.gyp:utils',
-        '<(skia_gyp_path)/etc1.gyp:libetc1',
-        '<(skia_gyp_path)/ktx.gyp:libSkKTX',
-      ],
-      'includes': [
-        'gpuVk.gypi',
-      ],
-      'include_dirs': [
-        '../include/gpu',
-        '../src/gpu',
-        '../third_party',
-        '<(skia_root_path)/include/gpu',
-        '<(skia_root_path)/include/private',
-        '<(skia_root_path)/src/core',
-        '<(skia_root_path)/src/gpu',
-        '<(skia_root_path)/src/image/',
-      ],
-      'sources': [
-        '<@(skgpu_vk_sources)',
-        'gpuVk.gypi', # Makes the gypi appear in IDEs (but does not modify the build).
-      ],
-    },
-  ],
-}

diff --git a/gyp/gpuVk.gypi b/gyp/gpuVk.gypi
deleted file mode 100644 (file)
index d6a68a9..0000000
--- a/gyp/gpuVk.gypi
+++ /dev/null
@@ -1,81 +0,0 @@
-#
-# 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
-#
-{
-  'variables': {
-    'skgpu_vk_sources': [
-      '../include/gpu/vk/GrVkInterface.h',
-      '../src/gpu/vk/GrVkBuffer.cpp',
-      '../src/gpu/vk/GrVkBuffer.h',
-      '../src/gpu/vk/GrVkCaps.cpp',
-      '../src/gpu/vk/GrVkCaps.h',
-      '../src/gpu/vk/GrVkCommandBuffer.cpp',
-      '../src/gpu/vk/GrVkCommandBuffer.h',
-      '../src/gpu/vk/GrVkDescriptorPool.cpp',
-      '../src/gpu/vk/GrVkDescriptorPool.h',
-      '../src/gpu/vk/GrVkFramebuffer.cpp',
-      '../src/gpu/vk/GrVkFramebuffer.h',
-      '../src/gpu/vk/GrVkGpu.cpp',
-      '../src/gpu/vk/GrVkGpu.h',
-      '../src/gpu/vk/GrVkImage.cpp',
-      '../src/gpu/vk/GrVkImage.h',
-      '../src/gpu/vk/GrVkImageView.cpp',
-      '../src/gpu/vk/GrVkImageView.h',
-      '../src/gpu/vk/GrVkIndexBuffer.cpp',
-      '../src/gpu/vk/GrVkIndexBuffer.h',
-      '../src/gpu/vk/GrVkInterface.cpp',
-      '../src/gpu/vk/GrVkMemory.cpp',
-      '../src/gpu/vk/GrVkMemory.h',
-      '../src/gpu/vk/GrVkPipeline.cpp',
-      '../src/gpu/vk/GrVkPipeline.h',
-      '../src/gpu/vk/GrVkProgram.cpp',
-      '../src/gpu/vk/GrVkProgram.h',
-      '../src/gpu/vk/GrVkProgramBuilder.cpp',
-      '../src/gpu/vk/GrVkProgramBuilder.h',
-      '../src/gpu/vk/GrVkProgramDataManager.cpp',
-      '../src/gpu/vk/GrVkProgramDataManager.h',
-      '../src/gpu/vk/GrVkProgramDesc.cpp',
-      '../src/gpu/vk/GrVkProgramDesc.h',
-      '../src/gpu/vk/GrVkRenderPass.cpp',
-      '../src/gpu/vk/GrVkRenderPass.h',
-      '../src/gpu/vk/GrVkRenderTarget.cpp',
-      '../src/gpu/vk/GrVkRenderTarget.h',
-      '../src/gpu/vk/GrVkResource.h',
-      '../src/gpu/vk/GrVkResourceProvider.cpp',
-      '../src/gpu/vk/GrVkResourceProvider.h',
-      '../src/gpu/vk/GrVkSampler.cpp',
-      '../src/gpu/vk/GrVkSampler.h',
-      '../src/gpu/vk/GrVkStencilAttachment.cpp',
-      '../src/gpu/vk/GrVkStencilAttachment.h',
-      '../src/gpu/vk/GrVkTexture.cpp',
-      '../src/gpu/vk/GrVkTexture.h',
-      '../src/gpu/vk/GrVkTextureRenderTarget.cpp',
-      '../src/gpu/vk/GrVkTextureRenderTarget.h',
-      '../src/gpu/vk/GrVkTransferBuffer.cpp',
-      '../src/gpu/vk/GrVkTransferBuffer.h',
-      '../src/gpu/vk/GrVkUniformBuffer.cpp',
-      '../src/gpu/vk/GrVkUniformBuffer.h',
-      '../src/gpu/vk/GrVkUniformHandler.cpp',
-      '../src/gpu/vk/GrVkUniformHandler.h',
-      '../src/gpu/vk/GrVkUtil.cpp',
-      '../src/gpu/vk/GrVkUtil.h',
-      '../src/gpu/vk/GrVkVaryingHandler.cpp',
-      '../src/gpu/vk/GrVkVaryingHandler.h',
-      '../src/gpu/vk/GrVkVertexBuffer.cpp',
-      '../src/gpu/vk/GrVkVertexBuffer.h',
-
-#      '../testfiles/vktest.cpp',
-    ],
-  },
-}