From ed290a0f0ac7bd364aed9937a842af39031c49fa Mon Sep 17 00:00:00 2001 From: Mike Schuchardt Date: Mon, 29 Nov 2021 10:18:41 -0800 Subject: build: Update to header 1.2.200 - Update known-good - Generate source --- 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 a62cb756..92f1a025 100644 --- a/build-android/vulkan-headers_revision_android +++ b/build-android/vulkan-headers_revision_android @@ -1 +1 @@ -v1.2.199 +v1.2.200 diff --git a/icd/generated/mock_icd.cpp b/icd/generated/mock_icd.cpp index f569f841..c7988320 100644 --- a/icd/generated/mock_icd.cpp +++ b/icd/generated/mock_icd.cpp @@ -5053,6 +5053,7 @@ static VKAPI_ATTR void VKAPI_CALL CmdSetFragmentShadingRateEnumNV( + #ifdef VK_USE_PLATFORM_WIN32_KHR static VKAPI_ATTR VkResult VKAPI_CALL AcquireWinrtDisplayNV( @@ -5110,6 +5111,7 @@ static VKAPI_ATTR void VKAPI_CALL CmdSetVertexInputEXT( + #ifdef VK_USE_PLATFORM_FUCHSIA static VKAPI_ATTR VkResult VKAPI_CALL GetMemoryZirconHandleFUCHSIA( diff --git a/icd/generated/mock_icd.h b/icd/generated/mock_icd.h index c87cafd8..5bed2a9a 100644 --- a/icd/generated/mock_icd.h +++ b/icd/generated/mock_icd.h @@ -295,11 +295,13 @@ static const std::unordered_map device_extension_map = { {"VK_KHR_workgroup_memory_explicit_layout", 1}, {"VK_KHR_copy_commands2", 1}, {"VK_EXT_4444_formats", 1}, + {"VK_ARM_rasterization_order_attachment_access", 1}, {"VK_EXT_rgba10x6_formats", 1}, {"VK_NV_acquire_winrt_display", 1}, {"VK_VALVE_mutable_descriptor_type", 1}, {"VK_EXT_vertex_input_dynamic_state", 2}, {"VK_EXT_physical_device_drm", 1}, + {"VK_EXT_depth_clip_control", 1}, {"VK_EXT_primitive_topology_list_restart", 1}, {"VK_KHR_format_feature_flags2", 1}, {"VK_FUCHSIA_external_memory", 1}, @@ -316,7 +318,7 @@ static const std::unordered_map device_extension_map = { {"VK_EXT_load_store_op_none", 1}, {"VK_EXT_border_color_swizzle", 1}, {"VK_EXT_pageable_device_local_memory", 1}, - {"VK_KHR_maintenance4", 1}, + {"VK_KHR_maintenance4", 2}, }; @@ -3131,6 +3133,7 @@ static VKAPI_ATTR void VKAPI_CALL CmdSetFragmentShadingRateEnumNV( + #ifdef VK_USE_PLATFORM_WIN32_KHR static VKAPI_ATTR VkResult VKAPI_CALL AcquireWinrtDisplayNV( @@ -3168,6 +3171,7 @@ static VKAPI_ATTR void VKAPI_CALL CmdSetVertexInputEXT( + #ifdef VK_USE_PLATFORM_FUCHSIA static VKAPI_ATTR VkResult VKAPI_CALL GetMemoryZirconHandleFUCHSIA( diff --git a/icd/generated/vk_typemap_helper.h b/icd/generated/vk_typemap_helper.h index 705803b8..34140a92 100644 --- a/icd/generated/vk_typemap_helper.h +++ b/icd/generated/vk_typemap_helper.h @@ -5146,6 +5146,15 @@ template <> struct LvlSTypeMap struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RASTERIZATION_ORDER_ATTACHMENT_ACCESS_FEATURES_ARM; +}; + +template <> struct LvlSTypeMap { + typedef VkPhysicalDeviceRasterizationOrderAttachmentAccessFeaturesARM Type; +}; + // Map type VkPhysicalDeviceRGBA10X6FormatsFeaturesEXT to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RGBA10X6_FORMATS_FEATURES_EXT template <> struct LvlTypeMap { static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RGBA10X6_FORMATS_FEATURES_EXT; @@ -5220,6 +5229,24 @@ template <> struct LvlSTypeMap struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLIP_CONTROL_FEATURES_EXT; +}; + +template <> struct LvlSTypeMap { + typedef VkPhysicalDeviceDepthClipControlFeaturesEXT Type; +}; + +// Map type VkPipelineViewportDepthClipControlCreateInfoEXT to id VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_DEPTH_CLIP_CONTROL_CREATE_INFO_EXT +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_DEPTH_CLIP_CONTROL_CREATE_INFO_EXT; +}; + +template <> struct LvlSTypeMap { + typedef VkPipelineViewportDepthClipControlCreateInfoEXT Type; +}; + // Map type VkPhysicalDevicePrimitiveTopologyListRestartFeaturesEXT to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIMITIVE_TOPOLOGY_LIST_RESTART_FEATURES_EXT template <> struct LvlTypeMap { static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIMITIVE_TOPOLOGY_LIST_RESTART_FEATURES_EXT; diff --git a/scripts/generate_vulkan_wrapper.py b/scripts/generate_vulkan_wrapper.py index d41f3033..c656ab8b 100755 --- a/scripts/generate_vulkan_wrapper.py +++ b/scripts/generate_vulkan_wrapper.py @@ -608,7 +608,7 @@ VK_KHR_copy_commands2 = Extension(name='VK_KHR_copy_commands2', version=1, guard VK_KHR_format_feature_flags2 = Extension(name='VK_KHR_format_feature_flags2', version=1, guard=None, commands=[ ]) -VK_KHR_maintenance4 = Extension(name='VK_KHR_maintenance4', version=1, guard=None, commands=[ +VK_KHR_maintenance4 = Extension(name='VK_KHR_maintenance4', version=2, guard=None, commands=[ Command(name='vkGetDeviceBufferMemoryRequirementsKHR', dispatch='VkDevice'), Command(name='vkGetDeviceImageMemoryRequirementsKHR', dispatch='VkDevice'), Command(name='vkGetDeviceImageSparseMemoryRequirementsKHR', dispatch='VkDevice'), @@ -1152,6 +1152,9 @@ VK_EXT_image_robustness = Extension(name='VK_EXT_image_robustness', version=1, g VK_EXT_4444_formats = Extension(name='VK_EXT_4444_formats', version=1, guard=None, commands=[ ]) +VK_ARM_rasterization_order_attachment_access = Extension(name='VK_ARM_rasterization_order_attachment_access', version=1, guard=None, commands=[ +]) + VK_EXT_rgba10x6_formats = Extension(name='VK_EXT_rgba10x6_formats', version=1, guard=None, commands=[ ]) @@ -1170,6 +1173,9 @@ VK_EXT_vertex_input_dynamic_state = Extension(name='VK_EXT_vertex_input_dynamic_ VK_EXT_physical_device_drm = Extension(name='VK_EXT_physical_device_drm', version=1, guard=None, commands=[ ]) +VK_EXT_depth_clip_control = Extension(name='VK_EXT_depth_clip_control', version=1, guard=None, commands=[ +]) + VK_EXT_primitive_topology_list_restart = Extension(name='VK_EXT_primitive_topology_list_restart', version=1, guard=None, commands=[ ]) @@ -1625,11 +1631,13 @@ extensions = [ VK_QCOM_rotated_copy_commands, VK_EXT_image_robustness, VK_EXT_4444_formats, + VK_ARM_rasterization_order_attachment_access, VK_EXT_rgba10x6_formats, VK_NV_acquire_winrt_display, VK_VALVE_mutable_descriptor_type, VK_EXT_vertex_input_dynamic_state, VK_EXT_physical_device_drm, + VK_EXT_depth_clip_control, VK_EXT_primitive_topology_list_restart, VK_HUAWEI_subpass_shading, VK_HUAWEI_invocation_mask, diff --git a/scripts/known_good.json b/scripts/known_good.json index e28ab690..c8441278 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.199" + "commit" : "v1.2.200" }, { "name" : "MoltenVK", @@ -30,7 +30,7 @@ "sub_dir" : "Vulkan-Loader", "build_dir" : "Vulkan-Loader/build", "install_dir" : "Vulkan-Loader/build/install", - "commit" : "v1.2.199", + "commit" : "v1.2.200", "deps" : [ { "var_name" : "VULKAN_HEADERS_INSTALL_DIR", diff --git a/vulkaninfo/generated/vulkaninfo.hpp b/vulkaninfo/generated/vulkaninfo.hpp index 02f466df..a0b9dc09 100644 --- a/vulkaninfo/generated/vulkaninfo.hpp +++ b/vulkaninfo/generated/vulkaninfo.hpp @@ -1182,6 +1182,10 @@ void DumpVkPhysicalDeviceCustomBorderColorPropertiesEXT(Printer &p, std::string ObjectWrapper object{p, name}; p.PrintKeyValue("maxCustomBorderColorSamplers", obj.maxCustomBorderColorSamplers, 28); } +void DumpVkPhysicalDeviceDepthClipControlFeaturesEXT(Printer &p, std::string name, VkPhysicalDeviceDepthClipControlFeaturesEXT &obj) { + ObjectWrapper object{p, name}; + p.PrintKeyBool("depthClipControl", static_cast(obj.depthClipControl), 16); +} void DumpVkPhysicalDeviceDepthClipEnableFeaturesEXT(Printer &p, std::string name, VkPhysicalDeviceDepthClipEnableFeaturesEXT &obj) { ObjectWrapper object{p, name}; p.PrintKeyBool("depthClipEnable", static_cast(obj.depthClipEnable), 15); @@ -2317,6 +2321,7 @@ pNextChainInfos get_chain_infos() { {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COLOR_WRITE_ENABLE_FEATURES_EXT, sizeof(VkPhysicalDeviceColorWriteEnableFeaturesEXT)}, {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CONDITIONAL_RENDERING_FEATURES_EXT, sizeof(VkPhysicalDeviceConditionalRenderingFeaturesEXT)}, {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUSTOM_BORDER_COLOR_FEATURES_EXT, sizeof(VkPhysicalDeviceCustomBorderColorFeaturesEXT)}, + {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLIP_CONTROL_FEATURES_EXT, sizeof(VkPhysicalDeviceDepthClipControlFeaturesEXT)}, {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLIP_ENABLE_FEATURES_EXT, sizeof(VkPhysicalDeviceDepthClipEnableFeaturesEXT)}, {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES, sizeof(VkPhysicalDeviceDescriptorIndexingFeatures)}, {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_MEMORY_REPORT_FEATURES_EXT, sizeof(VkPhysicalDeviceDeviceMemoryReportFeaturesEXT)}, @@ -2760,6 +2765,12 @@ void chain_iterator_phys_device_features2(Printer &p, AppGpu &gpu, void * place, DumpVkPhysicalDeviceCustomBorderColorFeaturesEXT(p, "VkPhysicalDeviceCustomBorderColorFeaturesEXT", *props); p.AddNewline(); } + if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLIP_CONTROL_FEATURES_EXT && + (gpu.CheckPhysicalDeviceExtensionIncluded(VK_EXT_DEPTH_CLIP_CONTROL_EXTENSION_NAME))) { + VkPhysicalDeviceDepthClipControlFeaturesEXT* props = (VkPhysicalDeviceDepthClipControlFeaturesEXT*)structure; + DumpVkPhysicalDeviceDepthClipControlFeaturesEXT(p, "VkPhysicalDeviceDepthClipControlFeaturesEXT", *props); + p.AddNewline(); + } if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLIP_ENABLE_FEATURES_EXT && (gpu.CheckPhysicalDeviceExtensionIncluded(VK_EXT_DEPTH_CLIP_ENABLE_EXTENSION_NAME))) { VkPhysicalDeviceDepthClipEnableFeaturesEXT* props = (VkPhysicalDeviceDepthClipEnableFeaturesEXT*)structure; -- cgit v1.2.3