From 8091ef4f9fd4df3aa7192095eca3ae9cbee56198 Mon Sep 17 00:00:00 2001 From: Mike Schuchardt Date: Fri, 29 Sep 2023 08:03:04 -0700 Subject: [PATCH] build: Update to header 1.3.266 - Update known-good - Generate source --- build-android/vulkan-headers_revision_android | 2 +- common/vulkan_wrapper.cpp | 5 ++ icd/generated/function_declarations.h | 36 ++++++++ icd/generated/function_definitions.h | 46 +++++++++++ icd/generated/vk_typemap_helper.h | 114 ++++++++++++++++++++++++++ scripts/generate_vulkan_wrapper.py | 13 +++ scripts/known_good.json | 4 +- vulkaninfo/generated/vulkaninfo.hpp | 2 + 8 files changed, 219 insertions(+), 3 deletions(-) diff --git a/build-android/vulkan-headers_revision_android b/build-android/vulkan-headers_revision_android index 3e18c7d..293a60c 100644 --- a/build-android/vulkan-headers_revision_android +++ b/build-android/vulkan-headers_revision_android @@ -1 +1 @@ -v1.3.265 +v1.3.266 diff --git a/common/vulkan_wrapper.cpp b/common/vulkan_wrapper.cpp index dff9616..c663f9e 100644 --- a/common/vulkan_wrapper.cpp +++ b/common/vulkan_wrapper.cpp @@ -1175,6 +1175,11 @@ PFN_vkGetShaderBinaryDataEXT vkGetShaderBinaryDataEXT; PFN_vkCmdBindShadersEXT vkCmdBindShadersEXT; PFN_vkGetFramebufferTilePropertiesQCOM vkGetFramebufferTilePropertiesQCOM; PFN_vkGetDynamicRenderingTilePropertiesQCOM vkGetDynamicRenderingTilePropertiesQCOM; +PFN_vkSetLatencySleepModeNV vkSetLatencySleepModeNV; +PFN_vkLatencySleepNV vkLatencySleepNV; +PFN_vkSetLatencyMarkerNV vkSetLatencyMarkerNV; +PFN_vkGetLatencyTimingsNV vkGetLatencyTimingsNV; +PFN_vkQueueNotifyOutOfBandNV vkQueueNotifyOutOfBandNV; PFN_vkCmdSetAttachmentFeedbackLoopEnableEXT vkCmdSetAttachmentFeedbackLoopEnableEXT; PFN_vkCreateAccelerationStructureKHR vkCreateAccelerationStructureKHR; PFN_vkDestroyAccelerationStructureKHR vkDestroyAccelerationStructureKHR; diff --git a/icd/generated/function_declarations.h b/icd/generated/function_declarations.h index e5d9162..1e9e950 100644 --- a/icd/generated/function_declarations.h +++ b/icd/generated/function_declarations.h @@ -354,6 +354,7 @@ static const std::unordered_map device_extension_map = { {"VK_NV_optical_flow", 1}, {"VK_EXT_legacy_dithering", 1}, {"VK_EXT_pipeline_protected_access", 1}, + {"VK_ANDROID_external_format_resolve", 1}, {"VK_KHR_maintenance5", 1}, {"VK_KHR_ray_tracing_position_fetch", 1}, {"VK_EXT_shader_object", 1}, @@ -365,6 +366,7 @@ static const std::unordered_map device_extension_map = { {"VK_ARM_shader_core_builtins", 2}, {"VK_EXT_pipeline_library_group_handles", 1}, {"VK_EXT_dynamic_rendering_unused_attachments", 1}, + {"VK_NV_low_latency2", 1}, {"VK_KHR_cooperative_matrix", 2}, {"VK_QCOM_multiview_per_view_render_areas", 1}, {"VK_QCOM_image_processing2", 1}, @@ -4132,6 +4134,9 @@ static VKAPI_ATTR void VKAPI_CALL CmdOpticalFlowExecuteNV( +#ifdef VK_USE_PLATFORM_ANDROID_KHR +#endif /* VK_USE_PLATFORM_ANDROID_KHR */ + static VKAPI_ATTR VkResult VKAPI_CALL CreateShadersEXT( VkDevice device, @@ -4177,6 +4182,32 @@ static VKAPI_ATTR VkResult VKAPI_CALL GetDynamicRenderingTilePropertiesQCOM( +static VKAPI_ATTR VkResult VKAPI_CALL SetLatencySleepModeNV( + VkDevice device, + VkSwapchainKHR swapchain, + VkLatencySleepModeInfoNV* pSleepModeInfo); + +static VKAPI_ATTR VkResult VKAPI_CALL LatencySleepNV( + VkDevice device, + VkSwapchainKHR swapchain, + VkLatencySleepInfoNV* pSleepInfo); + +static VKAPI_ATTR void VKAPI_CALL SetLatencyMarkerNV( + VkDevice device, + VkSwapchainKHR swapchain, + VkSetLatencyMarkerInfoNV* pLatencyMarkerInfo); + +static VKAPI_ATTR void VKAPI_CALL GetLatencyTimingsNV( + VkDevice device, + VkSwapchainKHR swapchain, + uint32_t* pTimingCount, + VkGetLatencyMarkerInfoNV* pLatencyMarkerInfo); + +static VKAPI_ATTR void VKAPI_CALL QueueNotifyOutOfBandNV( + VkQueue queue, + VkOutOfBandQueueTypeInfoNV pQueueTypeInfo); + + @@ -5104,6 +5135,11 @@ static const std::unordered_map name_to_funcptr_map = { {"vkCmdBindShadersEXT", (void*)CmdBindShadersEXT}, {"vkGetFramebufferTilePropertiesQCOM", (void*)GetFramebufferTilePropertiesQCOM}, {"vkGetDynamicRenderingTilePropertiesQCOM", (void*)GetDynamicRenderingTilePropertiesQCOM}, + {"vkSetLatencySleepModeNV", (void*)SetLatencySleepModeNV}, + {"vkLatencySleepNV", (void*)LatencySleepNV}, + {"vkSetLatencyMarkerNV", (void*)SetLatencyMarkerNV}, + {"vkGetLatencyTimingsNV", (void*)GetLatencyTimingsNV}, + {"vkQueueNotifyOutOfBandNV", (void*)QueueNotifyOutOfBandNV}, {"vkCmdSetAttachmentFeedbackLoopEnableEXT", (void*)CmdSetAttachmentFeedbackLoopEnableEXT}, #ifdef VK_USE_PLATFORM_SCREEN_QNX {"vkGetScreenBufferPropertiesQNX", (void*)GetScreenBufferPropertiesQNX}, diff --git a/icd/generated/function_definitions.h b/icd/generated/function_definitions.h index 7562069..3e0c45a 100644 --- a/icd/generated/function_definitions.h +++ b/icd/generated/function_definitions.h @@ -6702,6 +6702,9 @@ static VKAPI_ATTR void VKAPI_CALL CmdOpticalFlowExecuteNV( +#ifdef VK_USE_PLATFORM_ANDROID_KHR +#endif /* VK_USE_PLATFORM_ANDROID_KHR */ + static VKAPI_ATTR VkResult VKAPI_CALL CreateShadersEXT( VkDevice device, @@ -6772,6 +6775,49 @@ static VKAPI_ATTR VkResult VKAPI_CALL GetDynamicRenderingTilePropertiesQCOM( +static VKAPI_ATTR VkResult VKAPI_CALL SetLatencySleepModeNV( + VkDevice device, + VkSwapchainKHR swapchain, + VkLatencySleepModeInfoNV* pSleepModeInfo) +{ +//Not a CREATE or DESTROY function + return VK_SUCCESS; +} + +static VKAPI_ATTR VkResult VKAPI_CALL LatencySleepNV( + VkDevice device, + VkSwapchainKHR swapchain, + VkLatencySleepInfoNV* pSleepInfo) +{ +//Not a CREATE or DESTROY function + return VK_SUCCESS; +} + +static VKAPI_ATTR void VKAPI_CALL SetLatencyMarkerNV( + VkDevice device, + VkSwapchainKHR swapchain, + VkSetLatencyMarkerInfoNV* pLatencyMarkerInfo) +{ +//Not a CREATE or DESTROY function +} + +static VKAPI_ATTR void VKAPI_CALL GetLatencyTimingsNV( + VkDevice device, + VkSwapchainKHR swapchain, + uint32_t* pTimingCount, + VkGetLatencyMarkerInfoNV* pLatencyMarkerInfo) +{ +//Not a CREATE or DESTROY function +} + +static VKAPI_ATTR void VKAPI_CALL QueueNotifyOutOfBandNV( + VkQueue queue, + VkOutOfBandQueueTypeInfoNV pQueueTypeInfo) +{ +//Not a CREATE or DESTROY function +} + + diff --git a/icd/generated/vk_typemap_helper.h b/icd/generated/vk_typemap_helper.h index 0f8db1f..cacbd53 100644 --- a/icd/generated/vk_typemap_helper.h +++ b/icd/generated/vk_typemap_helper.h @@ -7217,6 +7217,39 @@ template <> struct LvlSTypeMap struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_FORMAT_RESOLVE_FEATURES_ANDROID; +}; + +template <> struct LvlSTypeMap { + typedef VkPhysicalDeviceExternalFormatResolveFeaturesANDROID Type; +}; + +#endif // VK_USE_PLATFORM_ANDROID_KHR +#ifdef VK_USE_PLATFORM_ANDROID_KHR +// Map type VkPhysicalDeviceExternalFormatResolvePropertiesANDROID to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_FORMAT_RESOLVE_PROPERTIES_ANDROID +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_FORMAT_RESOLVE_PROPERTIES_ANDROID; +}; + +template <> struct LvlSTypeMap { + typedef VkPhysicalDeviceExternalFormatResolvePropertiesANDROID Type; +}; + +#endif // VK_USE_PLATFORM_ANDROID_KHR +#ifdef VK_USE_PLATFORM_ANDROID_KHR +// Map type VkAndroidHardwareBufferFormatResolvePropertiesANDROID to id VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_FORMAT_RESOLVE_PROPERTIES_ANDROID +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_FORMAT_RESOLVE_PROPERTIES_ANDROID; +}; + +template <> struct LvlSTypeMap { + typedef VkAndroidHardwareBufferFormatResolvePropertiesANDROID Type; +}; + +#endif // VK_USE_PLATFORM_ANDROID_KHR // Map type VkPhysicalDeviceShaderObjectFeaturesEXT to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_OBJECT_FEATURES_EXT template <> struct LvlTypeMap { static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_OBJECT_FEATURES_EXT; @@ -7343,6 +7376,87 @@ template <> struct LvlSTypeMap struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_LATENCY_SLEEP_MODE_INFO_NV; +}; + +template <> struct LvlSTypeMap { + typedef VkLatencySleepModeInfoNV Type; +}; + +// Map type VkLatencySleepInfoNV to id VK_STRUCTURE_TYPE_LATENCY_SLEEP_INFO_NV +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_LATENCY_SLEEP_INFO_NV; +}; + +template <> struct LvlSTypeMap { + typedef VkLatencySleepInfoNV Type; +}; + +// Map type VkSetLatencyMarkerInfoNV to id VK_STRUCTURE_TYPE_SET_LATENCY_MARKER_INFO_NV +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_SET_LATENCY_MARKER_INFO_NV; +}; + +template <> struct LvlSTypeMap { + typedef VkSetLatencyMarkerInfoNV Type; +}; + +// Map type VkLatencyTimingsFrameReportNV to id VK_STRUCTURE_TYPE_LATENCY_TIMINGS_FRAME_REPORT_NV +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_LATENCY_TIMINGS_FRAME_REPORT_NV; +}; + +template <> struct LvlSTypeMap { + typedef VkLatencyTimingsFrameReportNV Type; +}; + +// Map type VkGetLatencyMarkerInfoNV to id VK_STRUCTURE_TYPE_GET_LATENCY_MARKER_INFO_NV +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_GET_LATENCY_MARKER_INFO_NV; +}; + +template <> struct LvlSTypeMap { + typedef VkGetLatencyMarkerInfoNV Type; +}; + +// Map type VkLatencySubmissionPresentIdNV to id VK_STRUCTURE_TYPE_LATENCY_SUBMISSION_PRESENT_ID_NV +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_LATENCY_SUBMISSION_PRESENT_ID_NV; +}; + +template <> struct LvlSTypeMap { + typedef VkLatencySubmissionPresentIdNV Type; +}; + +// Map type VkSwapchainLatencyCreateInfoNV to id VK_STRUCTURE_TYPE_SWAPCHAIN_LATENCY_CREATE_INFO_NV +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_SWAPCHAIN_LATENCY_CREATE_INFO_NV; +}; + +template <> struct LvlSTypeMap { + typedef VkSwapchainLatencyCreateInfoNV Type; +}; + +// Map type VkOutOfBandQueueTypeInfoNV to id VK_STRUCTURE_TYPE_OUT_OF_BAND_QUEUE_TYPE_INFO_NV +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_OUT_OF_BAND_QUEUE_TYPE_INFO_NV; +}; + +template <> struct LvlSTypeMap { + typedef VkOutOfBandQueueTypeInfoNV Type; +}; + +// Map type VkLatencySurfaceCapabilitiesNV to id VK_STRUCTURE_TYPE_LATENCY_SURFACE_CAPABILITIES_NV +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_LATENCY_SURFACE_CAPABILITIES_NV; +}; + +template <> struct LvlSTypeMap { + typedef VkLatencySurfaceCapabilitiesNV Type; +}; + // Map type VkPhysicalDeviceMultiviewPerViewRenderAreasFeaturesQCOM to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_RENDER_AREAS_FEATURES_QCOM template <> struct LvlTypeMap { static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_RENDER_AREAS_FEATURES_QCOM; diff --git a/scripts/generate_vulkan_wrapper.py b/scripts/generate_vulkan_wrapper.py index 43e4b90..2e4fe99 100755 --- a/scripts/generate_vulkan_wrapper.py +++ b/scripts/generate_vulkan_wrapper.py @@ -1568,6 +1568,14 @@ VK_EXT_pipeline_library_group_handles = Extension(name='VK_EXT_pipeline_library_ VK_EXT_dynamic_rendering_unused_attachments = Extension(name='VK_EXT_dynamic_rendering_unused_attachments', version=1, guard=None, commands=[ ]) +VK_NV_low_latency2 = Extension(name='VK_NV_low_latency2', version=1, guard=None, commands=[ + Command(name='vkSetLatencySleepModeNV', dispatch='VkDevice'), + Command(name='vkLatencySleepNV', dispatch='VkDevice'), + Command(name='vkSetLatencyMarkerNV', dispatch='VkDevice'), + Command(name='vkGetLatencyTimingsNV', dispatch='VkDevice'), + Command(name='vkQueueNotifyOutOfBandNV', dispatch='VkQueue'), +]) + VK_QCOM_multiview_per_view_render_areas = Extension(name='VK_QCOM_multiview_per_view_render_areas', version=1, guard=None, commands=[ ]) @@ -1639,6 +1647,9 @@ VK_ANDROID_external_memory_android_hardware_buffer = Extension(name='VK_ANDROID_ Command(name='vkGetMemoryAndroidHardwareBufferANDROID', dispatch='VkDevice'), ]) +VK_ANDROID_external_format_resolve = Extension(name='VK_ANDROID_external_format_resolve', version=1, guard='VK_USE_PLATFORM_ANDROID_KHR', commands=[ +]) + VK_FUCHSIA_imagepipe_surface = Extension(name='VK_FUCHSIA_imagepipe_surface', version=1, guard='VK_USE_PLATFORM_FUCHSIA', commands=[ Command(name='vkCreateImagePipeSurfaceFUCHSIA', dispatch='VkInstance'), ]) @@ -2092,6 +2103,7 @@ extensions = [ VK_ARM_shader_core_builtins, VK_EXT_pipeline_library_group_handles, VK_EXT_dynamic_rendering_unused_attachments, + VK_NV_low_latency2, VK_QCOM_multiview_per_view_render_areas, VK_QCOM_image_processing2, VK_QCOM_filter_cubic_weights, @@ -2106,6 +2118,7 @@ extensions = [ VK_EXT_mesh_shader, VK_KHR_android_surface, VK_ANDROID_external_memory_android_hardware_buffer, + VK_ANDROID_external_format_resolve, VK_FUCHSIA_imagepipe_surface, VK_FUCHSIA_external_memory, VK_FUCHSIA_external_semaphore, diff --git a/scripts/known_good.json b/scripts/known_good.json index cc6e084..6239237 100644 --- a/scripts/known_good.json +++ b/scripts/known_good.json @@ -7,7 +7,7 @@ "sub_dir": "Vulkan-Headers", "build_dir": "Vulkan-Headers/build", "install_dir": "Vulkan-Headers/build/install", - "commit": "v1.3.265" + "commit": "v1.3.266" }, { "name": "MoltenVK", @@ -35,7 +35,7 @@ "cmake_options": [ "-DLOADER_USE_UNSAFE_FILE_SEARCH=ON" ], - "commit": "v1.3.265", + "commit": "v1.3.266", "deps": [ { "var_name": "VULKAN_HEADERS_INSTALL_DIR", diff --git a/vulkaninfo/generated/vulkaninfo.hpp b/vulkaninfo/generated/vulkaninfo.hpp index 81c4d74..765e903 100644 --- a/vulkaninfo/generated/vulkaninfo.hpp +++ b/vulkaninfo/generated/vulkaninfo.hpp @@ -98,6 +98,7 @@ std::string VkDriverIdString(VkDriverId value) { case (VK_DRIVER_ID_MESA_DOZEN): return "DRIVER_ID_MESA_DOZEN"; case (VK_DRIVER_ID_MESA_NVK): return "DRIVER_ID_MESA_NVK"; case (VK_DRIVER_ID_IMAGINATION_OPEN_SOURCE_MESA): return "DRIVER_ID_IMAGINATION_OPEN_SOURCE_MESA"; + case (VK_DRIVER_ID_MESA_AGXV): return "DRIVER_ID_MESA_AGXV"; default: return std::string("UNKNOWN_VkDriverId_value") + std::to_string(value); } } @@ -1066,6 +1067,7 @@ std::vector VkResolveModeFlagBitsGetStrings(VkResolveModeFlagBits if (VK_RESOLVE_MODE_AVERAGE_BIT & value) strings.push_back("RESOLVE_MODE_AVERAGE_BIT"); if (VK_RESOLVE_MODE_MIN_BIT & value) strings.push_back("RESOLVE_MODE_MIN_BIT"); if (VK_RESOLVE_MODE_MAX_BIT & value) strings.push_back("RESOLVE_MODE_MAX_BIT"); + if (VK_RESOLVE_MODE_EXTERNAL_FORMAT_DOWNSAMPLE_ANDROID & value) strings.push_back("RESOLVE_MODE_EXTERNAL_FORMAT_DOWNSAMPLE_ANDROID"); return strings; } void DumpVkResolveModeFlags(Printer &p, std::string name, VkResolveModeFlags value) { -- 2.7.4