build: Prepare for release 1.0.16

KhronosGroup · Oct 14, 2024 · c61c7c3 · c61c7c3
1 parent 3a50899
commit c61c7c3
Show file tree

Hide file tree

Showing 10 changed files with 220 additions and 169 deletions.
diff --git a/layers/VkSCLayer_khronos_validation.json.in b/layers/VkSCLayer_khronos_validation.json.in
@@ -4,7 +4,7 @@
         "name": "VK_LAYER_KHRONOS_validation",
         "type": "GLOBAL",
         "library_path": "@JSON_LIBRARY_PATH@",
-        "api_version": "1.0.15",
+        "api_version": "1.0.16",
         "implementation_version": "1",
         "description": "Khronos Validation Layer",
         "introduction": "The main, comprehensive Khronos validation layer.\n\nVulkan SC is an Explicit API, enabling direct control over how GPUs actually work. By design, minimal error checking is done inside a Vulkan SC driver. Applications have full control and responsibility for correct operation. Any errors in how Vulkan SC is used can result in a crash. \n\nThe Khronos Validation Layer can be enabled to assist development by enabling developers to verify their applications correctly use the Vulkan SC API.",

diff --git a/layers/vulkansc/generated/enum_flag_bits.h b/layers/vulkansc/generated/enum_flag_bits.h
@@ -24,7 +24,7 @@
 #include <array>
 #include "vulkan/vulkan.h"
 // clang-format off
-const uint32_t GeneratedVulkanHeaderVersion = 15;
+const uint32_t GeneratedVulkanHeaderVersion = 16;
 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_COLOR_ATTACHMENT_READ_NONCOHERENT_BIT_EXT|VK_ACCESS_FRAGMENT_SHADING_RATE_ATTACHMENT_READ_BIT_KHR;
 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 VkDeviceQueueCreateFlags AllVkDeviceQueueCreateFlagBits = VK_DEVICE_QUEUE_CREATE_PROTECTED_BIT;

diff --git a/layers/vulkansc/generated/stateless_validation_helper.cpp b/layers/vulkansc/generated/stateless_validation_helper.cpp
@@ -4350,6 +4350,7 @@ bool StatelessValidation::PreCallValidateCreateInstance(const VkInstanceCreateIn
     if (pCreateInfo != nullptr) {
         [[maybe_unused]] const Location pCreateInfo_loc = loc.dot(Field::pCreateInfo);
         constexpr std::array allowed_structs_VkInstanceCreateInfo = {VK_STRUCTURE_TYPE_DEBUG_UTILS_MESSENGER_CREATE_INFO_EXT,
+                                                                     VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT,
                                                                      VK_STRUCTURE_TYPE_VALIDATION_FEATURES_EXT};
 
         skip |= ValidateStructPnext(pCreateInfo_loc, pCreateInfo->pNext, allowed_structs_VkInstanceCreateInfo.size(),

diff --git a/layers/vulkansc/generated/stateless_validation_helper.h b/layers/vulkansc/generated/stateless_validation_helper.h
@@ -31,6 +31,7 @@ static inline bool IsDuplicatePnext(VkStructureType input_value) {
         case VK_STRUCTURE_TYPE_DEBUG_UTILS_MESSENGER_CREATE_INFO_EXT:
         case VK_STRUCTURE_TYPE_APPLICATION_PARAMETERS_EXT:
         case VK_STRUCTURE_TYPE_DEVICE_SEMAPHORE_SCI_SYNC_POOL_RESERVATION_CREATE_INFO_NV:
+        case VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT:
             return true;
         default:
             return false;

diff --git a/layers/vulkansc/generated/test_icd_helper.h b/layers/vulkansc/generated/test_icd_helper.h
@@ -43,6 +43,7 @@ static const std::unordered_map<std::string, uint32_t> instance_extension_map =
     {VK_EXT_VALIDATION_FEATURES_EXTENSION_NAME, VK_EXT_VALIDATION_FEATURES_SPEC_VERSION},
     {VK_EXT_HEADLESS_SURFACE_EXTENSION_NAME, VK_EXT_HEADLESS_SURFACE_SPEC_VERSION},
     {VK_EXT_APPLICATION_PARAMETERS_EXTENSION_NAME, VK_EXT_APPLICATION_PARAMETERS_SPEC_VERSION},
+    {VK_EXT_LAYER_SETTINGS_EXTENSION_NAME, VK_EXT_LAYER_SETTINGS_SPEC_VERSION},
 };
 
 // Map of device extension name to version

diff --git a/layers/vulkansc/generated/vk_validation_error_messages.h b/layers/vulkansc/generated/vk_validation_error_messages.h
diff --git a/scripts/known_good.json b/scripts/known_good.json
@@ -19,7 +19,7 @@
             "cmake_options": [
                 "-DGEN_VULKANSC_COMBINED=ON"
             ],
-            "commit": "662d344a7910de45a523f11efd8af7479c71e29e"
+            "commit": "vksc1.0.16"
         },
         {
             "name": "Vulkan-Utility-Libraries",
@@ -43,7 +43,7 @@
             "sub_dir": "Vulkan-Utility-Libraries",
             "build_dir": "Vulkan-Utility-Libraries/build",
             "install_dir": "Vulkan-Utility-Libraries/build/install",
-            "commit": "6d51694ec8fa6e68b2f21291533e1efae31f9b71",
+            "commit": "vksc1.0.16",
             "deps": [
                 {
                     "var_name": "VULKAN_HEADERS_INSTALL_DIR",
@@ -151,7 +151,7 @@
             "sub_dir": "Vulkan-Loader",
             "build_dir": "Vulkan-Loader/build",
             "install_dir": "Vulkan-Loader/build/install",
-            "commit": "c59c24a2b43714fbd73686acbb2de37392d04747",
+            "commit": "vksc1.0.16",
             "build_step": "skip",
             "optional": [
                 "tests"
@@ -190,7 +190,7 @@
             "sub_dir": "Vulkan-Tools",
             "build_dir": "Vulkan-Tools/build",
             "install_dir": "Vulkan-Tools/build/install",
-            "commit": "d7cfe6a6fb3fc38db3382adcc5194bf1f7b9f218",
+            "commit": "vksc1.0.16",
             "build_step": "skip",
             "optional": [
                 "tests"

diff --git a/tests/vulkansc/device_profiles/max_core.json b/tests/vulkansc/device_profiles/max_core.json
@@ -3,7 +3,7 @@
     "profiles": {
         "MAX_CORE": {
             "version": 1,
-            "api-version": "1.0.15",
+            "api-version": "1.0.16",
             "label": "Max Vulkan SC Core",
             "description": "Max Vulkan SC Core profile",
             "contributors": {},

diff --git a/tests/vulkansc/device_profiles/max_profile.json b/tests/vulkansc/device_profiles/max_profile.json
@@ -3,7 +3,7 @@
     "profiles": {
         "MAX_PROFILE": {
             "version": 1,
-            "api-version": "1.0.15",
+            "api-version": "1.0.16",
             "label": "Max Vulkan SC Profile",
             "description": "Profile that supports everything possible",
             "contributors": {},

diff --git a/tests/vulkansc/device_profiles/min_core.json b/tests/vulkansc/device_profiles/min_core.json
@@ -3,7 +3,7 @@
     "profiles": {
         "MIN_CORE": {
             "version": 1,
-            "api-version": "1.0.15",
+            "api-version": "1.0.16",
             "label": "Min Vulkan SC Core",
             "description": "Min Vulkan SC Core profile",
             "contributors": {},