Roll vulkan-deps to 9edf248c597b (#162549)

This commit is contained in:
Jason Simmons 2025-02-11 19:52:47 +00:00 committed by GitHub
parent 21471aa236
commit 6c9a555e56
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
15 changed files with 1409 additions and 396 deletions

2
DEPS
View File

@ -258,7 +258,7 @@ deps = {
Var('chromium_git') + '/external/github.com/google/shaderc' + '@' + '37e25539ce199ecaf19fb7f7d27818716d36686d',
'engine/src/flutter/third_party/vulkan-deps':
Var('chromium_git') + '/vulkan-deps' + '@' + '014f44e134a1de387791bffacc32ff9d8db71176',
Var('chromium_git') + '/vulkan-deps' + '@' + '938de304bdcb33049ec39ce45f16223eb6a960b6',
'engine/src/flutter/third_party/flatbuffers':
Var('chromium_git') + '/external/github.com/google/flatbuffers' + '@' + '0a80646371179f8a7a5c1f42c31ee1d44dcf6709',

View File

@ -11,29 +11,6 @@ if (is_win) {
vulkan_undefine_configs += [ "//build/config/win:unicode" ]
}
vulkan_gen_dir = "$target_gen_dir/$vulkan_gen_subdir"
raw_vulkan_gen_dir = rebase_path(vulkan_gen_dir, root_build_dir)
vulkan_data_dir = "$root_out_dir/$vulkan_data_subdir"
raw_vulkan_data_dir = rebase_path(vulkan_data_dir, root_build_dir)
raw_root_out_dir = rebase_path(root_out_dir, root_build_dir)
# This special action is needed to remove old VVL objects that are now renamed.
action("vulkan_clean_old_validation_layer_objects") {
script = "$_checkout_dir/scripts/gn/remove_files.py"
# inputs is a (random) new file since the vvl roll, used to ensure the cleanup is done only once
inputs = [ "$_checkout_dir/layers/gpu_validation/gpu_validation.cpp" ]
outputs = [ "$vulkan_gen_dir/old_vvl_files_are_removed" ]
args = [
"$raw_vulkan_gen_dir/old_vvl_files_are_removed",
"$raw_root_out_dir/libVkLayer*",
"$raw_root_out_dir/VkLayer*",
"$raw_vulkan_data_dir/VkLayer*.json",
]
}
config("generated_layers_config") {
if (is_clang) {
cflags = [
@ -84,7 +61,8 @@ config("vulkan_layer_config") {
}
vvl_sources = [
"$_checkout_dir/layers/best_practices/best_practices_error_enums.h",
"$vulkan_headers_dir/include/vulkan/vk_layer.h",
"$vulkan_headers_dir/include/vulkan/vulkan.h",
"$_checkout_dir/layers/best_practices/best_practices_utils.cpp",
"$_checkout_dir/layers/best_practices/best_practices_validation.h",
"$_checkout_dir/layers/best_practices/bp_buffer.cpp",
@ -100,9 +78,18 @@ vvl_sources = [
"$_checkout_dir/layers/best_practices/bp_pipeline.cpp",
"$_checkout_dir/layers/best_practices/bp_ray_tracing.cpp",
"$_checkout_dir/layers/best_practices/bp_render_pass.cpp",
"$_checkout_dir/layers/best_practices/bp_state.h",
"$_checkout_dir/layers/best_practices/bp_synchronization.cpp",
"$_checkout_dir/layers/best_practices/bp_video.cpp",
"$_checkout_dir/layers/best_practices/bp_wsi.cpp",
"$_checkout_dir/layers/chassis/chassis.h",
"$_checkout_dir/layers/chassis/chassis_handle_data.h",
"$_checkout_dir/layers/chassis/chassis_manual.cpp",
"$_checkout_dir/layers/chassis/chassis_modification_state.h",
"$_checkout_dir/layers/chassis/dispatch_object.h",
"$_checkout_dir/layers/chassis/dispatch_object_manual.cpp",
"$_checkout_dir/layers/chassis/validation_object.h",
"$_checkout_dir/layers/containers/custom_containers.h",
"$_checkout_dir/layers/containers/qfo_transfer.h",
"$_checkout_dir/layers/containers/range_vector.h",
"$_checkout_dir/layers/containers/subresource_adapter.cpp",
@ -116,6 +103,7 @@ vvl_sources = [
"$_checkout_dir/layers/core_checks/cc_descriptor.cpp",
"$_checkout_dir/layers/core_checks/cc_device.cpp",
"$_checkout_dir/layers/core_checks/cc_device_memory.cpp",
"$_checkout_dir/layers/core_checks/cc_device_generated_commands.cpp",
"$_checkout_dir/layers/core_checks/cc_drawdispatch.cpp",
"$_checkout_dir/layers/core_checks/cc_external_object.cpp",
"$_checkout_dir/layers/core_checks/cc_image.cpp",
@ -131,8 +119,15 @@ vvl_sources = [
"$_checkout_dir/layers/core_checks/cc_shader_interface.cpp",
"$_checkout_dir/layers/core_checks/cc_shader_object.cpp",
"$_checkout_dir/layers/core_checks/cc_spirv.cpp",
"$_checkout_dir/layers/core_checks/cc_state_tracker.cpp",
"$_checkout_dir/layers/core_checks/cc_state_tracker.h",
"$_checkout_dir/layers/core_checks/cc_submit.cpp",
"$_checkout_dir/layers/core_checks/cc_submit.h",
"$_checkout_dir/layers/core_checks/cc_synchronization.cpp",
"$_checkout_dir/layers/core_checks/cc_synchronization.h",
"$_checkout_dir/layers/core_checks/cc_video.cpp",
"$_checkout_dir/layers/core_checks/cc_vuid_maps.cpp",
"$_checkout_dir/layers/core_checks/cc_vuid_maps.h",
"$_checkout_dir/layers/core_checks/cc_wsi.cpp",
"$_checkout_dir/layers/core_checks/cc_ycbcr.cpp",
"$_checkout_dir/layers/core_checks/core_validation.h",
@ -140,45 +135,90 @@ vvl_sources = [
"$_checkout_dir/layers/drawdispatch/descriptor_validator.h",
"$_checkout_dir/layers/drawdispatch/drawdispatch_vuids.cpp",
"$_checkout_dir/layers/drawdispatch/drawdispatch_vuids.h",
"$_checkout_dir/layers/error_message/error_location.cpp",
"$_checkout_dir/layers/error_message/error_location.h",
"$_checkout_dir/layers/error_message/error_strings.h",
"$_checkout_dir/layers/error_message/logging.cpp",
"$_checkout_dir/layers/error_message/logging.h",
"$_checkout_dir/layers/error_message/record_object.h",
"$_checkout_dir/layers/error_message/log_message_type.h",
"$_checkout_dir/layers/error_message/spirv_logging.cpp",
"$_checkout_dir/layers/error_message/spirv_logging.h",
"$_checkout_dir/layers/external/inplace_function.h",
"$_checkout_dir/layers/external/vma/vk_mem_alloc.h",
"$_checkout_dir/layers/external/vma/vma.cpp",
"$_checkout_dir/layers/external/vma/vma.h",
"$_checkout_dir/layers/gpu_shaders/gpu_shaders_constants.h",
"$_checkout_dir/layers/gpu_validation/debug_printf.cpp",
"$_checkout_dir/layers/gpu_validation/debug_printf.h",
"$_checkout_dir/layers/gpu_validation/gpu_descriptor_set.cpp",
"$_checkout_dir/layers/gpu_validation/gpu_descriptor_set.h",
"$_checkout_dir/layers/gpu_validation/gpu_error_message.cpp",
"$_checkout_dir/layers/gpu_validation/gpu_error_message.h",
"$_checkout_dir/layers/gpu_validation/gpu_image_layout.cpp",
"$_checkout_dir/layers/gpu_validation/gpu_record.cpp",
"$_checkout_dir/layers/gpu_validation/gpu_settings.h",
"$_checkout_dir/layers/gpu_validation/gpu_settings.h",
"$_checkout_dir/layers/gpu_validation/gpu_setup.cpp",
"$_checkout_dir/layers/gpu_validation/gpu_state_tracker.cpp",
"$_checkout_dir/layers/gpu_validation/gpu_state_tracker.h",
"$_checkout_dir/layers/gpu_validation/gpu_subclasses.cpp",
"$_checkout_dir/layers/gpu_validation/gpu_subclasses.h",
"$_checkout_dir/layers/gpu_validation/gpu_validation.cpp",
"$_checkout_dir/layers/gpu_validation/gpu_validation.h",
"$_checkout_dir/layers/gpu_validation/gpu_vuids.cpp",
"$_checkout_dir/layers/gpu_validation/gpu_vuids.h",
"$_checkout_dir/layers/gpu_validation/spirv/bindless_descriptor_pass.cpp",
"$_checkout_dir/layers/gpu_validation/spirv/bindless_descriptor_pass.h",
"$_checkout_dir/layers/gpu_validation/spirv/buffer_device_address_pass.cpp",
"$_checkout_dir/layers/gpu_validation/spirv/buffer_device_address_pass.h",
"$_checkout_dir/layers/gpu_validation/spirv/function_basic_block.cpp",
"$_checkout_dir/layers/gpu_validation/spirv/function_basic_block.h",
"$_checkout_dir/layers/gpu_validation/spirv/instruction.cpp",
"$_checkout_dir/layers/gpu_validation/spirv/instruction.h",
"$_checkout_dir/layers/gpu_validation/spirv/link.h",
"$_checkout_dir/layers/gpu_validation/spirv/module.cpp",
"$_checkout_dir/layers/gpu_validation/spirv/module.h",
"$_checkout_dir/layers/gpu_validation/spirv/pass.cpp",
"$_checkout_dir/layers/gpu_validation/spirv/pass.h",
"$_checkout_dir/layers/gpu_validation/spirv/type_manager.cpp",
"$_checkout_dir/layers/gpu_validation/spirv/type_manager.h",
"$_checkout_dir/layers/layer_chassis_dispatch_manual.cpp",
"$_checkout_dir/layers/external/xxhash.h",
"$_checkout_dir/layers/gpuav/validation_cmd/gpuav_validation_cmd_common.cpp",
"$_checkout_dir/layers/gpuav/validation_cmd/gpuav_validation_cmd_common.h",
"$_checkout_dir/layers/gpuav/validation_cmd/gpuav_copy_buffer_to_image.cpp",
"$_checkout_dir/layers/gpuav/validation_cmd/gpuav_copy_buffer_to_image.h",
"$_checkout_dir/layers/gpuav/validation_cmd/gpuav_dispatch.cpp",
"$_checkout_dir/layers/gpuav/validation_cmd/gpuav_dispatch.h",
"$_checkout_dir/layers/gpuav/validation_cmd/gpuav_draw.cpp",
"$_checkout_dir/layers/gpuav/validation_cmd/gpuav_draw.h",
"$_checkout_dir/layers/gpuav/validation_cmd/gpuav_trace_rays.cpp",
"$_checkout_dir/layers/gpuav/validation_cmd/gpuav_trace_rays.h",
"$_checkout_dir/layers/gpuav/core/gpuav_settings.h",
"$_checkout_dir/layers/gpuav/core/gpuav.h",
"$_checkout_dir/layers/gpuav/core/gpuav_constants.h",
"$_checkout_dir/layers/gpuav/core/gpuav_record.cpp",
"$_checkout_dir/layers/gpuav/core/gpuav_setup.cpp",
"$_checkout_dir/layers/gpuav/debug_printf/debug_printf.cpp",
"$_checkout_dir/layers/gpuav/debug_printf/debug_printf.h",
"$_checkout_dir/layers/gpuav/descriptor_validation/gpuav_descriptor_set.cpp",
"$_checkout_dir/layers/gpuav/descriptor_validation/gpuav_descriptor_set.h",
"$_checkout_dir/layers/gpuav/descriptor_validation/gpuav_descriptor_validation.cpp",
"$_checkout_dir/layers/gpuav/descriptor_validation/gpuav_descriptor_validation.h",
"$_checkout_dir/layers/gpuav/descriptor_validation/gpuav_image_layout.cpp",
"$_checkout_dir/layers/gpuav/descriptor_validation/gpuav_image_layout.h",
"$_checkout_dir/layers/gpuav/error_message/gpuav_vuids.cpp",
"$_checkout_dir/layers/gpuav/error_message/gpuav_vuids.h",
"$_checkout_dir/layers/gpuav/instrumentation/gpuav_shader_instrumentor.cpp",
"$_checkout_dir/layers/gpuav/instrumentation/gpuav_shader_instrumentor.h",
"$_checkout_dir/layers/gpuav/instrumentation/gpuav_instrumentation.cpp",
"$_checkout_dir/layers/gpuav/instrumentation/gpuav_instrumentation.h",
"$_checkout_dir/layers/gpuav/resources/gpuav_vulkan_objects.cpp",
"$_checkout_dir/layers/gpuav/resources/gpuav_vulkan_objects.h",
"$_checkout_dir/layers/gpuav/resources/gpuav_shader_resources.h",
"$_checkout_dir/layers/gpuav/resources/gpuav_state_trackers.cpp",
"$_checkout_dir/layers/gpuav/resources/gpuav_state_trackers.h",
"$_checkout_dir/layers/gpuav/shaders/validation_cmd/draw_push_data.h",
"$_checkout_dir/layers/gpuav/shaders/gpuav_error_codes.h",
"$_checkout_dir/layers/gpuav/shaders/gpuav_error_header.h",
"$_checkout_dir/layers/gpuav/shaders/gpuav_shaders_constants.h",
"$_checkout_dir/layers/gpuav/spirv/descriptor_indexing_oob_pass.cpp",
"$_checkout_dir/layers/gpuav/spirv/descriptor_indexing_oob_pass.h",
"$_checkout_dir/layers/gpuav/spirv/descriptor_class_general_buffer_pass.cpp",
"$_checkout_dir/layers/gpuav/spirv/descriptor_class_general_buffer_pass.h",
"$_checkout_dir/layers/gpuav/spirv/descriptor_class_texel_buffer_pass.cpp",
"$_checkout_dir/layers/gpuav/spirv/descriptor_class_texel_buffer_pass.h",
"$_checkout_dir/layers/gpuav/spirv/buffer_device_address_pass.cpp",
"$_checkout_dir/layers/gpuav/spirv/buffer_device_address_pass.h",
"$_checkout_dir/layers/gpuav/spirv/post_process_descriptor_indexing_pass.cpp",
"$_checkout_dir/layers/gpuav/spirv/post_process_descriptor_indexing_pass.h",
"$_checkout_dir/layers/gpuav/spirv/vertex_attribute_fetch_oob.cpp",
"$_checkout_dir/layers/gpuav/spirv/vertex_attribute_fetch_oob.h",
"$_checkout_dir/layers/gpuav/spirv/function_basic_block.cpp",
"$_checkout_dir/layers/gpuav/spirv/function_basic_block.h",
"$_checkout_dir/layers/gpuav/spirv/instruction.cpp",
"$_checkout_dir/layers/gpuav/spirv/instruction.h",
"$_checkout_dir/layers/gpuav/spirv/interface.h",
"$_checkout_dir/layers/gpuav/spirv/link.h",
"$_checkout_dir/layers/gpuav/spirv/module.cpp",
"$_checkout_dir/layers/gpuav/spirv/module.h",
"$_checkout_dir/layers/gpuav/spirv/inject_conditional_function_pass.cpp",
"$_checkout_dir/layers/gpuav/spirv/inject_conditional_function_pass.h",
"$_checkout_dir/layers/gpuav/spirv/inject_function_pass.cpp",
"$_checkout_dir/layers/gpuav/spirv/inject_function_pass.h",
"$_checkout_dir/layers/gpuav/spirv/pass.cpp",
"$_checkout_dir/layers/gpuav/spirv/pass.h",
"$_checkout_dir/layers/gpuav/spirv/ray_query_pass.cpp",
"$_checkout_dir/layers/gpuav/spirv/ray_query_pass.h",
"$_checkout_dir/layers/gpuav/spirv/debug_printf_pass.cpp",
"$_checkout_dir/layers/gpuav/spirv/debug_printf_pass.h",
"$_checkout_dir/layers/gpuav/spirv/type_manager.cpp",
"$_checkout_dir/layers/gpuav/spirv/type_manager.h",
"$_checkout_dir/layers/layer_options.cpp",
"$_checkout_dir/layers/layer_options.h",
"$_checkout_dir/layers/object_tracker/object_lifetime_validation.h",
@ -189,8 +229,11 @@ vvl_sources = [
"$_checkout_dir/layers/state_tracker/cmd_buffer_state.h",
"$_checkout_dir/layers/state_tracker/descriptor_sets.cpp",
"$_checkout_dir/layers/state_tracker/descriptor_sets.h",
"$_checkout_dir/layers/state_tracker/device_generated_commands_state.cpp",
"$_checkout_dir/layers/state_tracker/device_generated_commands_state.h",
"$_checkout_dir/layers/state_tracker/device_memory_state.cpp",
"$_checkout_dir/layers/state_tracker/device_memory_state.h",
"$_checkout_dir/layers/state_tracker/device_state.cpp",
"$_checkout_dir/layers/state_tracker/device_state.h",
"$_checkout_dir/layers/state_tracker/fence_state.cpp",
"$_checkout_dir/layers/state_tracker/fence_state.h",
@ -219,16 +262,21 @@ vvl_sources = [
"$_checkout_dir/layers/state_tracker/shader_module.h",
"$_checkout_dir/layers/state_tracker/shader_object_state.cpp",
"$_checkout_dir/layers/state_tracker/shader_object_state.h",
"$_checkout_dir/layers/state_tracker/shader_stage_state.cpp",
"$_checkout_dir/layers/state_tracker/shader_stage_state.h",
"$_checkout_dir/layers/state_tracker/state_object.cpp",
"$_checkout_dir/layers/state_tracker/state_object.h",
"$_checkout_dir/layers/state_tracker/state_tracker.cpp",
"$_checkout_dir/layers/state_tracker/state_tracker.h",
"$_checkout_dir/layers/state_tracker/submission_reference.h",
"$_checkout_dir/layers/state_tracker/vertex_index_buffer_state.h",
"$_checkout_dir/layers/state_tracker/video_session_state.cpp",
"$_checkout_dir/layers/state_tracker/video_session_state.h",
"$_checkout_dir/layers/stateless/sl_buffer.cpp",
"$_checkout_dir/layers/stateless/sl_cmd_buffer.cpp",
"$_checkout_dir/layers/stateless/sl_cmd_buffer_dynamic.cpp",
"$_checkout_dir/layers/stateless/sl_descriptor.cpp",
"$_checkout_dir/layers/stateless/sl_device_generated_commands.cpp",
"$_checkout_dir/layers/stateless/sl_device_memory.cpp",
"$_checkout_dir/layers/stateless/sl_external_object.cpp",
"$_checkout_dir/layers/stateless/sl_framebuffer.cpp",
@ -240,6 +288,8 @@ vvl_sources = [
"$_checkout_dir/layers/stateless/sl_shader_object.cpp",
"$_checkout_dir/layers/stateless/sl_synchronization.cpp",
"$_checkout_dir/layers/stateless/sl_utils.cpp",
"$_checkout_dir/layers/stateless/sl_vuid_maps.cpp",
"$_checkout_dir/layers/stateless/sl_vuid_maps.h",
"$_checkout_dir/layers/stateless/sl_wsi.cpp",
"$_checkout_dir/layers/stateless/stateless_validation.h",
"$_checkout_dir/layers/sync/sync_access_context.cpp",
@ -250,10 +300,18 @@ vvl_sources = [
"$_checkout_dir/layers/sync/sync_commandbuffer.h",
"$_checkout_dir/layers/sync/sync_common.cpp",
"$_checkout_dir/layers/sync/sync_common.h",
"$_checkout_dir/layers/sync/sync_error_messages.cpp",
"$_checkout_dir/layers/sync/sync_error_messages.h",
"$_checkout_dir/layers/sync/sync_image.h",
"$_checkout_dir/layers/sync/sync_op.cpp",
"$_checkout_dir/layers/sync/sync_op.h",
"$_checkout_dir/layers/sync/sync_renderpass.cpp",
"$_checkout_dir/layers/sync/sync_renderpass.h",
"$_checkout_dir/layers/sync/sync_reporting.cpp",
"$_checkout_dir/layers/sync/sync_reporting.h",
"$_checkout_dir/layers/sync/sync_settings.h",
"$_checkout_dir/layers/sync/sync_stats.cpp",
"$_checkout_dir/layers/sync/sync_stats.h",
"$_checkout_dir/layers/sync/sync_submit.cpp",
"$_checkout_dir/layers/sync/sync_submit.h",
"$_checkout_dir/layers/sync/sync_utils.cpp",
@ -265,63 +323,111 @@ vvl_sources = [
"$_checkout_dir/layers/thread_tracker/thread_safety_validation.cpp",
"$_checkout_dir/layers/thread_tracker/thread_safety_validation.h",
"$_checkout_dir/layers/utils/android_ndk_types.h",
"$_checkout_dir/layers/utils/android_ndk_types.h",
"$_checkout_dir/layers/utils/cast_utils.h",
"$_checkout_dir/layers/utils/convert_utils.cpp",
"$_checkout_dir/layers/utils/convert_utils.h",
"$_checkout_dir/layers/utils/hash_util.cpp",
"$_checkout_dir/layers/utils/hash_util.h",
"$_checkout_dir/layers/utils/hash_vk_types.h",
"$_checkout_dir/layers/utils/image_layout_utils.cpp",
"$_checkout_dir/layers/utils/image_layout_utils.h",
"$_checkout_dir/layers/utils/ray_tracing_utils.cpp",
"$_checkout_dir/layers/utils/ray_tracing_utils.h",
"$_checkout_dir/layers/utils/shader_utils.cpp",
"$_checkout_dir/layers/utils/shader_utils.h",
"$_checkout_dir/layers/utils/vk_layer_extension_utils.cpp",
"$_checkout_dir/layers/utils/vk_layer_extension_utils.h",
"$_checkout_dir/layers/utils/vk_layer_utils.cpp",
"$_checkout_dir/layers/utils/vk_layer_utils.h",
"$_checkout_dir/layers/utils/vk_struct_compare.cpp",
"$_checkout_dir/layers/utils/vk_struct_compare.h",
"$_checkout_dir/layers/vk_layer_config.cpp",
"$_checkout_dir/layers/vk_layer_config.h",
"$_checkout_dir/layers/vulkan/generated/best_practices.cpp",
"$_checkout_dir/layers/vulkan/generated/best_practices.h",
"$_checkout_dir/layers/vulkan/generated/best_practices_device_methods.h",
"$_checkout_dir/layers/vulkan/generated/best_practices_instance_methods.h",
"$_checkout_dir/layers/vulkan/generated/chassis.cpp",
"$_checkout_dir/layers/vulkan/generated/chassis.h",
"$_checkout_dir/layers/vulkan/generated/chassis_dispatch_helper.h",
"$_checkout_dir/layers/vulkan/generated/validation_cmd_copy_buffer_to_image_comp.cpp",
"$_checkout_dir/layers/vulkan/generated/validation_cmd_copy_buffer_to_image_comp.h",
"$_checkout_dir/layers/vulkan/generated/validation_cmd_dispatch_comp.cpp",
"$_checkout_dir/layers/vulkan/generated/validation_cmd_dispatch_comp.h",
"$_checkout_dir/layers/vulkan/generated/validation_cmd_count_buffer_comp.h",
"$_checkout_dir/layers/vulkan/generated/validation_cmd_count_buffer_comp.cpp",
"$_checkout_dir/layers/vulkan/generated/validation_cmd_first_instance_comp.h",
"$_checkout_dir/layers/vulkan/generated/validation_cmd_first_instance_comp.cpp",
"$_checkout_dir/layers/vulkan/generated/validation_cmd_draw_indexed_indirect_index_buffer_comp.h",
"$_checkout_dir/layers/vulkan/generated/validation_cmd_draw_indexed_indirect_index_buffer_comp.cpp",
"$_checkout_dir/layers/vulkan/generated/validation_cmd_draw_mesh_indirect_comp.h",
"$_checkout_dir/layers/vulkan/generated/validation_cmd_draw_mesh_indirect_comp.cpp",
"$_checkout_dir/layers/vulkan/generated/validation_cmd_trace_rays_rgen.cpp",
"$_checkout_dir/layers/vulkan/generated/validation_cmd_trace_rays_rgen.h",
"$_checkout_dir/layers/vulkan/generated/command_validation.cpp",
"$_checkout_dir/layers/vulkan/generated/device_features.cpp",
"$_checkout_dir/layers/vulkan/generated/device_features.h",
"$_checkout_dir/layers/vulkan/generated/dispatch_functions.h",
"$_checkout_dir/layers/vulkan/generated/dispatch_object.cpp",
"$_checkout_dir/layers/vulkan/generated/dispatch_object_device_methods.h",
"$_checkout_dir/layers/vulkan/generated/dispatch_object_instance_methods.h",
"$_checkout_dir/layers/vulkan/generated/dispatch_vector.cpp",
"$_checkout_dir/layers/vulkan/generated/dispatch_vector.h",
"$_checkout_dir/layers/vulkan/generated/dynamic_state_helper.cpp",
"$_checkout_dir/layers/vulkan/generated/dynamic_state_helper.h",
"$_checkout_dir/layers/vulkan/generated/enum_flag_bits.h",
"$_checkout_dir/layers/vulkan/generated/gpu_as_inspection_comp.h",
"$_checkout_dir/layers/vulkan/generated/gpu_inst_shader_hash.h",
"$_checkout_dir/layers/vulkan/generated/gpu_pre_copy_buffer_to_image_comp.h",
"$_checkout_dir/layers/vulkan/generated/gpu_pre_dispatch_comp.h",
"$_checkout_dir/layers/vulkan/generated/gpu_pre_draw_vert.h",
"$_checkout_dir/layers/vulkan/generated/gpu_pre_trace_rays_rgen.h",
"$_checkout_dir/layers/vulkan/generated/inst_bindless_descriptor_comp.h",
"$_checkout_dir/layers/vulkan/generated/inst_buffer_device_address_comp.h",
"$_checkout_dir/layers/vulkan/generated/layer_chassis_dispatch.cpp",
"$_checkout_dir/layers/vulkan/generated/layer_chassis_dispatch.h",
"$_checkout_dir/layers/vulkan/generated/error_location_helper.cpp",
"$_checkout_dir/layers/vulkan/generated/error_location_helper.h",
"$_checkout_dir/layers/vulkan/generated/feature_requirements_helper.cpp",
"$_checkout_dir/layers/vulkan/generated/feature_requirements_helper.h",
"$_checkout_dir/layers/vulkan/generated/instrumentation_descriptor_indexing_oob_bindless_comp.cpp",
"$_checkout_dir/layers/vulkan/generated/instrumentation_descriptor_indexing_oob_bindless_comp.h",
"$_checkout_dir/layers/vulkan/generated/instrumentation_descriptor_indexing_oob_non_bindless_comp.cpp",
"$_checkout_dir/layers/vulkan/generated/instrumentation_descriptor_indexing_oob_non_bindless_comp.h",
"$_checkout_dir/layers/vulkan/generated/instrumentation_descriptor_class_general_buffer_comp.cpp",
"$_checkout_dir/layers/vulkan/generated/instrumentation_descriptor_class_general_buffer_comp.h",
"$_checkout_dir/layers/vulkan/generated/instrumentation_descriptor_class_texel_buffer_comp.cpp",
"$_checkout_dir/layers/vulkan/generated/instrumentation_descriptor_class_texel_buffer_comp.h",
"$_checkout_dir/layers/vulkan/generated/instrumentation_buffer_device_address_comp.cpp",
"$_checkout_dir/layers/vulkan/generated/instrumentation_buffer_device_address_comp.h",
"$_checkout_dir/layers/vulkan/generated/instrumentation_ray_query_comp.cpp",
"$_checkout_dir/layers/vulkan/generated/instrumentation_ray_query_comp.h",
"$_checkout_dir/layers/vulkan/generated/instrumentation_post_process_descriptor_index_comp.cpp",
"$_checkout_dir/layers/vulkan/generated/instrumentation_post_process_descriptor_index_comp.h",
"$_checkout_dir/layers/vulkan/generated/instrumentation_vertex_attribute_fetch_oob_vert.cpp",
"$_checkout_dir/layers/vulkan/generated/instrumentation_vertex_attribute_fetch_oob_vert.h",
"$_checkout_dir/layers/vulkan/generated/object_tracker.cpp",
"$_checkout_dir/layers/vulkan/generated/object_tracker.h",
"$_checkout_dir/layers/vulkan/generated/object_tracker_device_methods.h",
"$_checkout_dir/layers/vulkan/generated/object_tracker_instance_methods.h",
"$_checkout_dir/layers/vulkan/generated/pnext_chain_extraction.cpp",
"$_checkout_dir/layers/vulkan/generated/pnext_chain_extraction.h",
"$_checkout_dir/layers/vulkan/generated/spirv_grammar_helper.cpp",
"$_checkout_dir/layers/vulkan/generated/spirv_grammar_helper.h",
"$_checkout_dir/layers/vulkan/generated/spirv_tools_commit_id.h",
"$_checkout_dir/layers/vulkan/generated/spirv_validation_helper.cpp",
"$_checkout_dir/layers/vulkan/generated/state_tracker_helper.cpp",
"$_checkout_dir/layers/vulkan/generated/state_tracker_helper.h",
"$_checkout_dir/layers/vulkan/generated/stateless_device_methods.h",
"$_checkout_dir/layers/vulkan/generated/stateless_instance_methods.h",
"$_checkout_dir/layers/vulkan/generated/stateless_validation_helper.cpp",
"$_checkout_dir/layers/vulkan/generated/stateless_validation_helper.h",
"$_checkout_dir/layers/vulkan/generated/sync_validation_types.cpp",
"$_checkout_dir/layers/vulkan/generated/sync_validation_types.h",
"$_checkout_dir/layers/vulkan/generated/thread_safety.cpp",
"$_checkout_dir/layers/vulkan/generated/thread_safety_commands.h",
"$_checkout_dir/layers/vulkan/generated/thread_safety_counter_bodies.h",
"$_checkout_dir/layers/vulkan/generated/thread_safety_counter_definitions.h",
"$_checkout_dir/layers/vulkan/generated/thread_safety_counter_instances.h",
"$_checkout_dir/layers/vulkan/generated/thread_safety_device_defs.h",
"$_checkout_dir/layers/vulkan/generated/thread_safety_instance_defs.h",
"$_checkout_dir/layers/vulkan/generated/valid_enum_values.cpp",
"$_checkout_dir/layers/vulkan/generated/valid_enum_values.h",
"$_checkout_dir/layers/vulkan/generated/valid_flag_values.cpp",
"$_checkout_dir/layers/vulkan/generated/validation_object.cpp",
"$_checkout_dir/layers/vulkan/generated/validation_object_methods.h",
"$_checkout_dir/layers/vulkan/generated/vk_api_version.h",
"$_checkout_dir/layers/vulkan/generated/vk_api_version.h",
"$_checkout_dir/layers/vulkan/generated/vk_dispatch_table_helper.cpp",
"$_checkout_dir/layers/vulkan/generated/vk_dispatch_table_helper.h",
"$_checkout_dir/layers/vulkan/generated/vk_extension_helper.cpp",
"$_checkout_dir/layers/vulkan/generated/vk_extension_helper.h",
"$_checkout_dir/layers/vulkan/generated/vk_safe_struct_core.cpp",
"$_checkout_dir/layers/vulkan/generated/vk_safe_struct_ext.cpp",
"$_checkout_dir/layers/vulkan/generated/vk_safe_struct_khr.cpp",
"$_checkout_dir/layers/vulkan/generated/vk_safe_struct_utils.cpp",
"$_checkout_dir/layers/vulkan/generated/vk_safe_struct_vendor.cpp",
"$vulkan_headers_dir/include/vulkan/vk_layer.h",
"$vulkan_headers_dir/include/vulkan/vulkan.h",
"$_checkout_dir/layers/vulkan/generated/vk_function_pointers.cpp",
"$_checkout_dir/layers/vulkan/generated/vk_function_pointers.h",
"$_checkout_dir/layers/vulkan/generated/vk_layer_dispatch_table.h",
"$_checkout_dir/layers/vulkan/generated/vk_object_types.cpp",
"$_checkout_dir/layers/vulkan/generated/vk_object_types.h",
"$_checkout_dir/layers/vulkan/generated/vk_validation_error_messages.h",
]
layers = [ [
@ -333,15 +439,14 @@ layers = [ [
if (!is_android) {
action("vulkan_gen_json_files") {
vulkan_data_dir = "$root_out_dir/$vulkan_data_subdir"
script = "$_checkout_dir/scripts/gn/generate_vulkan_layers_json.py"
deps = [ "$vulkan_headers_dir:vulkan_headers" ]
if (!is_fuchsia) {
# Make sure that the cleanup of old layer JSON files happens before the new ones are generated.
deps += [ ":vulkan_clean_old_validation_layer_objects" ]
}
sources = [ "$_checkout_dir/layers/VkLayer_khronos_validation.json.in" ]
outputs = [ "$vulkan_data_dir/VkLayer_khronos_validation.json" ]
if (is_linux) {
@ -384,41 +489,6 @@ source_set("vulkan_layer_utils") {
"$_checkout_dir/layers/vulkan",
]
sources = [
"$_checkout_dir/layers/containers/custom_containers.h",
"$_checkout_dir/layers/containers/sparse_containers.h",
"$_checkout_dir/layers/error_message/error_location.cpp",
"$_checkout_dir/layers/error_message/error_location.h",
"$_checkout_dir/layers/error_message/logging.cpp",
"$_checkout_dir/layers/error_message/logging.h",
"$_checkout_dir/layers/error_message/record_object.h",
"$_checkout_dir/layers/external/xxhash.h",
"$_checkout_dir/layers/utils/android_ndk_types.h",
"$_checkout_dir/layers/utils/cast_utils.h",
"$_checkout_dir/layers/utils/hash_util.cpp",
"$_checkout_dir/layers/utils/hash_util.h",
"$_checkout_dir/layers/utils/hash_vk_types.h",
"$_checkout_dir/layers/utils/ray_tracing_utils.cpp",
"$_checkout_dir/layers/utils/ray_tracing_utils.h",
"$_checkout_dir/layers/utils/vk_layer_extension_utils.cpp",
"$_checkout_dir/layers/utils/vk_layer_extension_utils.h",
"$_checkout_dir/layers/utils/vk_layer_utils.cpp",
"$_checkout_dir/layers/utils/vk_layer_utils.h",
"$_checkout_dir/layers/vk_layer_config.cpp",
"$_checkout_dir/layers/vk_layer_config.h",
"$_checkout_dir/layers/vulkan/generated/error_location_helper.cpp",
"$_checkout_dir/layers/vulkan/generated/error_location_helper.h",
"$_checkout_dir/layers/vulkan/generated/feature_requirements_helper.cpp",
"$_checkout_dir/layers/vulkan/generated/feature_requirements_helper.h",
"$_checkout_dir/layers/vulkan/generated/layer_chassis_dispatch.h",
"$_checkout_dir/layers/vulkan/generated/pnext_chain_extraction.cpp",
"$_checkout_dir/layers/vulkan/generated/pnext_chain_extraction.h",
"$_checkout_dir/layers/vulkan/generated/vk_api_version.h",
"$_checkout_dir/layers/vulkan/generated/vk_extension_helper.h",
"$_checkout_dir/layers/vulkan/generated/vk_layer_dispatch_table.h",
"$_checkout_dir/layers/vulkan/generated/vk_object_types.cpp",
"$_checkout_dir/layers/vulkan/generated/vk_object_types.h",
"$_checkout_dir/layers/vulkan/generated/vk_safe_struct.h",
"$_checkout_dir/layers/vulkan/generated/vk_validation_error_messages.h",
"$vulkan_headers_dir/include/vulkan/vk_layer.h",
"$vulkan_headers_dir/include/vulkan/vulkan.h",
]
@ -489,12 +559,6 @@ foreach(layer_info, layers) {
":vulkan_layer_utils",
"$vulkan_utility_libraries_dir:vulkan_layer_settings",
]
if (!is_fuchsia) {
deps += [
# Make sure the cleanup of old layers happen before the new ones are compiled.
":vulkan_clean_old_validation_layer_objects",
]
}
if (layer_info[2] != "") {
deps += layer_info[2]
}
@ -530,7 +594,3 @@ group("vulkan_validation_layers") {
}
}
}
group("tests") {
# TODO(fxbug.dev/13288)
}

View File

@ -173,7 +173,7 @@ function verify_licenses() (
local actualLicenseCount
actualLicenseCount="$(tail -n 1 flutter/ci/licenses_golden/licenses_flutter | tr -dc '0-9')"
local expectedLicenseCount=835
local expectedLicenseCount=840
if [[ $actualLicenseCount -ne $expectedLicenseCount ]]; then
echo "=============================== ERROR ==============================="

View File

@ -3082,6 +3082,39 @@
../../../flutter/third_party/vulkan-deps/glslang/src/ndk_test/jni/Application.mk
../../../flutter/third_party/vulkan-deps/glslang/src/parse_version.cmake
../../../flutter/third_party/vulkan-deps/glslang/src/update_glslang_sources.py
../../../flutter/third_party/vulkan-deps/lunarg-vulkantools/README.chromium
../../../flutter/third_party/vulkan-deps/lunarg-vulkantools/src/.clang-format
../../../flutter/third_party/vulkan-deps/lunarg-vulkantools/src/.git
../../../flutter/third_party/vulkan-deps/lunarg-vulkantools/src/.gitattributes
../../../flutter/third_party/vulkan-deps/lunarg-vulkantools/src/.github
../../../flutter/third_party/vulkan-deps/lunarg-vulkantools/src/.gitignore
../../../flutter/third_party/vulkan-deps/lunarg-vulkantools/src/BUILD.md
../../../flutter/third_party/vulkan-deps/lunarg-vulkantools/src/CMakeLists.txt
../../../flutter/third_party/vulkan-deps/lunarg-vulkantools/src/CONTRIBUTING.md
../../../flutter/third_party/vulkan-deps/lunarg-vulkantools/src/README.md
../../../flutter/third_party/vulkan-deps/lunarg-vulkantools/src/layersvt/CMakeLists.txt
../../../flutter/third_party/vulkan-deps/lunarg-vulkantools/src/layersvt/README.md
../../../flutter/third_party/vulkan-deps/lunarg-vulkantools/src/layersvt/test
../../../flutter/third_party/vulkan-deps/lunarg-vulkantools/src/scripts/CMakeLists.txt
../../../flutter/third_party/vulkan-deps/lunarg-vulkantools/src/scripts/android.py
../../../flutter/third_party/vulkan-deps/lunarg-vulkantools/src/scripts/api_dump_generator.py
../../../flutter/third_party/vulkan-deps/lunarg-vulkantools/src/scripts/common_codegen.py
../../../flutter/third_party/vulkan-deps/lunarg-vulkantools/src/scripts/generate_source.py
../../../flutter/third_party/vulkan-deps/lunarg-vulkantools/src/scripts/github_ci_linux.py
../../../flutter/third_party/vulkan-deps/lunarg-vulkantools/src/scripts/gn/DEPS
../../../flutter/third_party/vulkan-deps/lunarg-vulkantools/src/scripts/gn/generate_vulkantools_layers_json.py
../../../flutter/third_party/vulkan-deps/lunarg-vulkantools/src/scripts/gn/gn.py
../../../flutter/third_party/vulkan-deps/lunarg-vulkantools/src/scripts/known_good.json
../../../flutter/third_party/vulkan-deps/lunarg-vulkantools/src/scripts/update_deps.py
../../../flutter/third_party/vulkan-deps/lunarg-vulkantools/src/scripts/vt_genvk.py
../../../flutter/third_party/vulkan-deps/lunarg-vulkantools/src/tests
../../../flutter/third_party/vulkan-deps/lunarg-vulkantools/src/via/CMakeLists.txt
../../../flutter/third_party/vulkan-deps/lunarg-vulkantools/src/via/README.md
../../../flutter/third_party/vulkan-deps/lunarg-vulkantools/src/vkconfig_cmd/CMakeLists.txt
../../../flutter/third_party/vulkan-deps/lunarg-vulkantools/src/vkconfig_cmd/macOS/vkconfig.cmake
../../../flutter/third_party/vulkan-deps/lunarg-vulkantools/src/vkconfig_core/CMakeLists.txt
../../../flutter/third_party/vulkan-deps/lunarg-vulkantools/src/vkconfig_core/test
../../../flutter/third_party/vulkan-deps/lunarg-vulkantools/src/vkconfig_gui
../../../flutter/third_party/vulkan-deps/spirv-cross/DIR_METADATA
../../../flutter/third_party/vulkan-deps/spirv-cross/README.chromium
../../../flutter/third_party/vulkan-deps/spirv-cross/src/.clang-format
@ -3123,6 +3156,7 @@
../../../flutter/third_party/vulkan-deps/vulkan-headers/src/CODE_OF_CONDUCT.adoc
../../../flutter/third_party/vulkan-deps/vulkan-headers/src/CONTRIBUTING.md
../../../flutter/third_party/vulkan-deps/vulkan-headers/src/LICENSE.md
../../../flutter/third_party/vulkan-deps/vulkan-headers/src/Makefile.release
../../../flutter/third_party/vulkan-deps/vulkan-headers/src/README.md
../../../flutter/third_party/vulkan-deps/vulkan-headers/src/SECURITY.md
../../../flutter/third_party/vulkan-deps/vulkan-headers/src/registry
@ -3143,12 +3177,14 @@
../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/README.md
../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/include/CMakeLists.txt
../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/scripts/CMakeLists.txt
../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/scripts/common_ci.py
../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/scripts/generate_source.py
../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/scripts/generators/base_generator.py
../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/scripts/generators/dispatch_table_generator.py
../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/scripts/generators/enum_string_helper_generator.py
../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/scripts/generators/format_utils_generator.py
../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/scripts/generators/generator_utils.py
../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/scripts/generators/safe_struct_generator.py
../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/scripts/generators/struct_helper_generator.py
../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/scripts/generators/vulkan_object.py
../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/scripts/gn/DEPS
@ -3157,6 +3193,7 @@
../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/scripts/update_deps.py
../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/src/CMakeLists.txt
../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/src/layer/CMakeLists.txt
../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/src/vulkan/CMakeLists.txt
../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/tests
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/README.chromium
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/.clang-format
@ -3173,9 +3210,9 @@
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/README.md
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/docs
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/CMakeLists.txt
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_shaders/README.md
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/spirv/CMakeLists.txt
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/spirv/README.md
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpuav/shaders/README.md
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpuav/spirv/CMakeLists.txt
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpuav/spirv/README.md
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/.clang-format
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/CMakeLists.txt
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/android.py
@ -3190,7 +3227,10 @@
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/base_generator.py
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/best_practices_generator.py
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/command_validation_generator.py
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/device_features_generator.py
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/dispatch_object_generator.py
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/dispatch_table_helper_generator.py
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/dispatch_vector_generator.py
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/dynamic_state_generator.py
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/enum_flag_bits_generator.py
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/error_location_helper_generator.py
@ -3198,28 +3238,26 @@
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/feature_requirements.py
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/function_pointers_generator.py
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/generator_utils.py
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/layer_chassis_dispatch_generator.py
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/layer_chassis_generator.py
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/layer_dispatch_table_generator.py
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/object_tracker_generator.py
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/object_types_generator.py
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/pnext_chain_extraction_generator.py
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/safe_struct_generator.py
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/spirv_grammar_generator.py
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/spirv_tool_commit_id_generator.py
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/spirv_validation_generator.py
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/state_tracker_helper_generator.py
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/stateless_validation_helper_generator.py
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/sync_validation_generator.py
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/test_icd_generator.py
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/thread_safety_generator.py
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/valid_enum_values_generator.py
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/valid_flag_values_generator.py
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/vulkan_object.py
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/gn/DEPS
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/gn/commit_id.py
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/gn/export_targets.py
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/gn/generate_vulkan_layers_json.py
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/gn/gn.py
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/gn/remove_files.py
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/known_good.json
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/tests.py
../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/update_deps.py

File diff suppressed because it is too large Load Diff

View File

@ -1,2 +1,2 @@
Signature: 85f11a0b4d789b25948aba8c1bad5630
Signature: e68ab8faaca9d0a5ab81c3f98cee7d04

View File

@ -25,7 +25,7 @@ VULKAN_HPP_DEFAULT_DISPATCH_LOADER_DYNAMIC_STORAGE
} while (0)
// Convenient reference to vulkan.hpp's global proc table.
auto& d = vk::defaultDispatchLoaderDynamic;
auto& d = VULKAN_HPP_DEFAULT_DISPATCHER;
// GLFW needs to be included after Vulkan.
#include "GLFW/glfw3.h"

View File

@ -50,7 +50,11 @@ ShaderLibraryMappingsForPlayground() {
};
}
vk::UniqueInstance PlaygroundImplVK::global_instance_;
// A global Vulkan instance that is reused across all Vulkan playgrounds.
// This instance is kept for the entire process lifetime. It is not cleaned
// up during shutdown to avoid conflicts with destruction of other globals
// in dependencies like the Vulkan validation layers.
VkInstance PlaygroundImplVK::global_instance_ = VK_NULL_HANDLE;
void PlaygroundImplVK::DestroyWindowHandle(WindowHandle handle) {
if (!handle) {
@ -207,7 +211,7 @@ void PlaygroundImplVK::InitGlobalVulkanInstance() {
auto instance_result = vk::createInstanceUnique(instance_info);
FML_CHECK(instance_result.result == vk::Result::eSuccess)
<< "Unable to initialize global Vulkan instance";
global_instance_ = std::move(instance_result.value);
global_instance_ = instance_result.value.release();
}
fml::Status PlaygroundImplVK::SetCapabilities(

View File

@ -32,7 +32,7 @@ class PlaygroundImplVK final : public PlaygroundImpl {
// A global Vulkan instance which ensures that the Vulkan library will remain
// loaded throughout the lifetime of the process.
static vk::UniqueInstance global_instance_;
static VkInstance global_instance_;
// |PlaygroundImpl|
std::shared_ptr<Context> GetContext() const override;

View File

@ -45,7 +45,7 @@ bool DebugReportVK::IsValid() const {
return is_valid_;
}
static std::string JoinLabels(const VkDebugUtilsLabelEXT* labels,
static std::string JoinLabels(const vk::DebugUtilsLabelEXT* labels,
size_t count) {
std::stringstream stream;
for (size_t i = 0u; i < count; i++) {
@ -58,7 +58,7 @@ static std::string JoinLabels(const VkDebugUtilsLabelEXT* labels,
}
static std::string JoinVKDebugUtilsObjectNameInfoEXT(
const VkDebugUtilsObjectNameInfoEXT* names,
const vk::DebugUtilsObjectNameInfoEXT* names,
size_t count) {
std::stringstream stream;
for (size_t i = 0u; i < count; i++) {
@ -78,9 +78,9 @@ static std::string JoinVKDebugUtilsObjectNameInfoEXT(
}
VKAPI_ATTR VkBool32 VKAPI_CALL DebugReportVK::DebugUtilsMessengerCallback(
VkDebugUtilsMessageSeverityFlagBitsEXT severity,
VkDebugUtilsMessageTypeFlagsEXT type,
const VkDebugUtilsMessengerCallbackDataEXT* callback_data,
vk::DebugUtilsMessageSeverityFlagBitsEXT severity,
vk::DebugUtilsMessageTypeFlagsEXT type,
const vk::DebugUtilsMessengerCallbackDataEXT* callback_data,
void* debug_report) {
auto result =
reinterpret_cast<DebugReportVK*>(debug_report)
@ -102,7 +102,7 @@ VKAPI_ATTR VkBool32 VKAPI_CALL DebugReportVK::DebugUtilsMessengerCallback(
DebugReportVK::Result DebugReportVK::OnDebugCallback(
vk::DebugUtilsMessageSeverityFlagBitsEXT severity,
vk::DebugUtilsMessageTypeFlagsEXT type,
const VkDebugUtilsMessengerCallbackDataEXT* data) {
const vk::DebugUtilsMessengerCallbackDataEXT* data) {
// This is a real issue caused by INPUT_ATTACHMENT_BIT not being a supported
// `VkSurfaceCapabilitiesKHR::supportedUsageFlags` on any platform other than
// Android. This is necessary for all the framebuffer fetch related tests. We
@ -133,6 +133,15 @@ DebugReportVK::Result DebugReportVK::OnDebugCallback(
return Result::kContinue;
}
// This warning happens when running tests that use SwiftShader.
// Some SPIR-V shaders request the UniformAndStorageBuffer16BitAccess
// capability, but SwiftShader does not support it.
if (data->pMessageIdName != nullptr &&
strcmp(data->pMessageIdName,
"VUID-VkShaderModuleCreateInfo-pCode-08740") == 0) {
return Result::kContinue;
}
std::vector<std::pair<std::string, std::string>> items;
items.emplace_back("Severity", vk::to_string(severity));

View File

@ -30,12 +30,12 @@ class DebugReportVK {
Result OnDebugCallback(vk::DebugUtilsMessageSeverityFlagBitsEXT severity,
vk::DebugUtilsMessageTypeFlagsEXT type,
const VkDebugUtilsMessengerCallbackDataEXT* data);
const vk::DebugUtilsMessengerCallbackDataEXT* data);
static VKAPI_ATTR VkBool32 VKAPI_CALL DebugUtilsMessengerCallback(
VkDebugUtilsMessageSeverityFlagBitsEXT severity,
VkDebugUtilsMessageTypeFlagsEXT type,
const VkDebugUtilsMessengerCallbackDataEXT* callback_data,
vk::DebugUtilsMessageSeverityFlagBitsEXT severity,
vk::DebugUtilsMessageTypeFlagsEXT type,
const vk::DebugUtilsMessengerCallbackDataEXT* callback_data,
void* user_data);
DebugReportVK(const DebugReportVK&) = delete;

View File

@ -197,7 +197,7 @@
"uses_late_zs_update": false,
"variants": {
"Main": {
"fp16_arithmetic": 44,
"fp16_arithmetic": 88,
"has_stack_spilling": false,
"performance": {
"longest_path_bound_pipelines": [
@ -205,9 +205,9 @@
"arith_fma"
],
"longest_path_cycles": [
0.875,
0.875,
0.203125,
0.824999988079071,
0.824999988079071,
0.234375,
0.25,
0.0,
0.25,
@ -227,9 +227,9 @@
"arith_fma"
],
"shortest_path_cycles": [
0.875,
0.875,
0.203125,
0.824999988079071,
0.824999988079071,
0.234375,
0.25,
0.0,
0.25,
@ -240,9 +240,9 @@
"arith_fma"
],
"total_cycles": [
0.875,
0.875,
0.203125,
0.824999988079071,
0.824999988079071,
0.234375,
0.25,
0.0,
0.25,
@ -251,8 +251,8 @@
},
"stack_spill_bytes": 0,
"thread_occupancy": 100,
"uniform_registers_used": 12,
"work_registers_used": 18
"uniform_registers_used": 16,
"work_registers_used": 16
}
}
}
@ -491,9 +491,9 @@
"arith_cvt"
],
"longest_path_cycles": [
0.699999988079071,
0.359375,
0.699999988079071,
0.75,
0.46875,
0.75,
0.1875,
0.0,
0.25,
@ -525,9 +525,9 @@
"arith_cvt"
],
"total_cycles": [
1.15625,
0.762499988079071,
1.15625,
1.21875,
0.84375,
1.21875,
0.4375,
0.0,
0.25,
@ -536,7 +536,7 @@
},
"stack_spill_bytes": 0,
"thread_occupancy": 100,
"uniform_registers_used": 48,
"uniform_registers_used": 46,
"work_registers_used": 12
}
}
@ -585,7 +585,7 @@
],
"shortest_path_cycles": [
0.5,
0.140625,
0.125,
0.3125,
0.5,
0.0,
@ -596,9 +596,9 @@
"load_store"
],
"total_cycles": [
1.46875,
0.96875,
1.46875,
1.53125,
1.03125,
1.53125,
0.9375,
4.0,
0.25,
@ -607,7 +607,7 @@
},
"stack_spill_bytes": 0,
"thread_occupancy": 100,
"uniform_registers_used": 52,
"uniform_registers_used": 50,
"work_registers_used": 18
}
}
@ -666,9 +666,9 @@
"load_store"
],
"total_cycles": [
1.5750000476837158,
0.925000011920929,
1.5750000476837158,
1.6375000476837158,
1.0,
1.6375000476837158,
0.5625,
4.0,
0.25,
@ -677,7 +677,7 @@
},
"stack_spill_bytes": 0,
"thread_occupancy": 100,
"uniform_registers_used": 46,
"uniform_registers_used": 42,
"work_registers_used": 16
}
}
@ -1926,7 +1926,7 @@
],
"longest_path_cycles": [
0.875,
0.484375,
0.46875,
0.875,
0.25,
0.0,
@ -1960,7 +1960,7 @@
],
"total_cycles": [
1.375,
0.875,
0.84375,
1.375,
0.5,
0.0,
@ -1971,7 +1971,7 @@
"stack_spill_bytes": 0,
"thread_occupancy": 100,
"uniform_registers_used": 46,
"work_registers_used": 22
"work_registers_used": 21
}
}
},
@ -2075,7 +2075,7 @@
],
"total_cycles": [
1.59375,
1.0125000476837158,
0.987500011920929,
1.59375,
0.5,
4.0,
@ -3498,7 +3498,7 @@
"arithmetic"
],
"total_cycles": [
10.0,
9.666666984558105,
4.0,
0.0
]
@ -5039,7 +5039,7 @@
"uses_late_zs_update": false,
"variants": {
"Main": {
"fp16_arithmetic": 34,
"fp16_arithmetic": 31,
"has_stack_spilling": false,
"performance": {
"longest_path_bound_pipelines": [
@ -5112,7 +5112,7 @@
"arithmetic"
],
"longest_path_cycles": [
7.920000076293945,
7.590000152587891,
1.0,
1.0
],
@ -5133,7 +5133,7 @@
"arithmetic"
],
"total_cycles": [
8.666666984558105,
8.333333015441895,
1.0,
1.0
]
@ -5249,7 +5249,7 @@
"arithmetic"
],
"total_cycles": [
10.333333015441895,
10.0,
5.0,
0.0
]
@ -6914,7 +6914,7 @@
"uses_late_zs_update": false,
"variants": {
"Main": {
"fp16_arithmetic": 37,
"fp16_arithmetic": 43,
"has_stack_spilling": false,
"performance": {
"longest_path_bound_pipelines": [
@ -6985,7 +6985,7 @@
"uses_late_zs_update": false,
"variants": {
"Main": {
"fp16_arithmetic": 35,
"fp16_arithmetic": 41,
"has_stack_spilling": false,
"performance": {
"longest_path_bound_pipelines": [
@ -7055,7 +7055,7 @@
"uses_late_zs_update": false,
"variants": {
"Main": {
"fp16_arithmetic": 20,
"fp16_arithmetic": 31,
"has_stack_spilling": false,
"performance": {
"longest_path_bound_pipelines": [
@ -7064,8 +7064,8 @@
],
"longest_path_cycles": [
0.4375,
0.296875,
0.359375,
0.28125,
0.40625,
0.4375,
0.0,
0.25,
@ -7085,10 +7085,10 @@
"texture"
],
"shortest_path_cycles": [
0.234375,
0.203125,
0.234375,
0.1875,
0.171875,
0.140625,
0.171875,
0.0625,
0.0,
0.25,
0.25
@ -7100,7 +7100,7 @@
"total_cycles": [
0.4375,
0.328125,
0.359375,
0.40625,
0.4375,
0.0,
0.25,
@ -7110,7 +7110,7 @@
"stack_spill_bytes": 0,
"thread_occupancy": 100,
"uniform_registers_used": 10,
"work_registers_used": 12
"work_registers_used": 10
}
}
}
@ -7207,8 +7207,8 @@
"varying"
],
"longest_path_cycles": [
0.21875,
0.21875,
0.1875,
0.1875,
0.0,
0.0,
0.0,
@ -7228,8 +7228,8 @@
"varying"
],
"shortest_path_cycles": [
0.21875,
0.21875,
0.1875,
0.1875,
0.0,
0.0,
0.0,
@ -7240,8 +7240,8 @@
"varying"
],
"total_cycles": [
0.21875,
0.21875,
0.1875,
0.1875,
0.0,
0.0,
0.0,
@ -7252,7 +7252,7 @@
"stack_spill_bytes": 0,
"thread_occupancy": 100,
"uniform_registers_used": 6,
"work_registers_used": 11
"work_registers_used": 8
}
}
}
@ -7603,8 +7603,8 @@
"arith_fma"
],
"longest_path_cycles": [
0.6875,
0.6875,
0.625,
0.625,
0.1875,
0.5,
0.0,
@ -7625,8 +7625,8 @@
"arith_fma"
],
"shortest_path_cycles": [
0.6875,
0.6875,
0.625,
0.625,
0.1875,
0.5,
0.0,
@ -7638,8 +7638,8 @@
"arith_fma"
],
"total_cycles": [
0.6875,
0.6875,
0.625,
0.625,
0.1875,
0.5,
0.0,
@ -7650,7 +7650,7 @@
"stack_spill_bytes": 0,
"thread_occupancy": 100,
"uniform_registers_used": 18,
"work_registers_used": 13
"work_registers_used": 11
}
}
}
@ -8099,7 +8099,7 @@
"uses_late_zs_update": false,
"variants": {
"Main": {
"fp16_arithmetic": 34,
"fp16_arithmetic": 43,
"has_stack_spilling": false,
"performance": {
"longest_path_bound_pipelines": [
@ -8107,8 +8107,8 @@
"arith_fma"
],
"longest_path_cycles": [
0.421875,
0.421875,
0.40625,
0.40625,
0.3125,
0.25,
0.0,
@ -8129,8 +8129,8 @@
"arith_fma"
],
"shortest_path_cycles": [
0.328125,
0.328125,
0.3125,
0.3125,
0.203125,
0.25,
0.0,
@ -8142,8 +8142,8 @@
"arith_fma"
],
"total_cycles": [
0.453125,
0.453125,
0.4375,
0.4375,
0.40625,
0.25,
0.0,
@ -8153,8 +8153,8 @@
},
"stack_spill_bytes": 0,
"thread_occupancy": 100,
"uniform_registers_used": 20,
"work_registers_used": 13
"uniform_registers_used": 22,
"work_registers_used": 14
}
}
}
@ -8202,7 +8202,7 @@
],
"shortest_path_cycles": [
0.8125,
0.421875,
0.390625,
0.328125,
0.8125,
0.0,
@ -8214,8 +8214,8 @@
],
"total_cycles": [
0.875,
0.6875,
0.762499988079071,
0.65625,
0.78125,
0.875,
4.0,
0.25,
@ -8224,7 +8224,7 @@
},
"stack_spill_bytes": 0,
"thread_occupancy": 100,
"uniform_registers_used": 26,
"uniform_registers_used": 28,
"work_registers_used": 20
}
}
@ -8272,8 +8272,8 @@
"arith_fma"
],
"shortest_path_cycles": [
0.390625,
0.390625,
0.375,
0.375,
0.25,
0.3125,
0.0,
@ -8284,9 +8284,9 @@
"load_store"
],
"total_cycles": [
0.875,
0.637499988079071,
0.875,
0.887499988079071,
0.625,
0.887499988079071,
0.5,
4.0,
0.25,

View File

@ -895,13 +895,13 @@ class _RepositoryFuchsiaSdkLinuxLicenseFile extends _RepositorySingleLicenseFile
}
}
/// The BoringSSL license file.
/// The Vulkan validation layers license file.
///
/// This file contains a bunch of different licenses, but other files
/// refer to it as if it was a monolithic license so we sort of have
/// to treat the whole thing as a MultiLicense.
class _RepositoryVulkanApacheLicenseFile extends _RepositorySingleLicenseFile {
_RepositoryVulkanApacheLicenseFile(_RepositoryDirectory parent, fs.TextFile io)
class _RepositoryVulkanValidationApacheLicenseFile extends _RepositorySingleLicenseFile {
_RepositoryVulkanValidationApacheLicenseFile(_RepositoryDirectory parent, fs.TextFile io)
: super(parent, io, _parseLicense(io));
static const String _prefix =
@ -916,7 +916,28 @@ class _RepositoryVulkanApacheLicenseFile extends _RepositorySingleLicenseFile {
static License _parseLicense(fs.TextFile io) {
final String body = io.readString();
if (!body.startsWith(_prefix)) {
throw 'Failed to match Vulkan Apache license prefix.';
throw 'Failed to match vulkan-validation-layers license prefix.';
}
return License.fromBody(body.substring(_prefix.length), origin: io.fullName);
}
}
/// The Vulkan lunarg-vulkantools license file.
class _RepositoryVulkanLunarGApacheLicenseFile extends _RepositorySingleLicenseFile {
_RepositoryVulkanLunarGApacheLicenseFile(_RepositoryDirectory parent, fs.TextFile io)
: super(parent, io, _parseLicense(io));
static const String _prefix =
'The majority of files in this project use the Apache 2.0 License.\n'
'There are a few exceptions and their license can either be found in the source or their directory homing the source.\n'
'\n'
'===========================================================================================\n'
'\n';
static License _parseLicense(fs.TextFile io) {
final String body = io.readString();
if (!body.startsWith(_prefix)) {
throw 'Failed to match lunarg-vulkantools Apache license prefix.';
}
return License.fromBody(body.substring(_prefix.length), origin: io.fullName);
}
@ -1036,8 +1057,10 @@ class _RepositoryDirectory extends _RepositoryEntry implements LicenseSource {
'/flutter/third_party/libpng/LICENSE': _RepositoryLibPngLicenseFile.new,
'/flutter/third_party/rapidjson/LICENSE': _RepositoryOpaqueLicenseFile.new,
'/flutter/third_party/rapidjson/license.txt': _RepositoryOpaqueLicenseFile.new,
'/flutter/third_party/vulkan-deps/lunarg-vulkantools/src/LICENSE.txt':
_RepositoryVulkanLunarGApacheLicenseFile.new,
'/flutter/third_party/vulkan-deps/vulkan-validation-layers/src/LICENSE.txt':
_RepositoryVulkanApacheLicenseFile.new,
_RepositoryVulkanValidationApacheLicenseFile.new,
'/fuchsia/sdk/linux/LICENSE.vulkan': _RepositoryFuchsiaSdkLinuxLicenseFile.new,
'/fuchsia/sdk/linux/fidl/fuchsia.storage.ftl/ftl.fidl': _RepositorySourceFile.new,
'/fuchsia/sdk/mac/LICENSE.vulkan': _RepositoryFuchsiaSdkLinuxLicenseFile.new,

View File

@ -190,6 +190,7 @@ final Set<String> skippedPaths = <String>{
r'flutter/third_party/vulkan-deps/glslang/src/LICENSE.txt', // redundant with licenses inside files
r'flutter/third_party/vulkan-deps/glslang/src/glslang/OSDependent/Web', // we only use glslang in impellerc, not in web apps
r'flutter/third_party/vulkan-deps/glslang/src/kokoro', // only build files
r'flutter/third_party/vulkan-deps/lunarg-vulkantools/src/vkconfig_gui',
r'flutter/third_party/vulkan-deps/spirv-cross/src/LICENSES', // directory with license templates
r'flutter/third_party/vulkan-deps/spirv-cross/src/shaders', // used by regression tests
r'flutter/third_party/vulkan-deps/spirv-cross/src/shaders-hlsl', // used by regression tests

View File

@ -1402,6 +1402,41 @@ final List<RegExp> csNoticeLicenses = <RegExp>[
multiLine: true,
caseSensitive: false,
),
// License used by inplace_function.h in vulkan-validation-layers.
// See https://github.com/WG21-SG14/SG14/issues/174
RegExp(
kIndent +
r'Boost Software License - Version 1\.0 - August 17th, 2003\n' +
r' \*\n' +
(r'\1\2Permission is hereby granted, free of charge, to any person or '
r'organization obtaining a copy of the software and accompanying '
r'documentation covered by this license \(the "Software"\) to use, '
r'reproduce, display, distribute, execute, and transmit the Software, and '
r'to prepare derivative works of the Software, and to permit third-parties '
r'to whom the Software is furnished to do so, all subject to the following:\n'
.replaceAll(' ', _linebreak)) +
r' \*\n' +
(r'\1\2The copyright notices in the Software and this entire statement, '
r'including the above license grant, this restriction and the following '
r'disclaimer, must be included in all copies of the Software, in whole or '
r'in part, and all derivative works of the Software, unless such copies or '
r'derivative works are solely in the form of machine-executable object '
r'code generated by a source language processor\.\n'
.replaceAll(' ', _linebreak)) +
r' \*\n' +
(r'\1\2THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, '
r'EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF '
r'MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND '
r'NON-INFRINGEMENT\. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR ANYONE '
r'DISTRIBUTING THE SOFTWARE BE LIABLE FOR ANY DAMAGES OR OTHER LIABILITY, '
r'WHETHER IN CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN '
r'CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE '
r'SOFTWARE\.'
.replaceAll(' ', _linebreak)),
multiLine: true,
caseSensitive: false,
),
];
final List<RegExp> csStrayCopyrights = <RegExp>[