Update extension dependencies

Affects:
dEQP-VK.info.device_extensions

Components: Vulkan

Change-Id: I8be1c95646a6f0c2b8ddc27cc27c6679346c51c7

diff --git a/external/vulkancts/framework/vulkan/vkApiExtensionDependencyInfo.inl b/external/vulkancts/framework/vulkan/vkApiExtensionDependencyInfo.inl
index 6f31c11..1a83f0a 100644 (file)
--- a/external/vulkancts/framework/vulkan/vkApiExtensionDependencyInfo.inl
+++ b/external/vulkancts/framework/vulkan/vkApiExtensionDependencyInfo.inl
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  *
- * Generated from Khronos Vulkan API description (vk.xml) revision cee0f4b12acde766e64d0d038b03458c74bb67f1.
+ * Generated from Khronos Vulkan API description (vk.xml) revision b4e8cd820b2487bc892b391fb26b49501473a6a6.
  */
 static const std::tuple<deUint32, deUint32, const char*, const char*>  instanceExtensionDependencies[] =
 {
@@ -70,6 +70,9 @@ static const std::tuple<deUint32, deUint32, const char*, const char*> instanceEx
        std::make_tuple(1, 0, "VK_NN_vi_surface", "VK_KHR_surface"),
        std::make_tuple(1, 1, "VK_NN_vi_surface", "VK_KHR_surface"),
        std::make_tuple(1, 2, "VK_NN_vi_surface", "VK_KHR_surface"),
+       std::make_tuple(1, 0, "VK_QNX_screen_surface", "VK_KHR_surface"),
+       std::make_tuple(1, 1, "VK_QNX_screen_surface", "VK_KHR_surface"),
+       std::make_tuple(1, 2, "VK_QNX_screen_surface", "VK_KHR_surface"),
 };
 static const std::tuple<deUint32, deUint32, const char*, const char*>  deviceExtensionDependencies[]   =
 {
@@ -94,6 +97,7 @@ static const std::tuple<deUint32, deUint32, const char*, const char*> deviceExte
        std::make_tuple(1, 0, "VK_EXT_4444_formats", "VK_KHR_get_physical_device_properties2"),
        std::make_tuple(1, 0, "VK_EXT_astc_decode_mode", "VK_KHR_get_physical_device_properties2"),
        std::make_tuple(1, 0, "VK_EXT_buffer_device_address", "VK_KHR_get_physical_device_properties2"),
+       std::make_tuple(1, 0, "VK_EXT_color_write_enable", "VK_KHR_get_physical_device_properties2"),
        std::make_tuple(1, 0, "VK_EXT_conservative_rasterization", "VK_KHR_get_physical_device_properties2"),
        std::make_tuple(1, 0, "VK_EXT_debug_marker", "VK_EXT_debug_report"),
        std::make_tuple(1, 1, "VK_EXT_debug_marker", "VK_EXT_debug_report"),
@@ -109,6 +113,7 @@ static const std::tuple<deUint32, deUint32, const char*, const char*>       deviceExte
        std::make_tuple(1, 2, "VK_EXT_display_control", "VK_EXT_display_surface_counter"),
        std::make_tuple(1, 2, "VK_EXT_display_control", "VK_KHR_swapchain"),
        std::make_tuple(1, 0, "VK_EXT_extended_dynamic_state", "VK_KHR_get_physical_device_properties2"),
+       std::make_tuple(1, 0, "VK_EXT_extended_dynamic_state2", "VK_KHR_get_physical_device_properties2"),
        std::make_tuple(1, 0, "VK_EXT_external_memory_dma_buf", "VK_KHR_external_memory_fd"),
        std::make_tuple(1, 1, "VK_EXT_external_memory_dma_buf", "VK_KHR_external_memory_fd"),
        std::make_tuple(1, 2, "VK_EXT_external_memory_dma_buf", "VK_KHR_external_memory_fd"),
@@ -128,6 +133,10 @@ static const std::tuple<deUint32, deUint32, const char*, const char*>      deviceExte
        std::make_tuple(1, 2, "VK_EXT_full_screen_exclusive", "VK_KHR_surface"),
        std::make_tuple(1, 2, "VK_EXT_full_screen_exclusive", "VK_KHR_get_surface_capabilities2"),
        std::make_tuple(1, 2, "VK_EXT_full_screen_exclusive", "VK_KHR_swapchain"),
+       std::make_tuple(1, 0, "VK_EXT_global_priority_query", "VK_EXT_global_priority"),
+       std::make_tuple(1, 0, "VK_EXT_global_priority_query", "VK_KHR_get_physical_device_properties2"),
+       std::make_tuple(1, 1, "VK_EXT_global_priority_query", "VK_EXT_global_priority"),
+       std::make_tuple(1, 2, "VK_EXT_global_priority_query", "VK_EXT_global_priority"),
        std::make_tuple(1, 0, "VK_EXT_hdr_metadata", "VK_KHR_swapchain"),
        std::make_tuple(1, 1, "VK_EXT_hdr_metadata", "VK_KHR_swapchain"),
        std::make_tuple(1, 2, "VK_EXT_hdr_metadata", "VK_KHR_swapchain"),
@@ -144,6 +153,7 @@ static const std::tuple<deUint32, deUint32, const char*, const char*>       deviceExte
        std::make_tuple(1, 0, "VK_EXT_memory_budget", "VK_KHR_get_physical_device_properties2"),
        std::make_tuple(1, 0, "VK_EXT_memory_priority", "VK_KHR_get_physical_device_properties2"),
        std::make_tuple(1, 0, "VK_EXT_pci_bus_info", "VK_KHR_get_physical_device_properties2"),
+       std::make_tuple(1, 0, "VK_EXT_provoking_vertex", "VK_KHR_get_physical_device_properties2"),
        std::make_tuple(1, 0, "VK_EXT_queue_family_foreign", "VK_KHR_external_memory"),
        std::make_tuple(1, 0, "VK_EXT_sample_locations", "VK_KHR_get_physical_device_properties2"),
        std::make_tuple(1, 0, "VK_EXT_sampler_filter_minmax", "VK_KHR_get_physical_device_properties2"),
@@ -155,7 +165,22 @@ static const std::tuple<deUint32, deUint32, const char*, const char*>      deviceExte
        std::make_tuple(1, 0, "VK_EXT_texture_compression_astc_hdr", "VK_KHR_get_physical_device_properties2"),
        std::make_tuple(1, 0, "VK_EXT_transform_feedback", "VK_KHR_get_physical_device_properties2"),
        std::make_tuple(1, 0, "VK_EXT_vertex_attribute_divisor", "VK_KHR_get_physical_device_properties2"),
+       std::make_tuple(1, 0, "VK_EXT_vertex_input_dynamic_state", "VK_KHR_get_physical_device_properties2"),
+       std::make_tuple(1, 0, "VK_EXT_video_decode_h264", "VK_KHR_video_decode_queue"),
+       std::make_tuple(1, 1, "VK_EXT_video_decode_h264", "VK_KHR_video_decode_queue"),
+       std::make_tuple(1, 2, "VK_EXT_video_decode_h264", "VK_KHR_video_decode_queue"),
+       std::make_tuple(1, 0, "VK_EXT_video_decode_h265", "VK_KHR_video_decode_queue"),
+       std::make_tuple(1, 1, "VK_EXT_video_decode_h265", "VK_KHR_video_decode_queue"),
+       std::make_tuple(1, 2, "VK_EXT_video_decode_h265", "VK_KHR_video_decode_queue"),
+       std::make_tuple(1, 0, "VK_EXT_video_encode_h264", "VK_KHR_video_encode_queue"),
+       std::make_tuple(1, 1, "VK_EXT_video_encode_h264", "VK_KHR_video_encode_queue"),
+       std::make_tuple(1, 2, "VK_EXT_video_encode_h264", "VK_KHR_video_encode_queue"),
+       std::make_tuple(1, 0, "VK_EXT_ycbcr_2plane_444_formats", "VK_KHR_sampler_ycbcr_conversion"),
        std::make_tuple(1, 0, "VK_EXT_ycbcr_image_arrays", "VK_KHR_sampler_ycbcr_conversion"),
+       std::make_tuple(1, 0, "VK_FUCHSIA_external_memory", "VK_KHR_external_memory_capabilities"),
+       std::make_tuple(1, 0, "VK_FUCHSIA_external_memory", "VK_KHR_external_memory"),
+       std::make_tuple(1, 0, "VK_FUCHSIA_external_semaphore", "VK_KHR_external_semaphore_capabilities"),
+       std::make_tuple(1, 0, "VK_FUCHSIA_external_semaphore", "VK_KHR_external_semaphore"),
        std::make_tuple(1, 0, "VK_GGP_frame_token", "VK_KHR_swapchain"),
        std::make_tuple(1, 0, "VK_GGP_frame_token", "VK_GGP_stream_descriptor_surface"),
        std::make_tuple(1, 1, "VK_GGP_frame_token", "VK_KHR_swapchain"),
@@ -170,6 +195,10 @@ static const std::tuple<deUint32, deUint32, const char*, const char*>      deviceExte
        std::make_tuple(1, 0, "VK_KHR_16bit_storage", "VK_KHR_storage_buffer_storage_class"),
        std::make_tuple(1, 0, "VK_KHR_8bit_storage", "VK_KHR_get_physical_device_properties2"),
        std::make_tuple(1, 0, "VK_KHR_8bit_storage", "VK_KHR_storage_buffer_storage_class"),
+       std::make_tuple(1, 1, "VK_KHR_acceleration_structure", "VK_EXT_descriptor_indexing"),
+       std::make_tuple(1, 1, "VK_KHR_acceleration_structure", "VK_KHR_buffer_device_address"),
+       std::make_tuple(1, 1, "VK_KHR_acceleration_structure", "VK_KHR_deferred_host_operations"),
+       std::make_tuple(1, 2, "VK_KHR_acceleration_structure", "VK_KHR_deferred_host_operations"),
        std::make_tuple(1, 0, "VK_KHR_buffer_device_address", "VK_KHR_get_physical_device_properties2"),
        std::make_tuple(1, 0, "VK_KHR_create_renderpass2", "VK_KHR_multiview"),
        std::make_tuple(1, 0, "VK_KHR_create_renderpass2", "VK_KHR_maintenance2"),
@@ -193,6 +222,9 @@ static const std::tuple<deUint32, deUint32, const char*, const char*>       deviceExte
        std::make_tuple(1, 0, "VK_KHR_external_semaphore", "VK_KHR_external_semaphore_capabilities"),
        std::make_tuple(1, 0, "VK_KHR_external_semaphore_fd", "VK_KHR_external_semaphore"),
        std::make_tuple(1, 0, "VK_KHR_external_semaphore_win32", "VK_KHR_external_semaphore"),
+       std::make_tuple(1, 0, "VK_KHR_fragment_shading_rate", "VK_KHR_create_renderpass2"),
+       std::make_tuple(1, 0, "VK_KHR_fragment_shading_rate", "VK_KHR_get_physical_device_properties2"),
+       std::make_tuple(1, 1, "VK_KHR_fragment_shading_rate", "VK_KHR_create_renderpass2"),
        std::make_tuple(1, 0, "VK_KHR_imageless_framebuffer", "VK_KHR_maintenance2"),
        std::make_tuple(1, 0, "VK_KHR_imageless_framebuffer", "VK_KHR_image_format_list"),
        std::make_tuple(1, 1, "VK_KHR_imageless_framebuffer", "VK_KHR_image_format_list"),
@@ -205,18 +237,12 @@ static const std::tuple<deUint32, deUint32, const char*, const char*>     deviceExte
        std::make_tuple(1, 0, "VK_KHR_pipeline_executable_properties", "VK_KHR_get_physical_device_properties2"),
        std::make_tuple(1, 0, "VK_KHR_portability_subset", "VK_KHR_get_physical_device_properties2"),
        std::make_tuple(1, 0, "VK_KHR_push_descriptor", "VK_KHR_get_physical_device_properties2"),
-       std::make_tuple(1, 0, "VK_KHR_ray_tracing", "VK_KHR_get_physical_device_properties2"),
-       std::make_tuple(1, 0, "VK_KHR_ray_tracing", "VK_KHR_get_memory_requirements2"),
-       std::make_tuple(1, 0, "VK_KHR_ray_tracing", "VK_EXT_descriptor_indexing"),
-       std::make_tuple(1, 0, "VK_KHR_ray_tracing", "VK_KHR_buffer_device_address"),
-       std::make_tuple(1, 0, "VK_KHR_ray_tracing", "VK_KHR_deferred_host_operations"),
-       std::make_tuple(1, 0, "VK_KHR_ray_tracing", "VK_KHR_pipeline_library"),
-       std::make_tuple(1, 1, "VK_KHR_ray_tracing", "VK_EXT_descriptor_indexing"),
-       std::make_tuple(1, 1, "VK_KHR_ray_tracing", "VK_KHR_buffer_device_address"),
-       std::make_tuple(1, 1, "VK_KHR_ray_tracing", "VK_KHR_deferred_host_operations"),
-       std::make_tuple(1, 1, "VK_KHR_ray_tracing", "VK_KHR_pipeline_library"),
-       std::make_tuple(1, 2, "VK_KHR_ray_tracing", "VK_KHR_deferred_host_operations"),
-       std::make_tuple(1, 2, "VK_KHR_ray_tracing", "VK_KHR_pipeline_library"),
+       std::make_tuple(1, 1, "VK_KHR_ray_query", "VK_KHR_spirv_1_4"),
+       std::make_tuple(1, 1, "VK_KHR_ray_query", "VK_KHR_acceleration_structure"),
+       std::make_tuple(1, 2, "VK_KHR_ray_query", "VK_KHR_acceleration_structure"),
+       std::make_tuple(1, 1, "VK_KHR_ray_tracing_pipeline", "VK_KHR_spirv_1_4"),
+       std::make_tuple(1, 1, "VK_KHR_ray_tracing_pipeline", "VK_KHR_acceleration_structure"),
+       std::make_tuple(1, 2, "VK_KHR_ray_tracing_pipeline", "VK_KHR_acceleration_structure"),
        std::make_tuple(1, 0, "VK_KHR_sampler_ycbcr_conversion", "VK_KHR_maintenance1"),
        std::make_tuple(1, 0, "VK_KHR_sampler_ycbcr_conversion", "VK_KHR_bind_memory2"),
        std::make_tuple(1, 0, "VK_KHR_sampler_ycbcr_conversion", "VK_KHR_get_memory_requirements2"),
@@ -228,6 +254,7 @@ static const std::tuple<deUint32, deUint32, const char*, const char*>       deviceExte
        std::make_tuple(1, 0, "VK_KHR_shader_clock", "VK_KHR_get_physical_device_properties2"),
        std::make_tuple(1, 0, "VK_KHR_shader_float16_int8", "VK_KHR_get_physical_device_properties2"),
        std::make_tuple(1, 0, "VK_KHR_shader_float_controls", "VK_KHR_get_physical_device_properties2"),
+       std::make_tuple(1, 0, "VK_KHR_shader_terminate_invocation", "VK_KHR_get_physical_device_properties2"),
        std::make_tuple(1, 0, "VK_KHR_shared_presentable_image", "VK_KHR_swapchain"),
        std::make_tuple(1, 0, "VK_KHR_shared_presentable_image", "VK_KHR_get_physical_device_properties2"),
        std::make_tuple(1, 0, "VK_KHR_shared_presentable_image", "VK_KHR_get_surface_capabilities2"),
@@ -245,14 +272,34 @@ static const std::tuple<deUint32, deUint32, const char*, const char*>     deviceExte
        std::make_tuple(1, 1, "VK_KHR_swapchain_mutable_format", "VK_KHR_swapchain"),
        std::make_tuple(1, 1, "VK_KHR_swapchain_mutable_format", "VK_KHR_image_format_list"),
        std::make_tuple(1, 2, "VK_KHR_swapchain_mutable_format", "VK_KHR_swapchain"),
+       std::make_tuple(1, 0, "VK_KHR_synchronization2", "VK_KHR_get_physical_device_properties2"),
        std::make_tuple(1, 0, "VK_KHR_timeline_semaphore", "VK_KHR_get_physical_device_properties2"),
        std::make_tuple(1, 0, "VK_KHR_uniform_buffer_standard_layout", "VK_KHR_get_physical_device_properties2"),
        std::make_tuple(1, 0, "VK_KHR_variable_pointers", "VK_KHR_get_physical_device_properties2"),
        std::make_tuple(1, 0, "VK_KHR_variable_pointers", "VK_KHR_storage_buffer_storage_class"),
+       std::make_tuple(1, 0, "VK_KHR_video_decode_queue", "VK_KHR_video_queue"),
+       std::make_tuple(1, 0, "VK_KHR_video_decode_queue", "VK_KHR_synchronization2"),
+       std::make_tuple(1, 1, "VK_KHR_video_decode_queue", "VK_KHR_video_queue"),
+       std::make_tuple(1, 1, "VK_KHR_video_decode_queue", "VK_KHR_synchronization2"),
+       std::make_tuple(1, 2, "VK_KHR_video_decode_queue", "VK_KHR_video_queue"),
+       std::make_tuple(1, 2, "VK_KHR_video_decode_queue", "VK_KHR_synchronization2"),
+       std::make_tuple(1, 0, "VK_KHR_video_encode_queue", "VK_KHR_video_queue"),
+       std::make_tuple(1, 0, "VK_KHR_video_encode_queue", "VK_KHR_synchronization2"),
+       std::make_tuple(1, 1, "VK_KHR_video_encode_queue", "VK_KHR_video_queue"),
+       std::make_tuple(1, 1, "VK_KHR_video_encode_queue", "VK_KHR_synchronization2"),
+       std::make_tuple(1, 2, "VK_KHR_video_encode_queue", "VK_KHR_video_queue"),
+       std::make_tuple(1, 2, "VK_KHR_video_encode_queue", "VK_KHR_synchronization2"),
+       std::make_tuple(1, 0, "VK_KHR_video_queue", "VK_KHR_get_physical_device_properties2"),
+       std::make_tuple(1, 0, "VK_KHR_video_queue", "VK_KHR_sampler_ycbcr_conversion"),
        std::make_tuple(1, 0, "VK_KHR_win32_keyed_mutex", "VK_KHR_external_memory_win32"),
        std::make_tuple(1, 1, "VK_KHR_win32_keyed_mutex", "VK_KHR_external_memory_win32"),
        std::make_tuple(1, 2, "VK_KHR_win32_keyed_mutex", "VK_KHR_external_memory_win32"),
+       std::make_tuple(1, 0, "VK_KHR_workgroup_memory_explicit_layout", "VK_KHR_get_physical_device_properties2"),
+       std::make_tuple(1, 0, "VK_KHR_zero_initialize_workgroup_memory", "VK_KHR_get_physical_device_properties2"),
        std::make_tuple(1, 0, "VK_NVX_multiview_per_view_attributes", "VK_KHR_multiview"),
+       std::make_tuple(1, 0, "VK_NV_acquire_winrt_display", "VK_EXT_direct_mode_display"),
+       std::make_tuple(1, 1, "VK_NV_acquire_winrt_display", "VK_EXT_direct_mode_display"),
+       std::make_tuple(1, 2, "VK_NV_acquire_winrt_display", "VK_EXT_direct_mode_display"),
        std::make_tuple(1, 0, "VK_NV_compute_shader_derivatives", "VK_KHR_get_physical_device_properties2"),
        std::make_tuple(1, 0, "VK_NV_cooperative_matrix", "VK_KHR_get_physical_device_properties2"),
        std::make_tuple(1, 0, "VK_NV_corner_sampled_image", "VK_KHR_get_physical_device_properties2"),
@@ -269,6 +316,9 @@ static const std::tuple<deUint32, deUint32, const char*, const char*>       deviceExte
        std::make_tuple(1, 1, "VK_NV_external_memory_win32", "VK_NV_external_memory"),
        std::make_tuple(1, 2, "VK_NV_external_memory_win32", "VK_NV_external_memory"),
        std::make_tuple(1, 0, "VK_NV_fragment_shader_barycentric", "VK_KHR_get_physical_device_properties2"),
+       std::make_tuple(1, 0, "VK_NV_fragment_shading_rate_enums", "VK_KHR_fragment_shading_rate"),
+       std::make_tuple(1, 1, "VK_NV_fragment_shading_rate_enums", "VK_KHR_fragment_shading_rate"),
+       std::make_tuple(1, 2, "VK_NV_fragment_shading_rate_enums", "VK_KHR_fragment_shading_rate"),
        std::make_tuple(1, 0, "VK_NV_mesh_shader", "VK_KHR_get_physical_device_properties2"),
        std::make_tuple(1, 0, "VK_NV_ray_tracing", "VK_KHR_get_physical_device_properties2"),
        std::make_tuple(1, 0, "VK_NV_ray_tracing", "VK_KHR_get_memory_requirements2"),
@@ -284,6 +334,13 @@ static const std::tuple<deUint32, deUint32, const char*, const char*>      deviceExte
        std::make_tuple(1, 1, "VK_QCOM_render_pass_transform", "VK_KHR_surface"),
        std::make_tuple(1, 2, "VK_QCOM_render_pass_transform", "VK_KHR_swapchain"),
        std::make_tuple(1, 2, "VK_QCOM_render_pass_transform", "VK_KHR_surface"),
+       std::make_tuple(1, 0, "VK_QCOM_rotated_copy_commands", "VK_KHR_swapchain"),
+       std::make_tuple(1, 0, "VK_QCOM_rotated_copy_commands", "VK_KHR_copy_commands2"),
+       std::make_tuple(1, 1, "VK_QCOM_rotated_copy_commands", "VK_KHR_swapchain"),
+       std::make_tuple(1, 1, "VK_QCOM_rotated_copy_commands", "VK_KHR_copy_commands2"),
+       std::make_tuple(1, 2, "VK_QCOM_rotated_copy_commands", "VK_KHR_swapchain"),
+       std::make_tuple(1, 2, "VK_QCOM_rotated_copy_commands", "VK_KHR_copy_commands2"),
+       std::make_tuple(1, 0, "VK_VALVE_mutable_descriptor_type", "VK_KHR_maintenance3"),
 };
 static const std::tuple<deUint32, deUint32, deUint32>  releasedApiVersions[]   =
 {

diff --git a/external/vulkancts/scripts/gen_ext_deps.py b/external/vulkancts/scripts/gen_ext_deps.py
index 07a9843..a4a1d84 100644 (file)
--- a/external/vulkancts/scripts/gen_ext_deps.py
+++ b/external/vulkancts/scripts/gen_ext_deps.py
@@ -32,8 +32,8 @@ from collections import defaultdict
 VK_SOURCE                                              = khr_util.registry_cache.RegistrySource(
                                                                        "https://github.com/KhronosGroup/Vulkan-Docs.git",
                                                                        "xml/vk.xml",
-                                                                       "cee0f4b12acde766e64d0d038b03458c74bb67f1",
-                                                                       "eb31286278b1ecf55ae817198a4238f82ea8fe028aa0631e2c1b09747f10ebb4")
+                                                                       "b4e8cd820b2487bc892b391fb26b49501473a6a6",
+                                                                       "09c543ece64a965811ffb635caa52c13fdf9873f824cec4986a93d3d7380c8f0")
 VK_INL_FILE                                            = os.path.join(os.path.dirname(__file__), "..", "framework", "vulkan", "vkApiExtensionDependencyInfo.inl")
 VK_INL_HEADER                                  = khr_util.format.genInlHeader("Khronos Vulkan API description (vk.xml)", VK_SOURCE.getRevision())