build: Update to header 1.3.257

- Update known-good
- Generate source
- Fix references to promoted VK_COMPONENT_TYPE_MAX_ENUM_NV enum value

build-android/known_good.json

@@ -16,7 +16,7 @@
             "name": "Vulkan-Headers",
             "url": "https://github.com/KhronosGroup/Vulkan-Headers.git",
             "sub_dir": "Vulkan-Headers",
-            "commit": "v1.3.256"
+            "commit": "v1.3.257"
         },
         {
             "name": "SPIRV-Tools",

layers/CMakeLists.txt

@@ -175,7 +175,8 @@ if (VVL_CODEGEN)
     find_package(Python3 REQUIRED QUIET)
     add_custom_target(vvl_codegen
         COMMAND Python3::Interpreter "${VVL_SOURCE_DIR}/scripts/generate_source.py"
-            ${VULKAN_HEADERS_REGISTRY_DIRECTORY} "${SPIRV_HEADERS_INSTALL_DIR}/include/spirv/unified1"
+            "${VULKAN_HEADERS_INSTALL_DIR}/${CMAKE_INSTALL_DATADIR}/vulkan/registry"
+            "${SPIRV_HEADERS_INSTALL_DIR}/include/spirv/unified1"
             --incremental --generated-version ${VulkanHeaders_VERSION} --api ${API_TYPE}
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${API_TYPE}/generated
     )

layers/VkLayer_khronos_validation.json.in

@@ -4,7 +4,7 @@
         "name": "VK_LAYER_KHRONOS_validation",
         "type": "GLOBAL",
         "library_path": "@JSON_LIBRARY_PATH@",
-        "api_version": "1.3.256",
+        "api_version": "1.3.257",
         "implementation_version": "1",
         "description": "Khronos Validation Layer",
         "introduction": "The main, comprehensive Khronos validation layer.\n\nVulkan is an Explicit API, enabling direct control over how GPUs actually work. By design, minimal error checking is done inside a Vulkan driver. Applications have full control and responsibility for correct operation. Any errors in how Vulkan is used can result in a crash. \n\nThe Khronos Valiation Layer can be enabled to assist development by enabling developers to verify their applications correctly use the Vulkan API.",

layers/core_checks/cc_shader.cpp

@@ -964,7 +964,7 @@ VkComponentTypeNV GetComponentType(const Instruction *insn) {
                 case 64:
                     return insn->Word(3) != 0 ? VK_COMPONENT_TYPE_SINT64_NV : VK_COMPONENT_TYPE_UINT64_NV;
                 default:
-                    return VK_COMPONENT_TYPE_MAX_ENUM_NV;
+                    return VK_COMPONENT_TYPE_MAX_ENUM_KHR;
             }
         case spv::OpTypeFloat:
             switch (insn->Word(2)) {
@@ -975,10 +975,10 @@ VkComponentTypeNV GetComponentType(const Instruction *insn) {
                 case 64:
                     return VK_COMPONENT_TYPE_FLOAT64_NV;
                 default:
-                    return VK_COMPONENT_TYPE_MAX_ENUM_NV;
+                    return VK_COMPONENT_TYPE_MAX_ENUM_KHR;
             }
         default:
-            return VK_COMPONENT_TYPE_MAX_ENUM_NV;
+            return VK_COMPONENT_TYPE_MAX_ENUM_KHR;
     }
 }
 
@@ -999,7 +999,7 @@ bool CoreChecks::ValidateCooperativeMatrix(const SHADER_MODULE_STATE &module_sta
         VkComponentTypeNV component_type;
         bool all_constant;
 
-        CoopMatType() : scope(0), rows(0), cols(0), component_type(VK_COMPONENT_TYPE_MAX_ENUM_NV), all_constant(false) {}
+        CoopMatType() : scope(0), rows(0), cols(0), component_type(VK_COMPONENT_TYPE_MAX_ENUM_KHR), all_constant(false) {}
 
         void Init(uint32_t id, const SHADER_MODULE_STATE &module_state, const safe_VkSpecializationInfo *spec,
                   const vvl::unordered_map<uint32_t, uint32_t> &id_to_spec_id) {

layers/vulkan/generated/enum_flag_bits.h

@@ -24,7 +24,7 @@
 
 #include <array>
 #include "vulkan/vulkan.h"
-const uint32_t GeneratedVulkanHeaderVersion = 256;
+const uint32_t GeneratedVulkanHeaderVersion = 257;
 const VkAccessFlags AllVkAccessFlagBits = VK_ACCESS_INDIRECT_COMMAND_READ_BIT|VK_ACCESS_INDEX_READ_BIT|VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT|VK_ACCESS_UNIFORM_READ_BIT|VK_ACCESS_INPUT_ATTACHMENT_READ_BIT|VK_ACCESS_SHADER_READ_BIT|VK_ACCESS_SHADER_WRITE_BIT|VK_ACCESS_COLOR_ATTACHMENT_READ_BIT|VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT|VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT|VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT|VK_ACCESS_TRANSFER_READ_BIT|VK_ACCESS_TRANSFER_WRITE_BIT|VK_ACCESS_HOST_READ_BIT|VK_ACCESS_HOST_WRITE_BIT|VK_ACCESS_MEMORY_READ_BIT|VK_ACCESS_MEMORY_WRITE_BIT|VK_ACCESS_NONE|VK_ACCESS_TRANSFORM_FEEDBACK_WRITE_BIT_EXT|VK_ACCESS_TRANSFORM_FEEDBACK_COUNTER_READ_BIT_EXT|VK_ACCESS_TRANSFORM_FEEDBACK_COUNTER_WRITE_BIT_EXT|VK_ACCESS_CONDITIONAL_RENDERING_READ_BIT_EXT|VK_ACCESS_COLOR_ATTACHMENT_READ_NONCOHERENT_BIT_EXT|VK_ACCESS_ACCELERATION_STRUCTURE_READ_BIT_KHR|VK_ACCESS_ACCELERATION_STRUCTURE_WRITE_BIT_KHR|VK_ACCESS_FRAGMENT_DENSITY_MAP_READ_BIT_EXT|VK_ACCESS_FRAGMENT_SHADING_RATE_ATTACHMENT_READ_BIT_KHR|VK_ACCESS_COMMAND_PREPROCESS_READ_BIT_NV|VK_ACCESS_COMMAND_PREPROCESS_WRITE_BIT_NV;
 const VkImageAspectFlags AllVkImageAspectFlagBits = VK_IMAGE_ASPECT_COLOR_BIT|VK_IMAGE_ASPECT_DEPTH_BIT|VK_IMAGE_ASPECT_STENCIL_BIT|VK_IMAGE_ASPECT_METADATA_BIT|VK_IMAGE_ASPECT_PLANE_0_BIT|VK_IMAGE_ASPECT_PLANE_1_BIT|VK_IMAGE_ASPECT_PLANE_2_BIT|VK_IMAGE_ASPECT_NONE|VK_IMAGE_ASPECT_MEMORY_PLANE_0_BIT_EXT|VK_IMAGE_ASPECT_MEMORY_PLANE_1_BIT_EXT|VK_IMAGE_ASPECT_MEMORY_PLANE_2_BIT_EXT|VK_IMAGE_ASPECT_MEMORY_PLANE_3_BIT_EXT;
 const VkInstanceCreateFlags AllVkInstanceCreateFlagBits = VK_INSTANCE_CREATE_ENUMERATE_PORTABILITY_BIT_KHR;

layers/vulkan/generated/spirv_validation_helper.cpp

@@ -399,6 +399,7 @@ static const std::unordered_multimap<std::string, RequiredSpirvInfo> spirvExtens
     {"SPV_EXT_shader_tile_image", {0, nullptr, &DeviceExtensions::vk_ext_shader_tile_image, ""}},
     {"SPV_EXT_opacity_micromap", {0, nullptr, &DeviceExtensions::vk_ext_opacity_micromap, ""}},
     {"SPV_KHR_cooperative_matrix", {0, nullptr, &DeviceExtensions::vk_khr_cooperative_matrix, ""}},
+    {"SPV_ARM_core_builtins", {0, nullptr, &DeviceExtensions::vk_arm_shader_core_builtins, ""}},
 };
 // clang-format on
 

layers/vulkan/generated/valid_enum_values.cpp

@@ -1362,38 +1362,6 @@ std::vector<VkValidationFeatureDisableEXT> ValidationObject::ValidParamValues()
     return values;
 }
 
-template<>
-std::vector<VkComponentTypeNV> ValidationObject::ValidParamValues() const {
-    constexpr std::array CoreVkComponentTypeNVEnums = {VK_COMPONENT_TYPE_FLOAT16_NV, VK_COMPONENT_TYPE_FLOAT32_NV, VK_COMPONENT_TYPE_FLOAT64_NV, VK_COMPONENT_TYPE_SINT8_NV, VK_COMPONENT_TYPE_SINT16_NV, VK_COMPONENT_TYPE_SINT32_NV, VK_COMPONENT_TYPE_SINT64_NV, VK_COMPONENT_TYPE_UINT8_NV, VK_COMPONENT_TYPE_UINT16_NV, VK_COMPONENT_TYPE_UINT32_NV, VK_COMPONENT_TYPE_UINT64_NV};
-    static const vvl::unordered_map<const ExtEnabled DeviceExtensions::*, std::vector<VkComponentTypeNV>> ExtendedVkComponentTypeNVEnums = {
-    };
-    std::vector<VkComponentTypeNV> values(CoreVkComponentTypeNVEnums.cbegin(), CoreVkComponentTypeNVEnums.cend());
-    std::set<VkComponentTypeNV> unique_exts;
-    for (const auto& [extension, enums]: ExtendedVkComponentTypeNVEnums) {
-        if (IsExtEnabled(device_extensions.*extension)) {
-            unique_exts.insert(enums.cbegin(), enums.cend());
-        }
-    }
-    std::copy(unique_exts.cbegin(), unique_exts.cend(), std::back_inserter(values));
-    return values;
-}
-
-template<>
-std::vector<VkScopeNV> ValidationObject::ValidParamValues() const {
-    constexpr std::array CoreVkScopeNVEnums = {VK_SCOPE_DEVICE_NV, VK_SCOPE_WORKGROUP_NV, VK_SCOPE_SUBGROUP_NV, VK_SCOPE_QUEUE_FAMILY_NV};
-    static const vvl::unordered_map<const ExtEnabled DeviceExtensions::*, std::vector<VkScopeNV>> ExtendedVkScopeNVEnums = {
-    };
-    std::vector<VkScopeNV> values(CoreVkScopeNVEnums.cbegin(), CoreVkScopeNVEnums.cend());
-    std::set<VkScopeNV> unique_exts;
-    for (const auto& [extension, enums]: ExtendedVkScopeNVEnums) {
-        if (IsExtEnabled(device_extensions.*extension)) {
-            unique_exts.insert(enums.cbegin(), enums.cend());
-        }
-    }
-    std::copy(unique_exts.cbegin(), unique_exts.cend(), std::back_inserter(values));
-    return values;
-}
-
 template<>
 std::vector<VkCoverageReductionModeNV> ValidationObject::ValidParamValues() const {
     constexpr std::array CoreVkCoverageReductionModeNVEnums = {VK_COVERAGE_REDUCTION_MODE_MERGE_NV, VK_COVERAGE_REDUCTION_MODE_TRUNCATE_NV};

layers/vulkan/generated/valid_enum_values.h

@@ -99,8 +99,6 @@ template<> std::vector<VkPerformanceParameterTypeINTEL> ValidationObject::ValidP
 template<> std::vector<VkPerformanceValueTypeINTEL> ValidationObject::ValidParamValues() const;
 template<> std::vector<VkValidationFeatureEnableEXT> ValidationObject::ValidParamValues() const;
 template<> std::vector<VkValidationFeatureDisableEXT> ValidationObject::ValidParamValues() const;
-template<> std::vector<VkComponentTypeNV> ValidationObject::ValidParamValues() const;
-template<> std::vector<VkScopeNV> ValidationObject::ValidParamValues() const;
 template<> std::vector<VkCoverageReductionModeNV> ValidationObject::ValidParamValues() const;
 template<> std::vector<VkProvokingVertexModeEXT> ValidationObject::ValidParamValues() const;
 #ifdef VK_USE_PLATFORM_WIN32_KHR

layers/vulkan/generated/vk_enum_string_helper.h

@@ -4163,48 +4163,6 @@ static inline const char* string_VkValidationFeatureDisableEXT(VkValidationFeatu
             return "Unhandled VkValidationFeatureDisableEXT";
     }
 }
-static inline const char* string_VkComponentTypeNV(VkComponentTypeNV input_value) {
-    switch (input_value) {
-        case VK_COMPONENT_TYPE_FLOAT16_NV:
-            return "VK_COMPONENT_TYPE_FLOAT16_NV";
-        case VK_COMPONENT_TYPE_FLOAT32_NV:
-            return "VK_COMPONENT_TYPE_FLOAT32_NV";
-        case VK_COMPONENT_TYPE_FLOAT64_NV:
-            return "VK_COMPONENT_TYPE_FLOAT64_NV";
-        case VK_COMPONENT_TYPE_SINT8_NV:
-            return "VK_COMPONENT_TYPE_SINT8_NV";
-        case VK_COMPONENT_TYPE_SINT16_NV:
-            return "VK_COMPONENT_TYPE_SINT16_NV";
-        case VK_COMPONENT_TYPE_SINT32_NV:
-            return "VK_COMPONENT_TYPE_SINT32_NV";
-        case VK_COMPONENT_TYPE_SINT64_NV:
-            return "VK_COMPONENT_TYPE_SINT64_NV";
-        case VK_COMPONENT_TYPE_UINT8_NV:
-            return "VK_COMPONENT_TYPE_UINT8_NV";
-        case VK_COMPONENT_TYPE_UINT16_NV:
-            return "VK_COMPONENT_TYPE_UINT16_NV";
-        case VK_COMPONENT_TYPE_UINT32_NV:
-            return "VK_COMPONENT_TYPE_UINT32_NV";
-        case VK_COMPONENT_TYPE_UINT64_NV:
-            return "VK_COMPONENT_TYPE_UINT64_NV";
-        default:
-            return "Unhandled VkComponentTypeNV";
-    }
-}
-static inline const char* string_VkScopeNV(VkScopeNV input_value) {
-    switch (input_value) {
-        case VK_SCOPE_DEVICE_NV:
-            return "VK_SCOPE_DEVICE_NV";
-        case VK_SCOPE_WORKGROUP_NV:
-            return "VK_SCOPE_WORKGROUP_NV";
-        case VK_SCOPE_SUBGROUP_NV:
-            return "VK_SCOPE_SUBGROUP_NV";
-        case VK_SCOPE_QUEUE_FAMILY_NV:
-            return "VK_SCOPE_QUEUE_FAMILY_NV";
-        default:
-            return "Unhandled VkScopeNV";
-    }
-}
 static inline const char* string_VkCoverageReductionModeNV(VkCoverageReductionModeNV input_value) {
     switch (input_value) {
         case VK_COVERAGE_REDUCTION_MODE_MERGE_NV: