From eceb318c06a291e678d1eef96c6bfd6f2710df21 Mon Sep 17 00:00:00 2001 From: Shannon McPherson Date: Mon, 17 Aug 2020 21:43:44 -0600 Subject: [PATCH] build: Update known-good files for 1.2.151 header Changes: - Updated `known_good.json` - Generated new source files Change-Id: I499ac301dc89aadb9881700a0b6ce83cb4b82ec4 --- build-android/vulkan-headers_revision_android | 2 +- icd/generated/mock_icd.cpp | 1 + icd/generated/mock_icd.h | 8 +++++--- icd/generated/vk_typemap_helper.h | 9 +++++++++ scripts/known_good.json | 4 ++-- vulkaninfo/generated/vulkaninfo.hpp | 14 ++++++++++++++ 6 files changed, 32 insertions(+), 6 deletions(-) diff --git a/build-android/vulkan-headers_revision_android b/build-android/vulkan-headers_revision_android index 4847ec8..3c29129 100644 --- a/build-android/vulkan-headers_revision_android +++ b/build-android/vulkan-headers_revision_android @@ -1 +1 @@ -v1.2.148 +v1.2.151 diff --git a/icd/generated/mock_icd.cpp b/icd/generated/mock_icd.cpp index 8e8886e..6ef573b 100644 --- a/icd/generated/mock_icd.cpp +++ b/icd/generated/mock_icd.cpp @@ -4643,6 +4643,7 @@ static VKAPI_ATTR void VKAPI_CALL GetPrivateDataEXT( + #ifdef VK_USE_PLATFORM_DIRECTFB_EXT static VKAPI_ATTR VkResult VKAPI_CALL CreateDirectFBSurfaceEXT( diff --git a/icd/generated/mock_icd.h b/icd/generated/mock_icd.h index 46315b6..04c041d 100644 --- a/icd/generated/mock_icd.h +++ b/icd/generated/mock_icd.h @@ -73,13 +73,13 @@ static const std::unordered_map instance_extension_map = {"VK_KHR_external_fence_capabilities", 1}, {"VK_KHR_get_surface_capabilities2", 1}, {"VK_KHR_get_display_properties2", 1}, - {"VK_MVK_ios_surface", 2}, - {"VK_MVK_macos_surface", 2}, + {"VK_MVK_ios_surface", 3}, + {"VK_MVK_macos_surface", 3}, {"VK_EXT_debug_utils", 2}, {"VK_FUCHSIA_imagepipe_surface", 1}, {"VK_EXT_metal_surface", 1}, {"VK_KHR_surface_protected_capabilities", 1}, - {"VK_EXT_validation_features", 3}, + {"VK_EXT_validation_features", 4}, {"VK_EXT_headless_surface", 1}, {"VK_EXT_directfb_surface", 1}, }; @@ -262,6 +262,7 @@ static const std::unordered_map device_extension_map = { {"VK_QCOM_render_pass_store_ops", 2}, {"VK_EXT_fragment_density_map2", 1}, {"VK_EXT_image_robustness", 1}, + {"VK_EXT_4444_formats", 1}, }; @@ -2829,6 +2830,7 @@ static VKAPI_ATTR void VKAPI_CALL GetPrivateDataEXT( + #ifdef VK_USE_PLATFORM_DIRECTFB_EXT static VKAPI_ATTR VkResult VKAPI_CALL CreateDirectFBSurfaceEXT( diff --git a/icd/generated/vk_typemap_helper.h b/icd/generated/vk_typemap_helper.h index fe744cc..5b8ba07 100644 --- a/icd/generated/vk_typemap_helper.h +++ b/icd/generated/vk_typemap_helper.h @@ -3895,6 +3895,15 @@ template <> struct LvlSTypeMap struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_4444_FORMATS_FEATURES_EXT; +}; + +template <> struct LvlSTypeMap { + typedef VkPhysicalDevice4444FormatsFeaturesEXT Type; +}; + #ifdef VK_USE_PLATFORM_DIRECTFB_EXT // Map type VkDirectFBSurfaceCreateInfoEXT to id VK_STRUCTURE_TYPE_DIRECTFB_SURFACE_CREATE_INFO_EXT template <> struct LvlTypeMap { diff --git a/scripts/known_good.json b/scripts/known_good.json index d9fe3fa..c3dc4b4 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.148" + "commit" : "v1.2.151" }, { "name" : "MoltenVK", @@ -30,7 +30,7 @@ "sub_dir" : "Vulkan-Loader", "build_dir" : "Vulkan-Loader/build", "install_dir" : "Vulkan-Loader/build/install", - "commit" : "v1.2.148", + "commit" : "v1.2.151", "deps" : [ { "var_name" : "VULKAN_HEADERS_INSTALL_DIR", diff --git a/vulkaninfo/generated/vulkaninfo.hpp b/vulkaninfo/generated/vulkaninfo.hpp index 6055458..70136c1 100644 --- a/vulkaninfo/generated/vulkaninfo.hpp +++ b/vulkaninfo/generated/vulkaninfo.hpp @@ -346,6 +346,8 @@ static const char *VkFormatString(VkFormat value) { case (1000066011): return "FORMAT_ASTC_10x10_SFLOAT_BLOCK_EXT"; case (1000066012): return "FORMAT_ASTC_12x10_SFLOAT_BLOCK_EXT"; case (1000066013): return "FORMAT_ASTC_12x12_SFLOAT_BLOCK_EXT"; + case (1000340000): return "FORMAT_A4R4G4B4_UNORM_PACK16_EXT"; + case (1000340001): return "FORMAT_A4B4G4R4_UNORM_PACK16_EXT"; default: return "UNKNOWN_VkFormat"; } } @@ -960,6 +962,11 @@ void DumpVkPhysicalDevice16BitStorageFeatures(Printer &p, std::string name, VkPh p.PrintKeyBool("storagePushConstant16", static_cast(obj.storagePushConstant16), 34); p.PrintKeyBool("storageInputOutput16", static_cast(obj.storageInputOutput16), 34); } +void DumpVkPhysicalDevice4444FormatsFeaturesEXT(Printer &p, std::string name, VkPhysicalDevice4444FormatsFeaturesEXT &obj) { + ObjectWrapper object{p, name}; + p.PrintKeyBool("formatA4R4G4B4", static_cast(obj.formatA4R4G4B4), 14); + p.PrintKeyBool("formatA4B4G4R4", static_cast(obj.formatA4B4G4R4), 14); +} void DumpVkPhysicalDevice8BitStorageFeatures(Printer &p, std::string name, VkPhysicalDevice8BitStorageFeatures &obj) { ObjectWrapper object{p, name}; p.PrintKeyBool("storageBuffer8BitAccess", static_cast(obj.storageBuffer8BitAccess), 33); @@ -1924,6 +1931,7 @@ pNextChainInfos get_chain_infos() { }; infos.phys_device_features2 = { {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_16BIT_STORAGE_FEATURES, sizeof(VkPhysicalDevice16BitStorageFeatures)}, + {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_4444_FORMATS_FEATURES_EXT, sizeof(VkPhysicalDevice4444FormatsFeaturesEXT)}, {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_8BIT_STORAGE_FEATURES, sizeof(VkPhysicalDevice8BitStorageFeatures)}, {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ASTC_DECODE_FEATURES_EXT, sizeof(VkPhysicalDeviceASTCDecodeFeaturesEXT)}, {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BLEND_OPERATION_ADVANCED_FEATURES_EXT, sizeof(VkPhysicalDeviceBlendOperationAdvancedFeaturesEXT)}, @@ -2230,6 +2238,12 @@ void chain_iterator_phys_device_features2(Printer &p, AppGpu &gpu, void * place, DumpVkPhysicalDevice16BitStorageFeatures(p, version.minor >= 1 ?"VkPhysicalDevice16BitStorageFeatures":"VkPhysicalDevice16BitStorageFeaturesKHR", *props); p.AddNewline(); } + if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_4444_FORMATS_FEATURES_EXT && + (gpu.CheckPhysicalDeviceExtensionIncluded(VK_EXT_4444_FORMATS_EXTENSION_NAME))) { + VkPhysicalDevice4444FormatsFeaturesEXT* props = (VkPhysicalDevice4444FormatsFeaturesEXT*)structure; + DumpVkPhysicalDevice4444FormatsFeaturesEXT(p, "VkPhysicalDevice4444FormatsFeaturesEXT", *props); + p.AddNewline(); + } if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_8BIT_STORAGE_FEATURES && (gpu.CheckPhysicalDeviceExtensionIncluded(VK_KHR_8BIT_STORAGE_EXTENSION_NAME) || version.minor >= 2)) { -- 2.7.4