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

Use the gpu config for shell_unittests to declare SHELL_ENABLE_{GL,VULKAN} (#21603)

Browse Source
This commit is contained in:
George Wright 2020-10-06 12:47:02 -07:00 committed by GitHub
parent 042c7f0422
commit ea420db5fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
shell/common/BUILD.gn
View File

@ -144,14 +144,6 @@ template("shell_host_executable") {
}
if (enable_unittests) {
config("test_enable_gl_config") {
defines = [ "SHELL_ENABLE_GL" ]
}
config("test_enable_vulkan_config") {
defines = [ "SHELL_ENABLE_VULKAN" ]
}
shell_gpu_configuration("shell_unittests_gpu_configuration") {
enable_software = test_enable_software
enable_vulkan = test_enable_vulkan
@ -217,7 +209,10 @@ if (enable_unittests) {
"//third_party/skia",
]
public_configs = [ ":shell_test_fixture_sources_config" ]
public_configs = [
":shell_test_fixture_sources_config",
":shell_unittests_gpu_configuration_config",
]
# SwiftShader only supports x86/x64_64
if (target_cpu == "x86" || target_cpu == "x64") {
@ -227,8 +222,6 @@ if (enable_unittests) {
"shell_test_platform_view_gl.h",
]
public_configs += [ ":test_enable_gl_config" ]
public_deps += [ "//flutter/testing:opengl" ]
}
}
@ -239,8 +232,6 @@ if (enable_unittests) {
"shell_test_platform_view_vulkan.h",
]
public_configs += [ ":test_enable_vulkan_config" ]
public_deps += [ "//flutter/vulkan" ]
}
}