Skip to content

A
angle
Commit d9ed9c1a by Tobin Ehlis Committed by Commit Bot
Options

Put Vulkan mock ICD json file in separate dir

Create "icd" subdir in angledata directory where the Vulkan mock ICD json file is stored. This prevents potential loader conflicts with the layer json files. This change means that when running with the mock ICD a user will need to set their VK_ICD_FILENAMES env variable to now point to "<build_out_dir>/angledata/icd/VkICD_mock_icd.json" and make sure that the built mock icd library resides in the system's shared object search path. Bug: angleproject:2159 Change-Id: I802bb61a06a2f370bb1fa7a28d9c3548e5f94ecf Reviewed-on: https://chromium-review.googlesource.com/914819 Commit-Queue: Tobin Ehlis <tobine@google.com> Reviewed-by: 's avatarYuly Novikov <ynovikov@chromium.org>
parent 7b17fa18
Showing with 3 additions and 3 deletions
third_party/vulkan-validation-layers/BUILD.gn
...@@ -517,12 +517,12 @@ if (!is_android) { ...@@ -517,12 +517,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 = [ outputs = [
"$root_out_dir/$data_dir/VkICD_mock_icd.json", "$root_out_dir/$data_dir/icd/VkICD_mock_icd.json",
] ]
data = [ data = [
"$root_out_dir/$data_dir/VkICD_mock_icd.json", "$root_out_dir/$data_dir/icd/VkICD_mock_icd.json",
] ]
args += [ rebase_path("$root_out_dir/$data_dir", root_build_dir) ] args += [ rebase_path("$root_out_dir/$data_dir/icd", root_build_dir) ]
} }
} }
......
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