commit 628c41ac1d788cac4310bd62e52323de98b392c9
author Trevor David Black <vantablack@google.com> Mon Sep 27 05:07:22 2021 +0000
committer Trevor David Black <vantablack@google.com> Mon Jan 24 15:56:02 2022 +0000
tree 53a567342b8ef63c4a4f1f4cd882b907290f9065
parent b700ae8ceeed33b876a6e4676ac0f05bbdf9be78

Change Vulkan API to 1.3

The commit changes the platform code to support Vulkan 1.3.

Bug: 191881132
Test: build
Change-Id: I75ed8a0737ef20ff95e4a27ce39cc855d8a1deeb

vulkan/libvulkan/api.cpp

diff --git a/vulkan/libvulkan/api.cpp b/vulkan/libvulkan/api.cpp
index 9ecc568..c335e2a 100644
--- a/vulkan/libvulkan/api.cpp
+++ b/vulkan/libvulkan/api.cpp
@@ -1473,7 +1473,7 @@
     if (!EnsureInitialized())
         return VK_ERROR_OUT_OF_HOST_MEMORY;
 
-    *pApiVersion = VK_API_VERSION_1_2;
+    *pApiVersion = VK_API_VERSION_1_3;
     return VK_SUCCESS;
 }
 

vulkan/libvulkan/driver.cpp

diff --git a/vulkan/libvulkan/driver.cpp b/vulkan/libvulkan/driver.cpp
index 238429f..9225062 100644
--- a/vulkan/libvulkan/driver.cpp
+++ b/vulkan/libvulkan/driver.cpp
@@ -365,7 +365,7 @@
                                      const VkAllocationCallbacks& allocator)
     : is_instance_(true),
       allocator_(allocator),
-      loader_api_version_(VK_API_VERSION_1_2),
+      loader_api_version_(VK_API_VERSION_1_3),
       icd_api_version_(icd_api_version),
       physical_dev_(VK_NULL_HANDLE),
       instance_info_(create_info),
@@ -377,7 +377,7 @@
                                      const VkAllocationCallbacks& allocator)
     : is_instance_(false),
       allocator_(allocator),
-      loader_api_version_(VK_API_VERSION_1_2),
+      loader_api_version_(VK_API_VERSION_1_3),
       icd_api_version_(icd_api_version),
       physical_dev_(physical_dev),
       dev_info_(create_info),
@@ -519,6 +519,10 @@
         is_instance_ ? loader_api_version_
                      : std::min(icd_api_version_, loader_api_version_);
     switch (api_version) {
+        case VK_API_VERSION_1_3:
+            hook_extensions_.set(ProcHook::EXTENSION_CORE_1_3);
+            hal_extensions_.set(ProcHook::EXTENSION_CORE_1_3);
+            [[clang::fallthrough]];
         case VK_API_VERSION_1_2:
             hook_extensions_.set(ProcHook::EXTENSION_CORE_1_2);
             hal_extensions_.set(ProcHook::EXTENSION_CORE_1_2);

vulkan/nulldrv/null_driver.cpp

diff --git a/vulkan/nulldrv/null_driver.cpp b/vulkan/nulldrv/null_driver.cpp
index a9f37e5..eea0ec9 100644
--- a/vulkan/nulldrv/null_driver.cpp
+++ b/vulkan/nulldrv/null_driver.cpp
@@ -260,7 +260,7 @@
 
 VKAPI_ATTR
 VkResult EnumerateInstanceVersion(uint32_t* pApiVersion) {
-    *pApiVersion = VK_API_VERSION_1_2;
+    *pApiVersion = VK_API_VERSION_1_3;
     return VK_SUCCESS;
 }
 

vulkan/vkjson/vkjson.cc

diff --git a/vulkan/vkjson/vkjson.cc b/vulkan/vkjson/vkjson.cc
index 90cf42c..798fd4a 100644
--- a/vulkan/vkjson/vkjson.cc
+++ b/vulkan/vkjson/vkjson.cc
@@ -973,6 +973,8 @@
   bool ret = true;
   switch (device->properties.apiVersion ^
           VK_API_VERSION_PATCH(device->properties.apiVersion)) {
+    case VK_API_VERSION_1_3:
+      FALLTHROUGH_INTENDED;
     case VK_API_VERSION_1_2:
       ret &= visitor->Visit("core12", &device->core12);
       FALLTHROUGH_INTENDED;
@@ -1030,6 +1032,8 @@
 inline bool Iterate(Visitor* visitor, VkJsonInstance* instance) {
   bool ret = true;
   switch (instance->api_version ^ VK_API_VERSION_PATCH(instance->api_version)) {
+    case VK_API_VERSION_1_3:
+      FALLTHROUGH_INTENDED;
     case VK_API_VERSION_1_2:
       ret &= visitor->Visit("apiVersion", &instance->api_version);
       FALLTHROUGH_INTENDED;