Skip to content

A
angle
Commit 35218632 by Michael Spang Committed by Commit Bot
Options

Vulkan: Move vulkan config target to $angle_root:vulkan_config

This will allow us to avoid loading the build file for //third_party/vulkan-validation-layers on Fuchsia, since we don't want to build the validation layers on that platform. BUG=angleproject:2475 TEST=angle_end2end_tests on Fuchsia (with full series) Change-Id: Ifeb67125f5fcebf2b30ae18b760667ba7c56e4d5 Reviewed-on: https://chromium-review.googlesource.com/c/1456479 Commit-Queue: Michael Spang <spang@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent 36433590
Showing with 30 additions and 72 deletions
BUILD.gn
...@@ -459,13 +459,34 @@ config("libANGLE_config") { ...@@ -459,13 +459,34 @@ config("libANGLE_config") {
} }
if (angle_enable_vulkan) { if (angle_enable_vulkan) {
config("vulkan_config") {
if (is_win) {
defines = [
"VK_USE_PLATFORM_WIN32_KHR",
"VK_USE_PLATFORM_WIN32_KHX",
]
}
if (is_linux) {
defines = [
"VK_USE_PLATFORM_XCB_KHR",
"VK_USE_PLATFORM_XCB_KHX",
]
}
if (is_android) {
defines = [
"VK_USE_PLATFORM_ANDROID_KHR",
"VK_USE_PLATFORM_ANDROID_KHX",
]
libs = [ "vulkan" ]
}
}
# Use this target to include everything ANGLE needs for Vulkan. # Use this target to include everything ANGLE needs for Vulkan.
group("angle_vulkan") { group("angle_vulkan") {
public_deps = [ public_deps = [
"$angle_root/third_party/vulkan-headers:vulkan_headers", "$angle_root/third_party/vulkan-headers:vulkan_headers",
] ]
public_configs = public_configs = [ ":vulkan_config" ]
[ "$angle_root/third_party/vulkan-validation-layers:vulkan_config" ]
data_deps = [] data_deps = []
if (!is_android) { if (!is_android) {
deps = [ deps = [
......
third_party/vulkan-loader/BUILD.gn
...@@ -138,28 +138,6 @@ group("vulkan_generate_helper_files") { ...@@ -138,28 +138,6 @@ group("vulkan_generate_helper_files") {
} }
} }
config("vulkan_config") {
if (is_win) {
defines = [
"VK_USE_PLATFORM_WIN32_KHR",
"VK_USE_PLATFORM_WIN32_KHX",
]
}
if (is_linux) {
defines = [
"VK_USE_PLATFORM_XCB_KHR",
"VK_USE_PLATFORM_XCB_KHX",
]
}
if (is_android) {
defines = [
"VK_USE_PLATFORM_ANDROID_KHR",
"VK_USE_PLATFORM_ANDROID_KHX",
]
libs = [ "vulkan" ]
}
}
config("vulkan_internal_config") { config("vulkan_internal_config") {
defines = [ "VULKAN_NON_CMAKE_BUILD" ] defines = [ "VULKAN_NON_CMAKE_BUILD" ]
if (is_clang || !is_win) { if (is_clang || !is_win) {
...@@ -259,7 +237,7 @@ if (!is_android) { ...@@ -259,7 +237,7 @@ if (!is_android) {
configs += [ "//build/config/compiler:no_chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ]
configs += [ ":vulkan_internal_config" ] configs += [ ":vulkan_internal_config" ]
public_configs = [ public_configs = [
":vulkan_config", "$angle_root:vulkan_config",
":vulkan_loader_config", ":vulkan_loader_config",
] ]
configs -= vulkan_undefine_configs configs -= vulkan_undefine_configs
......
third_party/vulkan-tools/BUILD.gn
...@@ -104,28 +104,6 @@ group("vulkan_generate_helper_files") { ...@@ -104,28 +104,6 @@ group("vulkan_generate_helper_files") {
} }
} }
config("vulkan_config") {
if (is_win) {
defines = [
"VK_USE_PLATFORM_WIN32_KHR",
"VK_USE_PLATFORM_WIN32_KHX",
]
}
if (is_linux) {
defines = [
"VK_USE_PLATFORM_XCB_KHR",
"VK_USE_PLATFORM_XCB_KHX",
]
}
if (is_android) {
defines = [
"VK_USE_PLATFORM_ANDROID_KHR",
"VK_USE_PLATFORM_ANDROID_KHX",
]
libs = [ "vulkan" ]
}
}
config("vulkan_internal_config") { config("vulkan_internal_config") {
defines = [ "VULKAN_NON_CMAKE_BUILD" ] defines = [ "VULKAN_NON_CMAKE_BUILD" ]
if (is_clang || !is_win) { if (is_clang || !is_win) {
...@@ -169,7 +147,7 @@ if (!is_android) { ...@@ -169,7 +147,7 @@ if (!is_android) {
shared_library("VkICD_mock_icd") { shared_library("VkICD_mock_icd") {
configs -= vulkan_undefine_configs configs -= vulkan_undefine_configs
public_configs = [ ":vulkan_config" ] public_configs = [ "$angle_root:vulkan_config" ]
deps = [ deps = [
":vulkan_generate_mock_icd_files", ":vulkan_generate_mock_icd_files",
] ]
......
third_party/vulkan-validation-layers/BUILD.gn
...@@ -197,30 +197,11 @@ group("vulkan_generate_helper_files") { ...@@ -197,30 +197,11 @@ group("vulkan_generate_helper_files") {
} }
} }
config("vulkan_config") {
if (is_win) {
defines = [
"VK_USE_PLATFORM_WIN32_KHR",
"VK_USE_PLATFORM_WIN32_KHX",
]
}
if (is_linux) {
defines = [
"VK_USE_PLATFORM_XCB_KHR",
"VK_USE_PLATFORM_XCB_KHX",
]
}
if (is_android) {
defines = [
"VK_USE_PLATFORM_ANDROID_KHR",
"VK_USE_PLATFORM_ANDROID_KHX",
]
}
defines += [ "API_NAME=\"Vulkan\"" ]
}
config("vulkan_internal_config") { config("vulkan_internal_config") {
defines = [ "VULKAN_NON_CMAKE_BUILD" ] defines = [
"VULKAN_NON_CMAKE_BUILD",
"API_NAME=\"Vulkan\"",
]
if (is_clang || !is_win) { if (is_clang || !is_win) {
cflags = [ "-Wno-unused-function" ] cflags = [ "-Wno-unused-function" ]
} }
...@@ -356,7 +337,7 @@ source_set("vulkan_layer_utils") { ...@@ -356,7 +337,7 @@ source_set("vulkan_layer_utils") {
"src/layers/vk_layer_utils.h", "src/layers/vk_layer_utils.h",
] ]
public_configs = [ public_configs = [
":vulkan_config", "$angle_root:vulkan_config",
":vulkan_internal_config", ":vulkan_internal_config",
] ]
configs -= [ "//build/config/compiler:chromium_code" ] configs -= [ "//build/config/compiler:chromium_code" ]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment