build: Prepare for release 1.0.20

Author: aqnuep

CMakeLists.txt

@@ -17,12 +17,17 @@
 # ~~~
 cmake_minimum_required(VERSION 3.22.1)
 
+option(VULKANSC "Build Vulkan SC validation layers" ON)
+
 # The VERSION field is generated with the "--generated-version" flag in the generate_source.py script
 #
 # If working with unreleased extensions, make sure the header and validation version are all on the same header version
-project(VVL VERSION 1.4.330 LANGUAGES CXX)
+if(VULKANSC)
+    project(VVL VERSION 1.0.20 LANGUAGES CXX) # vulkansc
+else()
+    project(VVL VERSION 1.4.330 LANGUAGES CXX) # vulkan
+endif()
 
-option(VULKANSC "Build Vulkan SC validation layers" ON)
 option(BUILD_WSI_SCREEN_QNX_SUPPORT "Build QNX screen support" OFF)
 option(BUILD_WSI_SCI_SUPPORT "Build SCI WSI support" OFF)
 

layers/VkSCLayer_khronos_validation.json.in

@@ -5,7 +5,7 @@
         "prefix": "vvl",
         "type": "GLOBAL",
         "library_path": "@JSON_LIBRARY_PATH@",
-        "api_version": "1.0.19",
+        "api_version": "1.0.20",
         "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.",

layers/vulkansc/generated/enum_flag_bits.h

@@ -24,7 +24,7 @@
 #include <array>
 #include "vulkan/vulkan.h"
 // clang-format off
-const uint32_t GeneratedVulkanHeaderVersion = 19;
+const uint32_t GeneratedVulkanHeaderVersion = 20;
 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;

layers/vulkansc/generated/vk_validation_error_messages.h

@@ -568,7 +568,7 @@ def main(argv):
         with open(repo_relative('CMakeLists.txt'), "r+") as f:
             data = f.read()
             f.seek(0)
-            f.write(re.sub("project.*VERSION.*", f"project(VVL VERSION {args.generated_version} LANGUAGES CXX)", data))
+            f.write(re.sub(f"project.*VERSION.*# {args.api}", f"project(VVL VERSION {args.generated_version} LANGUAGES CXX) # {args.api}", data))
             f.truncate()
 
     return 0

scripts/generate_source.py

@@ -19,7 +19,7 @@
             "cmake_options": [
                 "-DGEN_VULKANSC_COMBINED=ON"
             ],
-            "commit": "bf0610365d145d59daad3027ffef1a254e6169f9"
+            "commit": "vksc1.0.20"
         },
         {
             "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": "2113791e647967a1034b2f39f1c0d829c38e3aaa",
+            "commit": "vksc1.0.20",
             "deps": [
                 {
                     "var_name": "VULKAN_HEADERS_INSTALL_DIR",
@@ -140,7 +140,7 @@
             "sub_dir": "Vulkan-Loader",
             "build_dir": "Vulkan-Loader/build",
             "install_dir": "Vulkan-Loader/build/install",
-            "commit": "68ba57b3ccfc32d8c04f15ed36a197ec569e0433",
+            "commit": "vksc1.0.20",
             "build_step": "skip",
             "optional": [
                 "tests"
@@ -166,7 +166,7 @@
             "sub_dir": "Vulkan-Tools",
             "build_dir": "Vulkan-Tools/build",
             "install_dir": "Vulkan-Tools/build/install",
-            "commit": "e5e0130918b9a0361b8473872e43236253703ce8",
+            "commit": "vksc1.0.20",
             "build_step": "skip",
             "optional": [
                 "tests"

scripts/known_good.json

@@ -2,6 +2,6 @@
     "file_format_version": "1.0.1",
     "ICD": {
         "library_path": "@JSON_LIBRARY_PATH@",
-        "api_version": "1.0.19"
+        "api_version": "1.0.20"
     }
 }

tests/icd/VVL_Test_ICD_vksc.json.in

@@ -3,7 +3,7 @@
     "profiles": {
         "MAX_CORE": {
             "version": 1,
-            "api-version": "1.0.19",
+            "api-version": "1.0.20",
             "label": "Max Vulkan SC Core",
             "description": "Max Vulkan SC Core profile",
             "contributors": {},

tests/vulkansc/device_profiles/max_core.json

@@ -3,7 +3,7 @@
     "profiles": {
         "MAX_PROFILE": {
             "version": 1,
-            "api-version": "1.0.19",
+            "api-version": "1.0.20",
             "label": "Max Vulkan SC Profile",
             "description": "Profile that supports everything possible",
             "contributors": {},

tests/vulkansc/device_profiles/max_profile.json

@@ -3,7 +3,7 @@
     "profiles": {
         "MIN_CORE": {
             "version": 1,
-            "api-version": "1.0.19",
+            "api-version": "1.0.20",
             "label": "Min Vulkan SC Core",
             "description": "Min Vulkan SC Core profile",
             "contributors": {},