Skip to content

A
angle
Commit 7cc14ee8 by Jamie Madill Committed by Commit Bot
Options

Vulkan: Update build files after roll.

They have consolidated to one helper script generator. Simplifies the GN build. This also re-enables the Vulkan back-end after the roll. BUG=angleproject:1319 Change-Id: Ie98568ae5d1dc46932ea8d698809561da7591836 Reviewed-on: https://chromium-review.googlesource.com/427307Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 4be6c6cc
Showing with 184 additions and 135 deletions
gni/angle.gni
...@@ -15,8 +15,7 @@ if (is_win) { ...@@ -15,8 +15,7 @@ if (is_win) {
angle_enable_d3d9 = true angle_enable_d3d9 = true
angle_enable_d3d11 = true angle_enable_d3d11 = true
angle_enable_gl = true angle_enable_gl = true
# TODO(jmadill): Re-enable Vulkan after roll. angle_enable_vulkan = true
angle_enable_vulkan = false
import("//build/config/win/visual_studio_version.gni") import("//build/config/win/visual_studio_version.gni")
} else if (is_linux && use_x11 && !is_chromeos) { } else if (is_linux && use_x11 && !is_chromeos) {
......
src/angle.gyp
...@@ -30,8 +30,7 @@ ...@@ -30,8 +30,7 @@
'angle_enable_d3d9%': 1, 'angle_enable_d3d9%': 1,
'angle_enable_d3d11%': 1, 'angle_enable_d3d11%': 1,
'angle_enable_hlsl%': 1, 'angle_enable_hlsl%': 1,
# TODO(jmadill): Re-enable Vulkan after roll. 'angle_enable_vulkan%': 1,
'angle_enable_vulkan%': 0,
}], }],
['OS=="linux" and use_x11==1 and chromeos==0', ['OS=="linux" and use_x11==1 and chromeos==0',
{ {
......
src/vulkan_support/BUILD.gn
...@@ -81,58 +81,78 @@ source_set("vulkan_layer_utils") { ...@@ -81,58 +81,78 @@ source_set("vulkan_layer_utils") {
configs -= vulkan_undefine_configs configs -= vulkan_undefine_configs
} }
action("vulkan_gen_dispatch_table_helper") { helper_script_and_deps = [
script = "$vulkan_layers_dir/scripts/lvl_genvk.py" [
inputs = [ "vulkan_gen_dispatch_table_helper",
"$vulkan_layers_dir/scripts/dispatch_table_generator.py",
"$vulkan_layers_dir/scripts/generator.py",
"$vulkan_layers_dir/scripts/reg.py",
"$vulkan_layers_dir/scripts/vk.xml",
"$vulkan_layers_dir/scripts/vulkan.py",
]
outputs = [
"$vulkan_gen_dir/vk_dispatch_table_helper.h",
]
args = [
"-o",
raw_vulkan_gen_dir,
"-registry",
"$raw_vulkan_layers_dir/scripts/vk.xml",
"vk_dispatch_table_helper.h", "vk_dispatch_table_helper.h",
"-quiet", "dispatch_table_generator.py",
] ],
} [
"vulkan_gen_enum_string_helper",
action("vulkan_gen_struct_wrappers") { "vk_enum_string_helper.h",
script = "$vulkan_layers_dir/scripts/vk_helper.py" "helper_file_generator.py",
inputs = [ ],
"$vulkan_layers_dir/include/vulkan/vulkan.h", [
] "vulkan_gen_safe_struct_cpp",
outputs = vulkan_gypi.vulkan_struct_wrappers_outputs "vk_safe_struct.cpp",
args = [ "helper_file_generator.py",
"--gen_struct_wrappers", ],
rebase_path(vulkan_layers_dir) + "/include/vulkan/vulkan.h", [
"--abs_out_dir", "vulkan_gen_safe_struct_h",
raw_vulkan_gen_dir, "vk_safe_struct.h",
"--quiet", "helper_file_generator.py",
] ],
} [
"vulkan_gen_struct_size_helper_c",
"vk_struct_size_helper.c",
"helper_file_generator.py",
],
[
"vulkan_gen_struct_size_helper_h",
"vk_struct_size_helper.h",
"helper_file_generator.py",
],
[
"vulkan_gen_thread_check_helper",
"thread_check.h",
"threading_generator.py",
],
[
"vulkan_gen_parameter_validation_helper",
"parameter_validation.h",
"parameter_validation_generator.py",
],
[
"vulkan_gen_unique_objects_wrappers_helper",
"unique_objects_wrappers.h",
"unique_objects_generator.py",
],
]
action("vulkan_gen_enum_string_helper") { foreach(script_and_dep, helper_script_and_deps) {
script = "$vulkan_layers_dir/scripts/vk_helper.py" target_name = script_and_dep[0]
inputs = [ file = script_and_dep[1]
"$vulkan_layers_dir/include/vulkan/vulkan.h", dep = script_and_dep[2]
] target("action", target_name) {
outputs = [ script = "$vulkan_layers_dir/scripts/lvl_genvk.py"
"$vulkan_gen_dir/vk_enum_string_helper.h", inputs = [
] "$vulkan_layers_dir/scripts/$dep",
args = [ "$vulkan_layers_dir/scripts/generator.py",
"--gen_enum_string_helper", "$vulkan_layers_dir/scripts/reg.py",
rebase_path(vulkan_layers_dir) + "/include/vulkan/vulkan.h", "$vulkan_layers_dir/scripts/vk.xml",
"--abs_out_dir", ]
raw_vulkan_gen_dir, outputs = [
"--quiet", "$vulkan_gen_dir/$file",
] ]
args = [
"-o",
raw_vulkan_gen_dir,
"-registry",
"$raw_vulkan_layers_dir/scripts/vk.xml",
"$file",
"-quiet",
]
}
} }
config("vulkan_layer_config") { config("vulkan_layer_config") {
...@@ -145,11 +165,12 @@ config("vulkan_layer_config") { ...@@ -145,11 +165,12 @@ config("vulkan_layer_config") {
source_set("vulkan_layer_table") { source_set("vulkan_layer_table") {
configs -= vulkan_undefine_configs configs -= vulkan_undefine_configs
public_deps = [ public_deps = [
":vulkan_gen_dispatch_table_helper",
":vulkan_gen_enum_string_helper",
":vulkan_gen_struct_wrappers",
":vulkan_layer_utils", ":vulkan_layer_utils",
] ]
foreach(script_and_dep, helper_script_and_deps) {
target_name = script_and_dep[0]
public_deps += [ ":$target_name" ]
}
public_configs = [ ":vulkan_layer_config" ] public_configs = [ ":vulkan_layer_config" ]
sources = [ sources = [
"$target_gen_dir/angle/vulkan/vk_dispatch_table_helper.h", "$target_gen_dir/angle/vulkan/vk_dispatch_table_helper.h",
...@@ -290,51 +311,6 @@ source_set("vulkan_core_validation_glslang") { ...@@ -290,51 +311,6 @@ source_set("vulkan_core_validation_glslang") {
public_configs = [ ":vulkan_core_validation_config" ] public_configs = [ ":vulkan_core_validation_config" ]
} }
vk_gen_layers = [
[
"threading",
"thread_check.h",
"threading_generator.py",
],
[
"parameter_validation",
"parameter_validation.h",
"parameter_validation_generator.py",
],
[
"unique_objects",
"unique_objects_wrappers.h",
"unique_objects_generator.py",
],
]
foreach(info, vk_gen_layers) {
layer = info[0]
header = info[1]
dep = info[2]
action("vulkan_gen_$layer") {
script = "$vulkan_layers_dir/scripts/lvl_genvk.py"
inputs = [
"$vulkan_layers_dir/scripts/generator.py",
"$vulkan_layers_dir/scripts/lvl_genvk.py",
"$vulkan_layers_dir/scripts/reg.py",
"$vulkan_layers_dir/scripts/vk.xml",
"$vulkan_layers_dir/scripts/$dep",
]
outputs = [
"$vulkan_gen_dir/$header",
]
args = [
"-o",
raw_vulkan_gen_dir,
"-registry",
"$raw_vulkan_layers_dir/scripts/vk.xml",
"$header",
"-quiet",
]
}
}
layer_indexes = [ layer_indexes = [
0, 0,
1, 1,
...@@ -360,9 +336,9 @@ layer_additional_deps = [ ...@@ -360,9 +336,9 @@ layer_additional_deps = [
[], [],
[], [],
[], [],
[ ":vulkan_gen_unique_objects" ], [ ":vulkan_gen_unique_objects_wrappers_helper" ],
[ ":vulkan_gen_threading" ], [ ":vulkan_gen_thread_check_helper" ],
[ ":vulkan_gen_parameter_validation" ], [ ":vulkan_gen_parameter_validation_helper" ],
] ]
foreach(index, layer_indexes) { foreach(index, layer_indexes) {
......
src/vulkan_support/vulkan.gypi
...@@ -532,74 +532,149 @@ ...@@ -532,74 +532,149 @@
'target_name': 'vulkan_generate_layer_helpers', 'target_name': 'vulkan_generate_layer_helpers',
'type': 'none', 'type': 'none',
'msvs_cygwin_shell': 0, 'msvs_cygwin_shell': 0,
'actions': 'actions':
[ [
# Duplicate everything because of GYP limitations.
{ {
'action_name': 'vulkan_generate_dispatch_table_helper', 'action_name': 'vulkan_run_vk_xml_generate_vk_enum_string_helper_h',
'message': 'generating Vulkan dispatch table helpers', 'message': 'generating vk_enum_string_helper.h',
'inputs': 'inputs':
[ [
'<(vulkan_layers_path)/scripts/dispatch_table_generator.py',
'<(vulkan_layers_path)/scripts/generator.py', '<(vulkan_layers_path)/scripts/generator.py',
'<(vulkan_layers_path)/scripts/helper_file_generator.py',
'<(vulkan_layers_path)/scripts/lvl_genvk.py', '<(vulkan_layers_path)/scripts/lvl_genvk.py',
'<(vulkan_layers_path)/scripts/reg.py', '<(vulkan_layers_path)/scripts/reg.py',
'<(vulkan_layers_path)/scripts/vk.xml', '<(vulkan_layers_path)/scripts/vk.xml',
], ],
'outputs': 'outputs':
[ [
'<(angle_gen_path)/vulkan/vk_dispatch_table_helper.h', '<(angle_gen_path)/vulkan/vk_enum_string_helper.h'
], ],
'action': 'action':
[ [
'python', '<(vulkan_layers_path)/scripts/lvl_genvk.py', '-o', '<(angle_gen_path)/vulkan', 'python', '<(vulkan_layers_path)/scripts/lvl_genvk.py',
'-registry', '<(vulkan_layers_path)/scripts/vk.xml', 'vk_dispatch_table_helper.h', '-quiet', '-o', '<(angle_gen_path)/vulkan',
'-registry', '<(vulkan_layers_path)/scripts/vk.xml',
'vk_enum_string_helper.h', '-quiet',
],
},
{
'action_name': 'vulkan_run_vk_xml_generate_vk_struct_size_helper_h',
'message': 'generating vk_struct_size_helper.h',
'inputs':
[
'<(vulkan_layers_path)/scripts/generator.py',
'<(vulkan_layers_path)/scripts/helper_file_generator.py',
'<(vulkan_layers_path)/scripts/lvl_genvk.py',
'<(vulkan_layers_path)/scripts/reg.py',
'<(vulkan_layers_path)/scripts/vk.xml',
],
'outputs':
[
'<(angle_gen_path)/vulkan/vk_struct_size_helper.h'
],
'action':
[
'python', '<(vulkan_layers_path)/scripts/lvl_genvk.py',
'-o', '<(angle_gen_path)/vulkan',
'-registry', '<(vulkan_layers_path)/scripts/vk.xml',
'vk_struct_size_helper.h', '-quiet',
],
},
{
'action_name': 'vulkan_run_vk_xml_generate_vk_struct_size_helper_c',
'message': 'generating vk_struct_size_helper.c',
'inputs':
[
'<(vulkan_layers_path)/scripts/generator.py',
'<(vulkan_layers_path)/scripts/helper_file_generator.py',
'<(vulkan_layers_path)/scripts/lvl_genvk.py',
'<(vulkan_layers_path)/scripts/reg.py',
'<(vulkan_layers_path)/scripts/vk.xml',
],
'outputs':
[
'<(angle_gen_path)/vulkan/vk_struct_size_helper.c'
],
'action':
[
'python', '<(vulkan_layers_path)/scripts/lvl_genvk.py',
'-o', '<(angle_gen_path)/vulkan',
'-registry', '<(vulkan_layers_path)/scripts/vk.xml',
'vk_struct_size_helper.c', '-quiet',
],
},
{
'action_name': 'vulkan_run_vk_xml_generate_vk_safe_struct_h',
'message': 'generating vk_safe_struct.h',
'inputs':
[
'<(vulkan_layers_path)/scripts/generator.py',
'<(vulkan_layers_path)/scripts/helper_file_generator.py',
'<(vulkan_layers_path)/scripts/lvl_genvk.py',
'<(vulkan_layers_path)/scripts/reg.py',
'<(vulkan_layers_path)/scripts/vk.xml',
],
'outputs':
[
'<(angle_gen_path)/vulkan/vk_safe_struct.h'
],
'action':
[
'python', '<(vulkan_layers_path)/scripts/lvl_genvk.py',
'-o', '<(angle_gen_path)/vulkan',
'-registry', '<(vulkan_layers_path)/scripts/vk.xml',
'vk_safe_struct.h', '-quiet',
], ],
}, },
{ {
'action_name': 'vulkan_generate_enum_string_helper', 'action_name': 'vulkan_run_vk_xml_generate_vk_safe_struct_cpp',
'message': 'generating Vulkan enum string helper', 'message': 'generating vk_safe_struct.cpp',
'inputs': 'inputs':
[ [
'<(vulkan_layers_path)/scripts/vk_helper.py', '<(vulkan_layers_path)/scripts/generator.py',
'<(vulkan_layers_path)/include/vulkan/vulkan.h' '<(vulkan_layers_path)/scripts/helper_file_generator.py',
'<(vulkan_layers_path)/scripts/lvl_genvk.py',
'<(vulkan_layers_path)/scripts/reg.py',
'<(vulkan_layers_path)/scripts/vk.xml',
], ],
'outputs': 'outputs':
[ [
'<(angle_gen_path)/vulkan/vk_enum_string_helper.h', '<(angle_gen_path)/vulkan/vk_safe_struct.cpp'
], ],
'action': 'action':
[ [
'python', 'python', '<(vulkan_layers_path)/scripts/lvl_genvk.py',
'<(vulkan_layers_path)/scripts/vk_helper.py', '-o', '<(angle_gen_path)/vulkan',
'--gen_enum_string_helper', '-registry', '<(vulkan_layers_path)/scripts/vk.xml',
'<(vulkan_layers_path)/include/vulkan/vulkan.h', 'vk_safe_struct.cpp', '-quiet',
'--abs_out_dir',
'<(angle_gen_path)/vulkan',
'--quiet',
], ],
}, },
{ {
'action_name': 'vulkan_generate_struct_wrappers', 'action_name': 'vulkan_generate_dispatch_table_helper',
'message': 'generating Vulkan struct wrappers', 'message': 'generating vk_dispatch_table_helper.h',
'inputs': 'inputs':
[ [
'<(vulkan_layers_path)/scripts/vk_helper.py', '<(vulkan_layers_path)/scripts/dispatch_table_generator.py',
'<(vulkan_layers_path)/include/vulkan/vulkan.h' '<(vulkan_layers_path)/scripts/generator.py',
'<(vulkan_layers_path)/scripts/lvl_genvk.py',
'<(vulkan_layers_path)/scripts/reg.py',
'<(vulkan_layers_path)/scripts/vk.xml',
], ],
'outputs': 'outputs':
[ [
'<@(vulkan_struct_wrappers_outputs)', '<(angle_gen_path)/vulkan/vk_dispatch_table_helper.h',
], ],
'action': 'action':
[ [
'python', 'python', '<(vulkan_layers_path)/scripts/lvl_genvk.py', '-o', '<(angle_gen_path)/vulkan',
'<(vulkan_layers_path)/scripts/vk_helper.py', '-registry', '<(vulkan_layers_path)/scripts/vk.xml', 'vk_dispatch_table_helper.h', '-quiet',
'--gen_struct_wrappers',
'<(vulkan_layers_path)/include/vulkan/vulkan.h',
'--abs_out_dir',
'<(angle_gen_path)/vulkan',
'--quiet',
], ],
}, },
......
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