aboutsummaryrefslogtreecommitdiff
path: root/BUILD.gn
diff options
context:
space:
mode:
authorTobin Ehlis <tobine@google.com>2019-07-18 15:10:49 -0600
committerCommit Bot <commit-bot@chromium.org>2019-08-22 18:20:47 +0000
commit552f5fcb0d8fcc615856ce3b678190e1cbdd38e6 (patch)
tree042091d5fbee8091b080ba9afe5d4256fb5a35ab /BUILD.gn
parentee79e2ff368bff54b6b044fa89b5d4ffed9a9c13 (diff)
downloadangle-552f5fcb0d8fcc615856ce3b678190e1cbdd38e6.tar.gz
Vulkan: Use VK repos' internal BUILD.gn files
This retires custom BUILD.gn files for the Vulkan Headers, Tools, Validation-Layers, and Loader repos. They now have integrated BUILD.gn files so switched ANGLE to use those by default. Also Validation Layer, Loader, and Tools repos no longer uses codegen so this speeds up the build overall. Switched over from old VK_LAYER_LUNARG_standard_validation meta-layer to VK_LAYER_KHRONOS_validation unified layer. This changes includes a temporary workaround to the Vulkan-Loader repo to remove its Window's build dependence on WDK. There are plans to remove that depenedence in Loader master, but until then we can use our custom branch workaround. It also includes a custom branch for validation layers that includes some build fixes for ANGLE. Finally, the layers were crashing on Android when attempting to use DebugUtils extension so forcing DebugReport on Android for now. Bug: angleproject:2449 Bug: angleproject:3320 Bug: angleproject:3852 Change-Id: I48b36acefcc7f2bc930eb72d6fdbc87bca24f833 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1610438 Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Tobin Ehlis <tobine@google.com>
Diffstat (limited to 'BUILD.gn')
-rw-r--r--BUILD.gn20
1 files changed, 11 insertions, 9 deletions
diff --git a/BUILD.gn b/BUILD.gn
index 0849236331..7379163c99 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -543,17 +543,17 @@ if (angle_enable_vulkan) {
# Use this target to include everything ANGLE needs for Vulkan.
group("angle_vulkan") {
public_deps = [
- "$angle_root/third_party/vulkan-headers:vulkan_headers",
+ "$angle_root/third_party/vulkan-headers/src:vulkan_headers",
]
public_configs = [ ":vulkan_config" ]
data_deps = []
if (!is_android && !is_fuchsia) {
deps = [
- "$angle_root/third_party/vulkan-loader:libvulkan",
+ "$angle_root/third_party/vulkan-loader/src:libvulkan",
]
- data_deps += [ "$angle_root/third_party/vulkan-tools:VkICD_mock_icd" ]
+ data_deps += [ "$angle_root/third_party/vulkan-tools/src:VkICD_mock_icd" ]
public_configs +=
- [ "$angle_root/third_party/vulkan-loader:vulkan_loader_config" ]
+ [ "$angle_root/third_party/vulkan-loader/src:vulkan_loader_config" ]
}
if (is_fuchsia) {
public_deps += [
@@ -569,9 +569,9 @@ if (angle_enable_vulkan) {
"//third_party/fuchsia-sdk:vulkan_validation",
]
} else {
- data_deps += [ "$angle_root/third_party/vulkan-validation-layers:vulkan_validation_layers" ]
+ data_deps += [ "$angle_root/third_party/vulkan-validation-layers/src:vulkan_validation_layers" ]
if (!is_android) {
- data_deps += [ "$angle_root/third_party/vulkan-validation-layers:vulkan_gen_json_files" ]
+ data_deps += [ "$angle_root/third_party/vulkan-validation-layers/src:vulkan_gen_json_files" ]
}
}
}
@@ -692,7 +692,8 @@ angle_source_set("libANGLE_base") {
"${angle_glslang_dir}:glslang_sources",
"${angle_spirv_tools_dir}:spvtools_val",
]
- public_deps += [ "$angle_root/third_party/vulkan-headers:vulkan_headers" ]
+ public_deps +=
+ [ "$angle_root/third_party/vulkan-headers/src:vulkan_headers" ]
# Include generated shaders.
import("src/libANGLE/renderer/vulkan/vk_internal_shaders_autogen.gni")
@@ -1218,8 +1219,9 @@ if (!is_component_build && is_android && symbol_level != 0) {
if (angle_enable_vulkan_validation_layers) {
foreach(_layer, vulkan_validation_layers) {
- deps +=
- [ "${angle_root}/third_party/vulkan-validation-layers:${_layer}" ]
+ deps += [
+ "${angle_root}/third_party/vulkan-validation-layers/src:${_layer}",
+ ]
}
}