Skip to content

A
angle
Commit bac02d76 by Yuly Novikov Committed by Commit Bot
Options

Vulkan: Fix data_deps on layers

Was broken by https://chromium-review.googlesource.com/900096 BUG=angleproject:2339 Change-Id: I3c28a38619d83e7dcbb2349565517feb1758976c Reviewed-on: https://chromium-review.googlesource.com/907959Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
parent 8e5ba8bb
Showing with 17 additions and 11 deletions
BUILD.gn
...@@ -423,12 +423,9 @@ if (angle_enable_vulkan) { ...@@ -423,12 +423,9 @@ if (angle_enable_vulkan) {
public_deps = [ public_deps = [
"$angle_root/third_party/vulkan-validation-layers:vulkan_headers", "$angle_root/third_party/vulkan-validation-layers:vulkan_headers",
] ]
data_deps = [] data_deps = [
foreach(layer_info, layers) { "$angle_root/third_party/vulkan-validation-layers:vulkan_validation_layers",
name = layer_info[0] ]
data_deps +=
[ "$angle_root/third_party/vulkan-validation-layers:VkLayer_$name" ]
}
public_configs = [ public_configs = [
"$angle_root/third_party/glslang:glslang_config", "$angle_root/third_party/glslang:glslang_config",
"$angle_root/third_party/vulkan-validation-layers:vulkan_config", "$angle_root/third_party/vulkan-validation-layers:vulkan_config",
......
third_party/vulkan-validation-layers/BUILD.gn
...@@ -489,9 +489,7 @@ if (!is_android) { ...@@ -489,9 +489,7 @@ if (!is_android) {
shared_library("VkICD_mock_icd") { shared_library("VkICD_mock_icd") {
configs -= vulkan_undefine_configs configs -= vulkan_undefine_configs
public_configs = [ public_configs = [ ":vulkan_config" ]
":vulkan_config",
]
deps = [ deps = [
"//build/config:exe_and_shlib_deps", "//build/config:exe_and_shlib_deps",
] ]
...@@ -518,8 +516,12 @@ if (!is_android) { ...@@ -518,8 +516,12 @@ if (!is_android) {
} }
# The layer JSON files are part of the necessary data deps. # The layer JSON files are part of the necessary data deps.
outputs = [ "$root_out_dir/$data_dir/VkICD_mock_icd.json", ] outputs = [
data = [ "$root_out_dir/$data_dir/VkICD_mock_icd.json", ] "$root_out_dir/$data_dir/VkICD_mock_icd.json",
]
data = [
"$root_out_dir/$data_dir/VkICD_mock_icd.json",
]
args += [ rebase_path("$root_out_dir/$data_dir", root_build_dir) ] args += [ rebase_path("$root_out_dir/$data_dir", root_build_dir) ]
} }
} }
...@@ -615,3 +617,10 @@ foreach(layer_info, layers) { ...@@ -615,3 +617,10 @@ foreach(layer_info, layers) {
} }
} }
group("vulkan_validation_layers") {
data_deps = []
foreach(layer_info, layers) {
name = layer_info[0]
data_deps += [ ":VkLayer_$name" ]
}
}
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