Skip to content

A
angle
Commit ec10096d by Courtney Goeltzenleuchter Committed by Commit Bot
Options

Vulkan: Add build toggle for validation layers.

We want to be able to build without validation layers to make it easier to use in other environments (e.g. Android) When angle_enable_vulkan is true and angle_enable_vulkan_validation_layers is true, build the Vulkan validation layers. Bug: angleproject:2489 Change-Id: I266ad8f757c5992021f249217f2be58f0148fcbf Reviewed-on: https://chromium-review.googlesource.com/1005558Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 02c9c04f
Showing with 13 additions and 6 deletions
BUILD.gn
...@@ -422,20 +422,26 @@ if (angle_enable_vulkan) { ...@@ -422,20 +422,26 @@ 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 = [
"$angle_root/third_party/vulkan-validation-layers:vulkan_validation_layers",
]
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",
] ]
data_deps = [ ]
if (!is_android) { if (!is_android) {
deps += [ "$angle_root/third_party/vulkan-validation-layers:libvulkan" ] deps += [ "$angle_root/third_party/vulkan-validation-layers:libvulkan" ]
data_deps += [ "$angle_root/third_party/vulkan-validation-layers:VkICD_mock_icd" ]
public_configs += [ "$angle_root/third_party/vulkan-validation-layers:vulkan_loader_config" ]
}
if (angle_enable_vulkan_validation_layers) {
data_deps += [ data_deps += [
"$angle_root/third_party/vulkan-validation-layers:vulkan_gen_json_files", "$angle_root/third_party/vulkan-validation-layers:vulkan_validation_layers",
"$angle_root/third_party/vulkan-validation-layers:VkICD_mock_icd",
] ]
public_configs += [ "$angle_root/third_party/vulkan-validation-layers:vulkan_loader_config" ] if (!is_android) {
data_deps += [
"$angle_root/third_party/vulkan-validation-layers:vulkan_gen_json_files",
]
}
} }
} }
} }
......
gni/angle.gni
...@@ -50,6 +50,7 @@ declare_args() { ...@@ -50,6 +50,7 @@ declare_args() {
declare_args() { declare_args() {
angle_enable_gl_null = angle_enable_gl angle_enable_gl_null = angle_enable_gl
angle_enable_hlsl = angle_enable_d3d9 || angle_enable_d3d11 angle_enable_hlsl = angle_enable_d3d9 || angle_enable_d3d11
angle_enable_vulkan_validation_layers = angle_enable_vulkan
} }
if (is_win) { if (is_win) {
......
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