Skip to content

A
angle
Commit 08b9e046 by Jamie Madill Committed by Commit Bot
Options

Vulkan: Disable warning in Mock ICD.

We were missing a "no chromium code" config in the mock ICD. This was causing a build error, but the build error was mostly invisible because the mock ICD wasn't being built by default. Fix this by including it in the angle_vulkan target. Bug: angleproject:2482 Change-Id: I417d3fbf6a4acd93c06bab61967409730c2ea4ed Reviewed-on: https://chromium-review.googlesource.com/1012497Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 41c43ce7
Showing with 3 additions and 0 deletions
BUILD.gn
...@@ -424,6 +424,7 @@ if (angle_enable_vulkan) { ...@@ -424,6 +424,7 @@ if (angle_enable_vulkan) {
] ]
data_deps = [ data_deps = [
"$angle_root/third_party/vulkan-validation-layers:vulkan_validation_layers", "$angle_root/third_party/vulkan-validation-layers:vulkan_validation_layers",
"$angle_root/third_party/vulkan-validation-layers:VkICD_mock_icd",
] ]
public_configs = [ public_configs = [
"$angle_root/third_party/glslang:glslang_config", "$angle_root/third_party/glslang:glslang_config",
......
third_party/vulkan-validation-layers/BUILD.gn
...@@ -506,6 +506,8 @@ if (!is_android) { ...@@ -506,6 +506,8 @@ if (!is_android) {
if (is_win) { if (is_win) {
sources += [ "src/icd/VkICD_mock_icd.def" ] sources += [ "src/icd/VkICD_mock_icd.def" ]
} }
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
} }
action("vulkan_gen_icd_json_file") { action("vulkan_gen_icd_json_file") {
......
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