Migrate vulkan_memory_allocator to flutter/third_party (#51275)

Migrates vulkan_memory_allocator from the buildroot's third_party directory to the engine's. Issue: flutter/flutter#144812 Part of: flutter/flutter#67373 [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
flutter · Mar 8, 2024 · 545fad8 · 545fad8
1 parent 04df0c7
commit 545fad8
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 52 deletions.
diff --git a/DEPS b/DEPS
@@ -680,7 +680,7 @@ deps = {
    'src/flutter/third_party/angle':
    Var('chromium_git') + '/angle/angle.git' + '@' + '6a09e41ce6ea8c93524faae1a925eb01562f53b1',
 
-   'src/third_party/vulkan_memory_allocator':
+   'src/flutter/third_party/vulkan_memory_allocator':
    Var('chromium_git') + '/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator' + '@' + '7de5cc00de50e71a3aab22dea52fbb7ff4efceb6',
 
    'src/flutter/third_party/abseil-cpp':

diff --git a/...rd_party/vulkan_memory_allocator/BUILD.gn → ...rd_party/vulkan_memory_allocator/BUILD.gn b/...rd_party/vulkan_memory_allocator/BUILD.gn → ...rd_party/vulkan_memory_allocator/BUILD.gn
diff --git a/build_overrides/angle.gni b/build_overrides/angle.gni
@@ -31,7 +31,8 @@ angle_spirv_headers_dir = "//flutter/third_party/vulkan-deps/spirv-headers/src"
 angle_spirv_tools_dir = "//flutter/third_party/vulkan-deps/spirv-tools/src"
 angle_spirv_cross_dir = "//flutter/third_party/vulkan-deps/spirv-cross/src"
 angle_spirv_headers_dir = "//flutter/third_party/vulkan-deps/spirv-headers/src"
-angle_vulkan_memory_allocator_dir = "//third_party/vulkan_memory_allocator"
+angle_vulkan_memory_allocator_dir =
+    "//flutter/third_party/vulkan_memory_allocator"
 
 # This is a general Chromium flag, but in the Flutter build only ANGLE needs it
 # so it is defined here.

diff --git a/ci/licenses_golden/excluded_files b/ci/licenses_golden/excluded_files
@@ -2468,6 +2468,18 @@
 ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/update_deps.py
 ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/vk_validation_stats.py
 ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/tests
+../../../flutter/third_party/vulkan_memory_allocator/.git
+../../../flutter/third_party/vulkan_memory_allocator/.gitignore
+../../../flutter/third_party/vulkan_memory_allocator/.travis.yml
+../../../flutter/third_party/vulkan_memory_allocator/CHANGELOG.md
+../../../flutter/third_party/vulkan_memory_allocator/CMakeLists.txt
+../../../flutter/third_party/vulkan_memory_allocator/Doxyfile
+../../../flutter/third_party/vulkan_memory_allocator/README.md
+../../../flutter/third_party/vulkan_memory_allocator/bin
+../../../flutter/third_party/vulkan_memory_allocator/docs
+../../../flutter/third_party/vulkan_memory_allocator/media
+../../../flutter/third_party/vulkan_memory_allocator/src
+../../../flutter/third_party/vulkan_memory_allocator/tools
 ../../../flutter/third_party/web_locale_keymap/CHANGELOG.md
 ../../../flutter/third_party/web_locale_keymap/README.md
 ../../../flutter/third_party/web_locale_keymap/pubspec.yaml
@@ -3296,18 +3308,6 @@
 ../../../third_party/perfetto/ui/src/plugins/dev.perfetto.AndroidPerf/OWNERS
 ../../../third_party/perfetto/ui/src/plugins/dev.perfetto.LargeScreensPerf/OWNERS
 ../../../third_party/perfetto/ui/src/test
-../../../third_party/vulkan_memory_allocator/.git
-../../../third_party/vulkan_memory_allocator/.gitignore
-../../../third_party/vulkan_memory_allocator/.travis.yml
-../../../third_party/vulkan_memory_allocator/CHANGELOG.md
-../../../third_party/vulkan_memory_allocator/CMakeLists.txt
-../../../third_party/vulkan_memory_allocator/Doxyfile
-../../../third_party/vulkan_memory_allocator/README.md
-../../../third_party/vulkan_memory_allocator/bin
-../../../third_party/vulkan_memory_allocator/docs
-../../../third_party/vulkan_memory_allocator/media
-../../../third_party/vulkan_memory_allocator/src
-../../../third_party/vulkan_memory_allocator/tools
 ../../../third_party/web_dependencies/canvaskit
 ../../../third_party/zlib/.git
 ../../../third_party/zlib/CMakeLists.txt

diff --git a/ci/licenses_golden/licenses_dart b/ci/licenses_golden/licenses_dart
@@ -4747,7 +4747,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
   This Source Code Form is "Incompatible With Secondary Licenses", as
   defined by the Mozilla Public License, v. 2.0.
 
-You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/4bc97350dc47dfc431469f9f30108f720ee42ce4
+You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/4c64fcc134bf46e18fe1d9191b635fea3e5ebdff
 /third_party/fallback_root_certificates/
 
 ====================================================================================================

diff --git a/ci/licenses_golden/licenses_flutter b/ci/licenses_golden/licenses_flutter
@@ -34181,9 +34181,12 @@ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEAL
 
 ====================================================================================================
 LIBRARY: vulkan-validation-layers
+LIBRARY: vulkan_memory_allocator
 ORIGIN: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h
+ORIGIN: ../../../flutter/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
 TYPE: LicenseType.mit
 FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h
+FILE: ../../../flutter/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
 ----------------------------------------------------------------------------------------------------
 Copyright (c) 2017-2022 Advanced Micro Devices, Inc. All rights reserved.
 

diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party
@@ -1,4 +1,4 @@
-Signature: e3efdc5dba31431e996c0d78df8746b2
+Signature: eee677b38f81238f04ec9f03cd2ba0b7
 
 ====================================================================================================
 LIBRARY: perfetto
@@ -4418,33 +4418,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
 SOFTWARE.
 ====================================================================================================
 
-====================================================================================================
-LIBRARY: vulkan_memory_allocator
-ORIGIN: ../../../third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
-TYPE: LicenseType.mit
-FILE: ../../../third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2017-2022 Advanced Micro Devices, Inc. All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-====================================================================================================
-
 ====================================================================================================
 LIBRARY: zlib
 ORIGIN: ../../../third_party/zlib/adler32_simd.c + ../../../LICENSE
@@ -4748,4 +4721,4 @@ freely, subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 ====================================================================================================
 
-Total license count: 16
+Total license count: 15
diff --git a/ci/licenses_golden/tool_signature b/ci/licenses_golden/tool_signature
@@ -1,2 +1,2 @@
-Signature: 3d3a0db1d0e7f5b2fe1f3739e50795f8
+Signature: 6d4a7215ee5679ace5ae272f414246bb
 
diff --git a/flutter_vma/BUILD.gn b/flutter_vma/BUILD.gn
@@ -17,7 +17,7 @@ source_set("flutter_vma") {
   public_deps = [
     "//flutter/fml",
     "//flutter/third_party/vulkan-deps/vulkan-headers/src:vulkan_headers",
-    "//third_party/vulkan_memory_allocator",
+    "//flutter/third_party/vulkan_memory_allocator",
   ]
 
   public_configs = [ "//flutter:config" ]

diff --git a/impeller/renderer/backend/vulkan/BUILD.gn b/impeller/renderer/backend/vulkan/BUILD.gn
@@ -128,6 +128,6 @@ impeller_component("vulkan") {
     "//flutter/flutter_vma",
     "//flutter/fml",
     "//flutter/third_party/vulkan-deps/vulkan-headers/src:vulkan_headers",
-    "//third_party/vulkan_memory_allocator",
+    "//flutter/third_party/vulkan_memory_allocator",
   ]
 }
diff --git a/tools/licenses/lib/paths.dart b/tools/licenses/lib/paths.dart
@@ -155,6 +155,11 @@ final Set<String> skippedPaths = <String>{
   r'flutter/third_party/vulkan-deps/vulkan-tools', // on hosts for tests
   r'flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/LICENSE.md', // redundant with licenses inside files
   r'flutter/third_party/vulkan-deps/vulkan-validation-layers/src/docs',
+  r'flutter/third_party/vulkan_memory_allocator/bin',
+  r'flutter/third_party/vulkan_memory_allocator/docs',
+  r'flutter/third_party/vulkan_memory_allocator/media',
+  r'flutter/third_party/vulkan_memory_allocator/src',
+  r'flutter/third_party/vulkan_memory_allocator/tools',
   r'flutter/third_party/wuffs/docs',
   r'flutter/third_party/wuffs/script',
   r'flutter/third_party/yapf', // only used for code formatting
@@ -212,11 +217,6 @@ final Set<String> skippedPaths = <String>{
   r'third_party/perfetto/src/trace_processor', // contains nothing that ends up in the binary executable
   r'third_party/perfetto/src/traced', // contains nothing that ends up in the binary executable
   r'third_party/perfetto/src/tracing', // contains nothing that ends up in the binary executable
-  r'third_party/vulkan_memory_allocator/bin',
-  r'third_party/vulkan_memory_allocator/docs',
-  r'third_party/vulkan_memory_allocator/media',
-  r'third_party/vulkan_memory_allocator/src',
-  r'third_party/vulkan_memory_allocator/tools',
   r'third_party/web_dependencies/canvaskit', // redundant; covered by Skia dependencies
   r'third_party/zlib/contrib/minizip/miniunz.c', // sample file
   r'third_party/zlib/contrib/minizip/minizip.c', // sample file