From 11c35e2a97629b97c2ef69e1b204d3926102a3ad Mon Sep 17 00:00:00 2001 From: Mike Schuchardt Date: Tue, 16 Nov 2021 11:02:56 -0800 Subject: [PATCH] build: Update to header 1.2.199 - Update known-good - Generate source --- build-android/vulkan-headers_revision_android | 2 +- icd/generated/mock_icd.cpp | 1 + icd/generated/mock_icd.h | 2 ++ icd/generated/vk_typemap_helper.h | 18 ++++++++++++++++++ scripts/generate_vulkan_wrapper.py | 4 ++++ scripts/known_good.json | 4 ++-- vulkaninfo/generated/vulkaninfo.hpp | 12 ++++++++++++ 7 files changed, 40 insertions(+), 3 deletions(-) diff --git a/build-android/vulkan-headers_revision_android b/build-android/vulkan-headers_revision_android index fd71591..a62cb75 100644 --- a/build-android/vulkan-headers_revision_android +++ b/build-android/vulkan-headers_revision_android @@ -1 +1 @@ -v1.2.198 +v1.2.199 diff --git a/icd/generated/mock_icd.cpp b/icd/generated/mock_icd.cpp index 73daecb..251ef0e 100644 --- a/icd/generated/mock_icd.cpp +++ b/icd/generated/mock_icd.cpp @@ -5297,6 +5297,7 @@ static VKAPI_ATTR void VKAPI_CALL CmdSetColor + static VKAPI_ATTR void VKAPI_CALL CmdDrawMultiEXT( VkCommandBuffer commandBuffer, uint32_t drawCount, diff --git a/icd/generated/mock_icd.h b/icd/generated/mock_icd.h index e87a3a1..c87cafd 100644 --- a/icd/generated/mock_icd.h +++ b/icd/generated/mock_icd.h @@ -311,6 +311,7 @@ static const std::unordered_map device_extension_map = { {"VK_EXT_extended_dynamic_state2", 1}, {"VK_EXT_color_write_enable", 1}, {"VK_EXT_global_priority_query", 1}, + {"VK_EXT_image_view_min_lod", 1}, {"VK_EXT_multi_draw", 1}, {"VK_EXT_load_store_op_none", 1}, {"VK_EXT_border_color_swizzle", 1}, @@ -3286,6 +3287,7 @@ static VKAPI_ATTR void VKAPI_CALL CmdSetColor + static VKAPI_ATTR void VKAPI_CALL CmdDrawMultiEXT( VkCommandBuffer commandBuffer, uint32_t drawCount, diff --git a/icd/generated/vk_typemap_helper.h b/icd/generated/vk_typemap_helper.h index c4de3e0..705803b 100644 --- a/icd/generated/vk_typemap_helper.h +++ b/icd/generated/vk_typemap_helper.h @@ -5504,6 +5504,24 @@ template <> struct LvlSTypeMap struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_VIEW_MIN_LOD_FEATURES_EXT; +}; + +template <> struct LvlSTypeMap { + typedef VkPhysicalDeviceImageViewMinLodFeaturesEXT Type; +}; + +// Map type VkImageViewMinLodCreateInfoEXT to id VK_STRUCTURE_TYPE_IMAGE_VIEW_MIN_LOD_CREATE_INFO_EXT +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_IMAGE_VIEW_MIN_LOD_CREATE_INFO_EXT; +}; + +template <> struct LvlSTypeMap { + typedef VkImageViewMinLodCreateInfoEXT Type; +}; + // Map type VkPhysicalDeviceMultiDrawFeaturesEXT to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTI_DRAW_FEATURES_EXT template <> struct LvlTypeMap { static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTI_DRAW_FEATURES_EXT; diff --git a/scripts/generate_vulkan_wrapper.py b/scripts/generate_vulkan_wrapper.py index 1bf5447..d41f303 100755 --- a/scripts/generate_vulkan_wrapper.py +++ b/scripts/generate_vulkan_wrapper.py @@ -1201,6 +1201,9 @@ VK_EXT_color_write_enable = Extension(name='VK_EXT_color_write_enable', version= VK_EXT_global_priority_query = Extension(name='VK_EXT_global_priority_query', version=1, guard=None, commands=[ ]) +VK_EXT_image_view_min_lod = Extension(name='VK_EXT_image_view_min_lod', version=1, guard=None, commands=[ +]) + VK_EXT_multi_draw = Extension(name='VK_EXT_multi_draw', version=1, guard=None, commands=[ Command(name='vkCmdDrawMultiEXT', dispatch='VkCommandBuffer'), Command(name='vkCmdDrawMultiIndexedEXT', dispatch='VkCommandBuffer'), @@ -1634,6 +1637,7 @@ extensions = [ VK_EXT_extended_dynamic_state2, VK_EXT_color_write_enable, VK_EXT_global_priority_query, + VK_EXT_image_view_min_lod, VK_EXT_multi_draw, VK_EXT_load_store_op_none, VK_EXT_border_color_swizzle, diff --git a/scripts/known_good.json b/scripts/known_good.json index 02b13e3..8fb7ee8 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.198" + "commit" : "v1.2.199" }, { "name" : "MoltenVK", @@ -30,7 +30,7 @@ "sub_dir" : "Vulkan-Loader", "build_dir" : "Vulkan-Loader/build", "install_dir" : "Vulkan-Loader/build/install", - "commit" : "v1.2.198", + "commit" : "v1.2.199", "deps" : [ { "var_name" : "VULKAN_HEADERS_INSTALL_DIR", diff --git a/vulkaninfo/generated/vulkaninfo.hpp b/vulkaninfo/generated/vulkaninfo.hpp index 6f66484..02f466d 100644 --- a/vulkaninfo/generated/vulkaninfo.hpp +++ b/vulkaninfo/generated/vulkaninfo.hpp @@ -99,6 +99,7 @@ static const char *VkDriverIdString(VkDriverId value) { case (18): return "DRIVER_ID_MESA_TURNIP"; case (19): return "DRIVER_ID_MESA_V3DV"; case (20): return "DRIVER_ID_MESA_PANVK"; + case (21): return "DRIVER_ID_SAMSUNG_PROPRIETARY"; default: return "UNKNOWN_VkDriverId"; } } @@ -1436,6 +1437,10 @@ void DumpVkPhysicalDeviceImageRobustnessFeaturesEXT(Printer &p, std::string name ObjectWrapper object{p, name}; p.PrintKeyBool("robustImageAccess", static_cast(obj.robustImageAccess), 17); } +void DumpVkPhysicalDeviceImageViewMinLodFeaturesEXT(Printer &p, std::string name, VkPhysicalDeviceImageViewMinLodFeaturesEXT &obj) { + ObjectWrapper object{p, name}; + p.PrintKeyBool("minLod", static_cast(obj.minLod), 6); +} void DumpVkPhysicalDeviceImagelessFramebufferFeatures(Printer &p, std::string name, VkPhysicalDeviceImagelessFramebufferFeatures &obj) { ObjectWrapper object{p, name}; p.PrintKeyBool("imagelessFramebuffer", static_cast(obj.imagelessFramebuffer), 20); @@ -2325,6 +2330,7 @@ pNextChainInfos get_chain_infos() { {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_EXT, sizeof(VkPhysicalDeviceGlobalPriorityQueryFeaturesEXT)}, {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_QUERY_RESET_FEATURES, sizeof(VkPhysicalDeviceHostQueryResetFeatures)}, {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ROBUSTNESS_FEATURES_EXT, sizeof(VkPhysicalDeviceImageRobustnessFeaturesEXT)}, + {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_VIEW_MIN_LOD_FEATURES_EXT, sizeof(VkPhysicalDeviceImageViewMinLodFeaturesEXT)}, {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGELESS_FRAMEBUFFER_FEATURES, sizeof(VkPhysicalDeviceImagelessFramebufferFeatures)}, {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INDEX_TYPE_UINT8_FEATURES_EXT, sizeof(VkPhysicalDeviceIndexTypeUint8FeaturesEXT)}, {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_FEATURES_EXT, sizeof(VkPhysicalDeviceInlineUniformBlockFeaturesEXT)}, @@ -2834,6 +2840,12 @@ void chain_iterator_phys_device_features2(Printer &p, AppGpu &gpu, void * place, DumpVkPhysicalDeviceImageRobustnessFeaturesEXT(p, "VkPhysicalDeviceImageRobustnessFeaturesEXT", *props); p.AddNewline(); } + if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_VIEW_MIN_LOD_FEATURES_EXT && + (gpu.CheckPhysicalDeviceExtensionIncluded(VK_EXT_IMAGE_VIEW_MIN_LOD_EXTENSION_NAME))) { + VkPhysicalDeviceImageViewMinLodFeaturesEXT* props = (VkPhysicalDeviceImageViewMinLodFeaturesEXT*)structure; + DumpVkPhysicalDeviceImageViewMinLodFeaturesEXT(p, "VkPhysicalDeviceImageViewMinLodFeaturesEXT", *props); + p.AddNewline(); + } if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGELESS_FRAMEBUFFER_FEATURES && (gpu.CheckPhysicalDeviceExtensionIncluded(VK_KHR_IMAGELESS_FRAMEBUFFER_EXTENSION_NAME) || version.minor >= 2)) { -- 2.7.4