Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit a1777a3

Browse files
authored
Move third_party/swiftshader, roll buildroot DEPS. (#48946)
Progress towards flutter/flutter#67373, synced with flutter/buildroot@0141e94.
1 parent dabf364 commit a1777a3

File tree

10 files changed

+15
-15
lines changed

10 files changed

+15
-15
lines changed

DEPS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ allowed_hosts = [
272272
]
273273

274274
deps = {
275-
'src': 'https://github.com/flutter/buildroot.git' + '@' + '1570fb412dab333e380450ddee32ba8c60edef2f',
275+
'src': 'https://github.com/flutter/buildroot.git' + '@' + '0141e94b34cbd3db77f28796587334857fa985da',
276276

277277
'src/flutter/third_party/rapidjson':
278278
Var('fuchsia_git') + '/third_party/rapidjson' + '@' + 'ef3564c5c8824989393b87df25355baf35ff544b',
@@ -662,7 +662,7 @@ deps = {
662662
'src/flutter/third_party/pyyaml':
663663
Var('fuchsia_git') + '/third_party/pyyaml.git' + '@' + '25e97546488eee166b1abb229a27856cecd8b7ac',
664664

665-
'src/third_party/swiftshader':
665+
'src/flutter/third_party/swiftshader':
666666
Var('swiftshader_git') + '/SwiftShader.git' + '@' + '5b6f768198ce6a6485da31e1be06b5a17a2bf0a0',
667667

668668
'src/third_party/angle':

ci/licenses_golden/excluded_files

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1045,6 +1045,7 @@
10451045
../../../flutter/third_party/sqlite/README.md
10461046
../../../flutter/third_party/sqlite/VERSION
10471047
../../../flutter/third_party/stb
1048+
../../../flutter/third_party/swiftshader
10481049
../../../flutter/third_party/test_shaders
10491050
../../../flutter/third_party/tinygltf
10501051
../../../flutter/third_party/tonic/.clang-format
@@ -3022,7 +3023,6 @@
30223023
../../../third_party/root_certificates/certdata.pem
30233024
../../../third_party/root_certificates/certdata.txt
30243025
../../../third_party/root_certificates/codereview.settings
3025-
../../../third_party/swiftshader
30263026
../../../third_party/vulkan-deps/.git
30273027
../../../third_party/vulkan-deps/.gitattributes
30283028
../../../third_party/vulkan-deps/.gitignore

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: 9c9e9d44a47e4d85f1debd69bc795b40
1+
Signature: 11fcac7657e1af099350216fe4aefee8
22

impeller/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ impeller_component("impeller_unittests") {
119119

120120
if (glfw_vulkan_library != "") {
121121
deps += [
122-
"//third_party/swiftshader",
122+
"//flutter/third_party/swiftshader",
123123
"//third_party/vulkan-deps/vulkan-loader/src:libvulkan",
124124
"//third_party/vulkan_validation_layers",
125125
"//third_party/vulkan_validation_layers:vulkan_gen_json_files",

impeller/golden_tests/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ if (is_mac) {
7575
"//flutter/impeller/aiks",
7676
"//flutter/impeller/aiks:aiks_unittests_golden",
7777
"//flutter/impeller/fixtures",
78+
"//flutter/third_party/swiftshader",
7879
"//third_party/googletest:gtest",
79-
"//third_party/swiftshader",
8080
]
8181
}
8282
}

shell/common/BUILD.gn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -344,14 +344,14 @@ if (enable_unittests) {
344344
# TODO(63837): This test is hard-coded to use a TestGLSurface so it cannot
345345
# run on fuchsia or when GL is not enabled.
346346
sources += [ "shell_io_manager_unittests.cc" ]
347-
deps += [ "//third_party/swiftshader" ]
347+
deps += [ "//flutter/third_party/swiftshader" ]
348348
}
349349

350350
if (shell_enable_gl) {
351351
deps += [
352+
"//flutter/third_party/swiftshader",
352353
"//third_party/angle:libEGL_static",
353354
"//third_party/angle:libGLESv2_static",
354-
"//third_party/swiftshader",
355355
]
356356
}
357357
}

shell/testing/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ executable("testing") {
5050
deps += [
5151
":tester_gpu_configuration",
5252
"//flutter/impeller",
53-
"//third_party/swiftshader",
53+
"//flutter/third_party/swiftshader",
5454
]
5555
}
5656

testing/BUILD.gn

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,8 @@ if (enable_unittests && shell_enable_vulkan) {
169169
]
170170

171171
if (!is_fuchsia) {
172-
deps += [ "//third_party/swiftshader" ]
173-
configs += [ "//third_party/swiftshader:swiftshader_config" ]
172+
deps += [ "//flutter/third_party/swiftshader" ]
173+
configs += [ "//flutter/third_party/swiftshader:swiftshader_config" ]
174174
}
175175
}
176176
}
@@ -260,12 +260,12 @@ if (use_swiftshader) {
260260
configs -= [ "//build/config/clang:extra_warnings" ]
261261
configs += [
262262
"//third_party/angle:gl_prototypes",
263-
"//third_party/swiftshader:swiftshader_config",
263+
"//flutter/third_party/swiftshader:swiftshader_config",
264264
]
265265
deps += [
266+
"//flutter/third_party/swiftshader",
266267
"//third_party/angle:libEGL_static",
267268
"//third_party/angle:libGLESv2_static",
268-
"//third_party/swiftshader",
269269
]
270270
}
271271
}

testing/ubsan_suppressions.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ alignment:third_party/dart
66
null:third_party/dart
77

88
# Ignore errors in SwiftShader
9-
undefined:third_party/swiftshader
9+
undefined:flutter/third_party/swiftshader
1010

tools/licenses/lib/paths.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ final Set<String> skippedPaths = <String>{
9191
r'flutter/third_party/skia/third_party/vello', // not linked in
9292
r'flutter/third_party/skia/tools', // contains nothing that ends up in the binary executable
9393
r'flutter/third_party/stb',
94+
r'flutter/third_party/swiftshader', // only used on hosts for tests
9495
r'flutter/third_party/test_shaders', // for tests only
9596
r'flutter/third_party/tinygltf',
9697
r'flutter/third_party/txt/third_party/fonts',
@@ -185,7 +186,6 @@ final Set<String> skippedPaths = <String>{
185186
r'third_party/protobuf', // build-time dependency only
186187
r'third_party/root_certificates/certdata.pem',
187188
r'third_party/root_certificates/certdata.txt',
188-
r'third_party/swiftshader', // only used on hosts for tests
189189
r'third_party/vulkan-deps/glslang/LICENSE', // excluded to make sure we don't accidentally apply it as a default license
190190
r'third_party/vulkan-deps/glslang/src/LICENSE.txt', // redundant with licenses inside files
191191
r'third_party/vulkan-deps/glslang/src/glslang/OSDependent/Web', // we only use glslang in impellerc, not in web apps

0 commit comments

Comments
 (0)