From 1021540dc2d2b524d837299865ebc2e0c93cfe59 Mon Sep 17 00:00:00 2001 From: Mike Schuchardt Date: Mon, 7 Jun 2021 13:44:49 -0700 Subject: [PATCH] build: Update to header 1.2.180 - Update known-good - Generate source Change-Id: I41d51ecab3257530ad733fe977f92d9c482543e6 --- build-android/vulkan-headers_revision_android | 2 +- icd/generated/mock_icd.cpp | 2 ++ icd/generated/mock_icd.h | 6 +++++- icd/generated/vk_typemap_helper.h | 27 +++++++++++++++++++++++++++ scripts/generate_vulkan_wrapper.py | 10 +++++++++- scripts/known_good.json | 4 ++-- vulkaninfo/generated/vulkaninfo.hpp | 11 +++++++++++ 7 files changed, 57 insertions(+), 5 deletions(-) diff --git a/build-android/vulkan-headers_revision_android b/build-android/vulkan-headers_revision_android index 0aafa12..7cae528 100644 --- a/build-android/vulkan-headers_revision_android +++ b/build-android/vulkan-headers_revision_android @@ -1 +1 @@ -v1.2.179 +v1.2.180 diff --git a/icd/generated/mock_icd.cpp b/icd/generated/mock_icd.cpp index 9db74bb..c80d6c8 100644 --- a/icd/generated/mock_icd.cpp +++ b/icd/generated/mock_icd.cpp @@ -3483,6 +3483,7 @@ static VKAPI_ATTR void VKAPI_CALL GetQueueCheckpointData2NV( + static VKAPI_ATTR void VKAPI_CALL CmdCopyBuffer2KHR( VkCommandBuffer commandBuffer, const VkCopyBufferInfo2KHR* pCopyBufferInfo) @@ -5129,6 +5130,7 @@ static VKAPI_ATTR void VKAPI_CALL CmdSetColor } + static VKAPI_ATTR VkResult VKAPI_CALL CreateAccelerationStructureKHR( VkDevice device, const VkAccelerationStructureCreateInfoKHR* pCreateInfo, diff --git a/icd/generated/mock_icd.h b/icd/generated/mock_icd.h index 6681c68..c3d6039 100644 --- a/icd/generated/mock_icd.h +++ b/icd/generated/mock_icd.h @@ -79,7 +79,7 @@ static const std::unordered_map instance_extension_map = {"VK_FUCHSIA_imagepipe_surface", 1}, {"VK_EXT_metal_surface", 1}, {"VK_KHR_surface_protected_capabilities", 1}, - {"VK_EXT_validation_features", 4}, + {"VK_EXT_validation_features", 5}, {"VK_EXT_headless_surface", 1}, {"VK_EXT_directfb_surface", 1}, {"VK_QNX_screen_surface", 1}, @@ -277,6 +277,7 @@ static const std::unordered_map device_extension_map = { {"VK_NV_device_diagnostics_config", 1}, {"VK_QCOM_render_pass_store_ops", 2}, {"VK_KHR_synchronization2", 1}, + {"VK_KHR_shader_subgroup_uniform_control_flow", 1}, {"VK_KHR_zero_initialize_workgroup_memory", 1}, {"VK_NV_fragment_shading_rate_enums", 1}, {"VK_EXT_ycbcr_2plane_444_formats", 1}, @@ -293,6 +294,7 @@ static const std::unordered_map device_extension_map = { {"VK_FUCHSIA_external_semaphore", 1}, {"VK_EXT_extended_dynamic_state2", 1}, {"VK_EXT_color_write_enable", 1}, + {"VK_EXT_global_priority_query", 1}, }; @@ -2085,6 +2087,7 @@ static VKAPI_ATTR void VKAPI_CALL GetQueueCheckpointData2NV( + static VKAPI_ATTR void VKAPI_CALL CmdCopyBuffer2KHR( VkCommandBuffer commandBuffer, const VkCopyBufferInfo2KHR* pCopyBufferInfo); @@ -3156,6 +3159,7 @@ static VKAPI_ATTR void VKAPI_CALL CmdSetColor const VkBool32* pColorWriteEnables); + static VKAPI_ATTR VkResult VKAPI_CALL CreateAccelerationStructureKHR( VkDevice device, const VkAccelerationStructureCreateInfoKHR* pCreateInfo, diff --git a/icd/generated/vk_typemap_helper.h b/icd/generated/vk_typemap_helper.h index 279fbd3..0c8a795 100644 --- a/icd/generated/vk_typemap_helper.h +++ b/icd/generated/vk_typemap_helper.h @@ -2464,6 +2464,15 @@ template <> struct LvlSTypeMap { typedef VkCheckpointData2NV Type; }; +// Map type VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_UNIFORM_CONTROL_FLOW_FEATURES_KHR +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_UNIFORM_CONTROL_FLOW_FEATURES_KHR; +}; + +template <> struct LvlSTypeMap { + typedef VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR Type; +}; + // Map type VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeaturesKHR to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ZERO_INITIALIZE_WORKGROUP_MEMORY_FEATURES_KHR template <> struct LvlTypeMap { static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ZERO_INITIALIZE_WORKGROUP_MEMORY_FEATURES_KHR; @@ -4949,6 +4958,24 @@ template <> struct LvlSTypeMap struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_EXT; +}; + +template <> struct LvlSTypeMap { + typedef VkPhysicalDeviceGlobalPriorityQueryFeaturesEXT Type; +}; + +// Map type VkQueueFamilyGlobalPriorityPropertiesEXT to id VK_STRUCTURE_TYPE_QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES_EXT +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES_EXT; +}; + +template <> struct LvlSTypeMap { + typedef VkQueueFamilyGlobalPriorityPropertiesEXT Type; +}; + // Map type VkAccelerationStructureGeometryTrianglesDataKHR to id VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_TRIANGLES_DATA_KHR template <> struct LvlTypeMap { static const VkStructureType kSType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_TRIANGLES_DATA_KHR; diff --git a/scripts/generate_vulkan_wrapper.py b/scripts/generate_vulkan_wrapper.py index 22eeb1c..344f1a7 100755 --- a/scripts/generate_vulkan_wrapper.py +++ b/scripts/generate_vulkan_wrapper.py @@ -572,6 +572,9 @@ VK_KHR_synchronization2 = Extension(name='VK_KHR_synchronization2', version=1, g Command(name='vkGetQueueCheckpointData2NV', dispatch='VkQueue'), ]) +VK_KHR_shader_subgroup_uniform_control_flow = Extension(name='VK_KHR_shader_subgroup_uniform_control_flow', version=1, guard=None, commands=[ +]) + VK_KHR_zero_initialize_workgroup_memory = Extension(name='VK_KHR_zero_initialize_workgroup_memory', version=1, guard=None, commands=[ ]) @@ -993,7 +996,7 @@ VK_EXT_tooling_info = Extension(name='VK_EXT_tooling_info', version=1, guard=Non VK_EXT_separate_stencil_usage = Extension(name='VK_EXT_separate_stencil_usage', version=1, guard=None, commands=[ ]) -VK_EXT_validation_features = Extension(name='VK_EXT_validation_features', version=4, guard=None, commands=[ +VK_EXT_validation_features = Extension(name='VK_EXT_validation_features', version=5, guard=None, commands=[ ]) VK_NV_cooperative_matrix = Extension(name='VK_NV_cooperative_matrix', version=1, guard=None, commands=[ @@ -1138,6 +1141,9 @@ VK_EXT_color_write_enable = Extension(name='VK_EXT_color_write_enable', version= Command(name='vkCmdSetColorWriteEnableEXT', dispatch='VkCommandBuffer'), ]) +VK_EXT_global_priority_query = Extension(name='VK_EXT_global_priority_query', version=1, guard=None, commands=[ +]) + VK_KHR_acceleration_structure = Extension(name='VK_KHR_acceleration_structure', version=11, guard=None, commands=[ Command(name='vkCreateAccelerationStructureKHR', dispatch='VkDevice'), Command(name='vkDestroyAccelerationStructureKHR', dispatch='VkDevice'), @@ -1385,6 +1391,7 @@ extensions = [ VK_KHR_pipeline_library, VK_KHR_shader_non_semantic_info, VK_KHR_synchronization2, + VK_KHR_shader_subgroup_uniform_control_flow, VK_KHR_zero_initialize_workgroup_memory, VK_KHR_workgroup_memory_explicit_layout, VK_KHR_copy_commands2, @@ -1528,6 +1535,7 @@ extensions = [ VK_EXT_vertex_input_dynamic_state, VK_EXT_extended_dynamic_state2, VK_EXT_color_write_enable, + VK_EXT_global_priority_query, VK_KHR_acceleration_structure, VK_KHR_ray_tracing_pipeline, VK_KHR_ray_query, diff --git a/scripts/known_good.json b/scripts/known_good.json index 5078d19..92810ba 100644 --- a/scripts/known_good.json +++ b/scripts/known_good.json @@ -6,7 +6,7 @@ "sub_dir" : "Vulkan-Headers", "build_dir" : "Vulkan-Headers/build", "install_dir" : "Vulkan-Headers/build/install", - "commit" : "v1.2.179" + "commit" : "v1.2.180" }, { "name" : "MoltenVK", @@ -30,7 +30,7 @@ "sub_dir" : "Vulkan-Loader", "build_dir" : "Vulkan-Loader/build", "install_dir" : "Vulkan-Loader/build/install", - "commit" : "v1.2.179", + "commit" : "v1.2.180", "deps" : [ { "var_name" : "VULKAN_HEADERS_INSTALL_DIR", diff --git a/vulkaninfo/generated/vulkaninfo.hpp b/vulkaninfo/generated/vulkaninfo.hpp index a3eb491..0e72915 100644 --- a/vulkaninfo/generated/vulkaninfo.hpp +++ b/vulkaninfo/generated/vulkaninfo.hpp @@ -1728,6 +1728,10 @@ void DumpVkPhysicalDeviceShaderSubgroupExtendedTypesFeatures(Printer &p, std::st ObjectWrapper object{p, name}; p.PrintKeyBool("shaderSubgroupExtendedTypes", static_cast(obj.shaderSubgroupExtendedTypes), 27); } +void DumpVkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR(Printer &p, std::string name, VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR &obj) { + ObjectWrapper object{p, name}; + p.PrintKeyBool("shaderSubgroupUniformControlFlow", static_cast(obj.shaderSubgroupUniformControlFlow), 32); +} void DumpVkPhysicalDeviceShaderTerminateInvocationFeaturesKHR(Printer &p, std::string name, VkPhysicalDeviceShaderTerminateInvocationFeaturesKHR &obj) { ObjectWrapper object{p, name}; p.PrintKeyBool("shaderTerminateInvocation", static_cast(obj.shaderTerminateInvocation), 25); @@ -2131,6 +2135,7 @@ pNextChainInfos get_chain_infos() { {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT16_INT8_FEATURES, sizeof(VkPhysicalDeviceShaderFloat16Int8Features)}, {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_IMAGE_ATOMIC_INT64_FEATURES_EXT, sizeof(VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT)}, {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_EXTENDED_TYPES_FEATURES, sizeof(VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures)}, + {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_UNIFORM_CONTROL_FLOW_FEATURES_KHR, sizeof(VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR)}, {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_TERMINATE_INVOCATION_FEATURES_KHR, sizeof(VkPhysicalDeviceShaderTerminateInvocationFeaturesKHR)}, {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_FEATURES_EXT, sizeof(VkPhysicalDeviceSubgroupSizeControlFeaturesEXT)}, {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SYNCHRONIZATION_2_FEATURES_KHR, sizeof(VkPhysicalDeviceSynchronization2FeaturesKHR)}, @@ -2729,6 +2734,12 @@ void chain_iterator_phys_device_features2(Printer &p, AppGpu &gpu, void * place, DumpVkPhysicalDeviceShaderSubgroupExtendedTypesFeatures(p, version.minor >= 2 ?"VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures":"VkPhysicalDeviceShaderSubgroupExtendedTypesFeaturesKHR", *props); p.AddNewline(); } + if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_UNIFORM_CONTROL_FLOW_FEATURES_KHR && + (gpu.CheckPhysicalDeviceExtensionIncluded(VK_KHR_SHADER_SUBGROUP_UNIFORM_CONTROL_FLOW_EXTENSION_NAME))) { + VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR* props = (VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR*)structure; + DumpVkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR(p, "VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR", *props); + p.AddNewline(); + } if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_TERMINATE_INVOCATION_FEATURES_KHR && (gpu.CheckPhysicalDeviceExtensionIncluded(VK_KHR_SHADER_TERMINATE_INVOCATION_EXTENSION_NAME))) { VkPhysicalDeviceShaderTerminateInvocationFeaturesKHR* props = (VkPhysicalDeviceShaderTerminateInvocationFeaturesKHR*)structure; -- 2.7.4