Skip to content

Commit 545fad8

Browse files
cbrackencbracken
authored
Migrate vulkan_memory_allocator to flutter/third_party (flutter#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
1 parent 04df0c7 commit 545fad8

File tree

11 files changed

+29
-52
lines changed

11 files changed

+29
-52
lines changed

‎DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,7 @@ deps = {
680680
'src/flutter/third_party/angle':
681681
Var('chromium_git') + '/angle/angle.git' + '@' + '6a09e41ce6ea8c93524faae1a925eb01562f53b1',
682682

683-
'src/third_party/vulkan_memory_allocator':
683+
'src/flutter/third_party/vulkan_memory_allocator':
684684
Var('chromium_git') + '/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator' + '@' + '7de5cc00de50e71a3aab22dea52fbb7ff4efceb6',
685685

686686
'src/flutter/third_party/abseil-cpp':

‎build/secondary/third_party/vulkan_memory_allocator/BUILD.gn renamed to ‎build/secondary/flutter/third_party/vulkan_memory_allocator/BUILD.gn

File renamed without changes.

‎build_overrides/angle.gni

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ angle_spirv_headers_dir = "//flutter/third_party/vulkan-deps/spirv-headers/src"
3131
angle_spirv_tools_dir = "//flutter/third_party/vulkan-deps/spirv-tools/src"
3232
angle_spirv_cross_dir = "//flutter/third_party/vulkan-deps/spirv-cross/src"
3333
angle_spirv_headers_dir = "//flutter/third_party/vulkan-deps/spirv-headers/src"
34-
angle_vulkan_memory_allocator_dir = "//third_party/vulkan_memory_allocator"
34+
angle_vulkan_memory_allocator_dir =
35+
"//flutter/third_party/vulkan_memory_allocator"
3536

3637
# This is a general Chromium flag, but in the Flutter build only ANGLE needs it
3738
# so it is defined here.

‎ci/licenses_golden/excluded_files

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2468,6 +2468,18 @@
24682468
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/update_deps.py
24692469
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/vk_validation_stats.py
24702470
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/tests
2471+
../../../flutter/third_party/vulkan_memory_allocator/.git
2472+
../../../flutter/third_party/vulkan_memory_allocator/.gitignore
2473+
../../../flutter/third_party/vulkan_memory_allocator/.travis.yml
2474+
../../../flutter/third_party/vulkan_memory_allocator/CHANGELOG.md
2475+
../../../flutter/third_party/vulkan_memory_allocator/CMakeLists.txt
2476+
../../../flutter/third_party/vulkan_memory_allocator/Doxyfile
2477+
../../../flutter/third_party/vulkan_memory_allocator/README.md
2478+
../../../flutter/third_party/vulkan_memory_allocator/bin
2479+
../../../flutter/third_party/vulkan_memory_allocator/docs
2480+
../../../flutter/third_party/vulkan_memory_allocator/media
2481+
../../../flutter/third_party/vulkan_memory_allocator/src
2482+
../../../flutter/third_party/vulkan_memory_allocator/tools
24712483
../../../flutter/third_party/web_locale_keymap/CHANGELOG.md
24722484
../../../flutter/third_party/web_locale_keymap/README.md
24732485
../../../flutter/third_party/web_locale_keymap/pubspec.yaml
@@ -3296,18 +3308,6 @@
32963308
../../../third_party/perfetto/ui/src/plugins/dev.perfetto.AndroidPerf/OWNERS
32973309
../../../third_party/perfetto/ui/src/plugins/dev.perfetto.LargeScreensPerf/OWNERS
32983310
../../../third_party/perfetto/ui/src/test
3299-
../../../third_party/vulkan_memory_allocator/.git
3300-
../../../third_party/vulkan_memory_allocator/.gitignore
3301-
../../../third_party/vulkan_memory_allocator/.travis.yml
3302-
../../../third_party/vulkan_memory_allocator/CHANGELOG.md
3303-
../../../third_party/vulkan_memory_allocator/CMakeLists.txt
3304-
../../../third_party/vulkan_memory_allocator/Doxyfile
3305-
../../../third_party/vulkan_memory_allocator/README.md
3306-
../../../third_party/vulkan_memory_allocator/bin
3307-
../../../third_party/vulkan_memory_allocator/docs
3308-
../../../third_party/vulkan_memory_allocator/media
3309-
../../../third_party/vulkan_memory_allocator/src
3310-
../../../third_party/vulkan_memory_allocator/tools
33113311
../../../third_party/web_dependencies/canvaskit
33123312
../../../third_party/zlib/.git
33133313
../../../third_party/zlib/CMakeLists.txt

‎ci/licenses_golden/licenses_dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4747,7 +4747,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
47474747
This Source Code Form is "Incompatible With Secondary Licenses", as
47484748
defined by the Mozilla Public License, v. 2.0.
47494749

4750-
You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/4bc97350dc47dfc431469f9f30108f720ee42ce4
4750+
You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/4c64fcc134bf46e18fe1d9191b635fea3e5ebdff
47514751
/third_party/fallback_root_certificates/
47524752

47534753
====================================================================================================

‎ci/licenses_golden/licenses_flutter

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34181,9 +34181,12 @@ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEAL
3418134181

3418234182
====================================================================================================
3418334183
LIBRARY: vulkan-validation-layers
34184+
LIBRARY: vulkan_memory_allocator
3418434185
ORIGIN: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h
34186+
ORIGIN: ../../../flutter/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
3418534187
TYPE: LicenseType.mit
3418634188
FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h
34189+
FILE: ../../../flutter/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
3418734190
----------------------------------------------------------------------------------------------------
3418834191
Copyright (c) 2017-2022 Advanced Micro Devices, Inc. All rights reserved.
3418934192

‎ci/licenses_golden/licenses_third_party

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: e3efdc5dba31431e996c0d78df8746b2
1+
Signature: eee677b38f81238f04ec9f03cd2ba0b7
22

33
====================================================================================================
44
LIBRARY: perfetto
@@ -4418,33 +4418,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
44184418
SOFTWARE.
44194419
====================================================================================================
44204420

4421-
====================================================================================================
4422-
LIBRARY: vulkan_memory_allocator
4423-
ORIGIN: ../../../third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
4424-
TYPE: LicenseType.mit
4425-
FILE: ../../../third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
4426-
----------------------------------------------------------------------------------------------------
4427-
Copyright (c) 2017-2022 Advanced Micro Devices, Inc. All rights reserved.
4428-
4429-
Permission is hereby granted, free of charge, to any person obtaining a copy
4430-
of this software and associated documentation files (the "Software"), to deal
4431-
in the Software without restriction, including without limitation the rights
4432-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
4433-
copies of the Software, and to permit persons to whom the Software is
4434-
furnished to do so, subject to the following conditions:
4435-
4436-
The above copyright notice and this permission notice shall be included in
4437-
all copies or substantial portions of the Software.
4438-
4439-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
4440-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
4441-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
4442-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
4443-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
4444-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
4445-
THE SOFTWARE.
4446-
====================================================================================================
4447-
44484421
====================================================================================================
44494422
LIBRARY: zlib
44504423
ORIGIN: ../../../third_party/zlib/adler32_simd.c + ../../../LICENSE
@@ -4748,4 +4721,4 @@ freely, subject to the following restrictions:
47484721
3. This notice may not be removed or altered from any source distribution.
47494722
====================================================================================================
47504723

4751-
Total license count: 16
4724+
Total license count: 15

‎ci/licenses_golden/tool_signature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Signature: 3d3a0db1d0e7f5b2fe1f3739e50795f8
1+
Signature: 6d4a7215ee5679ace5ae272f414246bb
22

‎flutter_vma/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ source_set("flutter_vma") {
1717
public_deps = [
1818
"//flutter/fml",
1919
"//flutter/third_party/vulkan-deps/vulkan-headers/src:vulkan_headers",
20-
"//third_party/vulkan_memory_allocator",
20+
"//flutter/third_party/vulkan_memory_allocator",
2121
]
2222

2323
public_configs = [ "//flutter:config" ]

‎impeller/renderer/backend/vulkan/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,6 @@ impeller_component("vulkan") {
128128
"//flutter/flutter_vma",
129129
"//flutter/fml",
130130
"//flutter/third_party/vulkan-deps/vulkan-headers/src:vulkan_headers",
131-
"//third_party/vulkan_memory_allocator",
131+
"//flutter/third_party/vulkan_memory_allocator",
132132
]
133133
}

‎tools/licenses/lib/paths.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,11 @@ final Set<String> skippedPaths = <String>{
155155
r'flutter/third_party/vulkan-deps/vulkan-tools', // on hosts for tests
156156
r'flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/LICENSE.md', // redundant with licenses inside files
157157
r'flutter/third_party/vulkan-deps/vulkan-validation-layers/src/docs',
158+
r'flutter/third_party/vulkan_memory_allocator/bin',
159+
r'flutter/third_party/vulkan_memory_allocator/docs',
160+
r'flutter/third_party/vulkan_memory_allocator/media',
161+
r'flutter/third_party/vulkan_memory_allocator/src',
162+
r'flutter/third_party/vulkan_memory_allocator/tools',
158163
r'flutter/third_party/wuffs/docs',
159164
r'flutter/third_party/wuffs/script',
160165
r'flutter/third_party/yapf', // only used for code formatting
@@ -212,11 +217,6 @@ final Set<String> skippedPaths = <String>{
212217
r'third_party/perfetto/src/trace_processor', // contains nothing that ends up in the binary executable
213218
r'third_party/perfetto/src/traced', // contains nothing that ends up in the binary executable
214219
r'third_party/perfetto/src/tracing', // contains nothing that ends up in the binary executable
215-
r'third_party/vulkan_memory_allocator/bin',
216-
r'third_party/vulkan_memory_allocator/docs',
217-
r'third_party/vulkan_memory_allocator/media',
218-
r'third_party/vulkan_memory_allocator/src',
219-
r'third_party/vulkan_memory_allocator/tools',
220220
r'third_party/web_dependencies/canvaskit', // redundant; covered by Skia dependencies
221221
r'third_party/zlib/contrib/minizip/miniunz.c', // sample file
222222
r'third_party/zlib/contrib/minizip/minizip.c', // sample file

0 commit comments

Comments
 (0)