Use Vulkan 1.1 if available

Bug: chromium:976495
Change-Id: I10940340fab44b44e26cfb025f8c932a5e62f02e
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/9500
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Kai Ninomiya <kainino@chromium.org>

src/dawn_native/vulkan/BackendVk.cpp

@@ -166,7 +166,7 @@ namespace dawn_native { namespace vulkan {
         appInfo.applicationVersion = 0;
         appInfo.pEngineName = nullptr;
         appInfo.engineVersion = 0;
-        appInfo.apiVersion = VK_API_VERSION_1_0;
+        appInfo.apiVersion = mGlobalInfo.apiVersion;
 
         VkInstanceCreateInfo createInfo;
         createInfo.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO;

src/dawn_native/vulkan/VulkanFunctions.cpp

@@ -34,6 +34,10 @@ namespace dawn_native { namespace vulkan {
         GET_GLOBAL_PROC(EnumerateInstanceExtensionProperties);
         GET_GLOBAL_PROC(EnumerateInstanceLayerProperties);
 
+        // Is not available in Vulkan 1.0, so allow nullptr
+        EnumerateInstanceVersion = reinterpret_cast<decltype(EnumerateInstanceVersion)>(
+            GetInstanceProcAddr(nullptr, "vkEnumerateInstanceVersion"));
+
         return {};
     }
 

src/dawn_native/vulkan/VulkanFunctions.h

@@ -45,6 +45,9 @@ namespace dawn_native { namespace vulkan {
         // before querying the instance procs in case we need to error out during initialization.
         PFN_vkDestroyInstance DestroyInstance = nullptr;
 
+        // Core Vulkan 1.1
+        PFN_vkEnumerateInstanceVersion EnumerateInstanceVersion = nullptr;
+
         // ---------- Instance procs
 
         // Core Vulkan 1.0

src/dawn_native/vulkan/VulkanInfo.cpp

@@ -120,6 +120,19 @@ namespace dawn_native { namespace vulkan {
             }
         }
 
+        // Gather info on available API version
+        {
+            uint32_t supportedAPIVersion = VK_MAKE_VERSION(1, 0, 0);
+            if (vkFunctions.EnumerateInstanceVersion) {
+                vkFunctions.EnumerateInstanceVersion(&supportedAPIVersion);
+            }
+
+            // Use Vulkan 1.1 if it's available.
+            info.apiVersion = (supportedAPIVersion >= VK_MAKE_VERSION(1, 1, 0))
+                                  ? VK_MAKE_VERSION(1, 1, 0)
+                                  : VK_MAKE_VERSION(1, 0, 0);
+        }
+
         // TODO(cwallez@chromium:org): Each layer can expose additional extensions, query them?
 
         return info;

src/dawn_native/vulkan/VulkanInfo.h

@@ -59,6 +59,7 @@ namespace dawn_native { namespace vulkan {
     struct VulkanGlobalInfo : VulkanGlobalKnobs {
         std::vector<VkLayerProperties> layers;
         std::vector<VkExtensionProperties> extensions;
+        uint32_t apiVersion;
         // TODO(cwallez@chromium.org): layer instance extensions
     };