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

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

Merged
merged 1 commit into from
Oct 6, 2020
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 4 additions & 13 deletions shell/common/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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") {
Expand All @@ -227,8 +222,6 @@ if (enable_unittests) {
"shell_test_platform_view_gl.h",
]

public_configs += [ ":test_enable_gl_config" ]

public_deps += [ "//flutter/testing:opengl" ]
}
}
Expand All @@ -239,8 +232,6 @@ if (enable_unittests) {
"shell_test_platform_view_vulkan.h",
]

public_configs += [ ":test_enable_vulkan_config" ]

public_deps += [ "//flutter/vulkan" ]
}
}
Expand Down