DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move third_party/swiftshader, roll buildroot DEPS. (flutter/engine#48946)

Browse Source 
Progress towards https://github.com/flutter/flutter/issues/67373, synced with 0141e94b34.
This commit is contained in:
Matan Lurey 2023-12-12 14:23:02 -08:00 committed by GitHub
parent 06f5a18499
commit 09ba20cb6a
10 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DEPS
View File

@ -272,7 +272,7 @@ allowed_hosts = [
]
deps = {
'src': 'https://github.com/flutter/buildroot.git' + '@' + '1570fb412dab333e380450ddee32ba8c60edef2f',
'src': 'https://github.com/flutter/buildroot.git' + '@' + '0141e94b34cbd3db77f28796587334857fa985da',
'src/flutter/third_party/rapidjson':
Var('fuchsia_git') + '/third_party/rapidjson' + '@' + 'ef3564c5c8824989393b87df25355baf35ff544b',
@ -662,7 +662,7 @@ deps = {
'src/flutter/third_party/pyyaml':
Var('fuchsia_git') + '/third_party/pyyaml.git' + '@' + '25e97546488eee166b1abb229a27856cecd8b7ac',
'src/third_party/swiftshader':
'src/flutter/third_party/swiftshader':
Var('swiftshader_git') + '/SwiftShader.git' + '@' + '5b6f768198ce6a6485da31e1be06b5a17a2bf0a0',
'src/third_party/angle':

2
engine/src/flutter/ci/licenses_golden/excluded_files
View File

@ -1045,6 +1045,7 @@
../../../flutter/third_party/sqlite/README.md
../../../flutter/third_party/sqlite/VERSION
../../../flutter/third_party/stb
../../../flutter/third_party/swiftshader
../../../flutter/third_party/test_shaders
../../../flutter/third_party/tinygltf
../../../flutter/third_party/tonic/.clang-format
@ -3022,7 +3023,6 @@
../../../third_party/root_certificates/certdata.pem
../../../third_party/root_certificates/certdata.txt
../../../third_party/root_certificates/codereview.settings
../../../third_party/swiftshader
../../../third_party/vulkan-deps/.git
../../../third_party/vulkan-deps/.gitattributes
../../../third_party/vulkan-deps/.gitignore

2
engine/src/flutter/ci/licenses_golden/tool_signature
View File

@ -1,2 +1,2 @@
Signature: 9c9e9d44a47e4d85f1debd69bc795b40
Signature: 11fcac7657e1af099350216fe4aefee8

2
engine/src/flutter/impeller/BUILD.gn
View File

@ -119,7 +119,7 @@ impeller_component("impeller_unittests") {
if (glfw_vulkan_library != "") {
deps += [
"//third_party/swiftshader",
"//flutter/third_party/swiftshader",
"//third_party/vulkan-deps/vulkan-loader/src:libvulkan",
"//third_party/vulkan_validation_layers",
"//third_party/vulkan_validation_layers:vulkan_gen_json_files",

2
engine/src/flutter/impeller/golden_tests/BUILD.gn
View File

@ -75,8 +75,8 @@ if (is_mac) {
"//flutter/impeller/aiks",
"//flutter/impeller/aiks:aiks_unittests_golden",
"//flutter/impeller/fixtures",
"//flutter/third_party/swiftshader",
"//third_party/googletest:gtest",
"//third_party/swiftshader",
]
}
}

4
engine/src/flutter/shell/common/BUILD.gn
View File

@ -344,14 +344,14 @@ if (enable_unittests) {
# TODO(63837): This test is hard-coded to use a TestGLSurface so it cannot
# run on fuchsia or when GL is not enabled.
sources += [ "shell_io_manager_unittests.cc" ]
deps += [ "//third_party/swiftshader" ]
deps += [ "//flutter/third_party/swiftshader" ]
}
if (shell_enable_gl) {
deps += [
"//flutter/third_party/swiftshader",
"//third_party/angle:libEGL_static",
"//third_party/angle:libGLESv2_static",
"//third_party/swiftshader",
]
}
}

2
engine/src/flutter/shell/testing/BUILD.gn
View File

@ -50,7 +50,7 @@ executable("testing") {
deps += [
":tester_gpu_configuration",
"//flutter/impeller",
"//third_party/swiftshader",
"//flutter/third_party/swiftshader",
]
}

8
engine/src/flutter/testing/BUILD.gn
View File

@ -169,8 +169,8 @@ if (enable_unittests && shell_enable_vulkan) {
]
if (!is_fuchsia) {
deps += [ "//third_party/swiftshader" ]
configs += [ "//third_party/swiftshader:swiftshader_config" ]
deps += [ "//flutter/third_party/swiftshader" ]
configs += [ "//flutter/third_party/swiftshader:swiftshader_config" ]
}
}
}
@ -260,12 +260,12 @@ if (use_swiftshader) {
configs -= [ "//build/config/clang:extra_warnings" ]
configs += [
"//third_party/angle:gl_prototypes",
"//third_party/swiftshader:swiftshader_config",
"//flutter/third_party/swiftshader:swiftshader_config",
]
deps += [
"//flutter/third_party/swiftshader",
"//third_party/angle:libEGL_static",
"//third_party/angle:libGLESv2_static",
"//third_party/swiftshader",
]
}
}

2
engine/src/flutter/testing/ubsan_suppressions.txt
View File

@ -6,5 +6,5 @@ alignment:third_party/dart
null:third_party/dart
# Ignore errors in SwiftShader
undefined:third_party/swiftshader
undefined:flutter/third_party/swiftshader

2
engine/src/flutter/tools/licenses/lib/paths.dart
View File

@ -91,6 +91,7 @@ final Set<String> skippedPaths = <String>{
r'flutter/third_party/skia/third_party/vello', // not linked in
r'flutter/third_party/skia/tools', // contains nothing that ends up in the binary executable
r'flutter/third_party/stb',
r'flutter/third_party/swiftshader', // only used on hosts for tests
r'flutter/third_party/test_shaders', // for tests only
r'flutter/third_party/tinygltf',
r'flutter/third_party/txt/third_party/fonts',
@ -185,7 +186,6 @@ final Set<String> skippedPaths = <String>{
r'third_party/protobuf', // build-time dependency only
r'third_party/root_certificates/certdata.pem',
r'third_party/root_certificates/certdata.txt',
r'third_party/swiftshader', // only used on hosts for tests
r'third_party/vulkan-deps/glslang/LICENSE', // excluded to make sure we don't accidentally apply it as a default license
r'third_party/vulkan-deps/glslang/src/LICENSE.txt', // redundant with licenses inside files
r'third_party/vulkan-deps/glslang/src/glslang/OSDependent/Web', // we only use glslang in impellerc, not in web apps