vulkan: Expand cases where can_get_driver_info is true

VK_KHR_driver_properties requires VK_KHR_get_physical_device_properties2
extension.  For Vulkan 1.2 both extensions are core, so nothing to do,
for Vulkan 1.1, the latter is core, so only need the former.  For Vulkan
1.0 both extensions are required.

This fixes `vulkan_driver` option in applications that ask for
Vulkan 1.0 (e.g. vkcube) but that the driver does support the extra
extensions.

Commit 8450291 ("vulkan: Do not modify pCreateInfo in CreateDevice")
previously removed this, however Vulkan spec requires those to be
enabled -- even if sometimes drivers work fine with just using extensions
without enabling.  Vulkan Validation layers use this same approach of
modifying the CreateInfo structure to ask for extra extensions.

Author: cmarcelo

src/vulkan.cpp

@@ -1819,37 +1819,49 @@ static VkResult overlay_CreateDevice(
    chain_info->u.pLayerInfo = chain_info->u.pLayerInfo->pNext;
 
 
-   std::vector<const char*> enabled_extensions(pCreateInfo->ppEnabledExtensionNames,
-                                               pCreateInfo->ppEnabledExtensionNames +
-                                               pCreateInfo->enabledExtensionCount);
+   VkDeviceCreateInfo modified_create_info = {};
+   std::vector<const char *> modified_enabled_extensions;
+   bool can_get_driver_info = false;
 
-   uint32_t extension_count;
-
-   instance_data->vtable.EnumerateDeviceExtensionProperties(physicalDevice, nullptr, &extension_count, nullptr);
+   // VK_KHR_driver_properties became core in 1.2
+   if (instance_data->api_version >= VK_API_VERSION_1_2) {
+      can_get_driver_info = true;
 
-   std::vector<VkExtensionProperties> available_extensions(extension_count);
-   instance_data->vtable.EnumerateDeviceExtensionProperties(physicalDevice, nullptr, &extension_count, available_extensions.data());
+   } else {
+      std::set<const char *> enabled_extensions(pCreateInfo->ppEnabledExtensionNames,
+                                                pCreateInfo->ppEnabledExtensionNames +
+                                                pCreateInfo->enabledExtensionCount);
 
+      uint32_t extension_count;
+      instance_data->vtable.EnumerateDeviceExtensionProperties(physicalDevice, nullptr, &extension_count, nullptr);
 
-   bool can_get_driver_info = instance_data->api_version < VK_API_VERSION_1_1 ? false : true;
+      std::vector<VkExtensionProperties> available_extensions(extension_count);
+      instance_data->vtable.EnumerateDeviceExtensionProperties(physicalDevice, nullptr, &extension_count, available_extensions.data());
 
-   // VK_KHR_driver_properties became core in 1.2
-   if (instance_data->api_version < VK_API_VERSION_1_2 && can_get_driver_info) {
       for (auto& extension : available_extensions) {
          if (extension.extensionName == std::string(VK_KHR_DRIVER_PROPERTIES_EXTENSION_NAME)) {
-            for (auto& enabled : enabled_extensions) {
-               if (enabled == std::string(VK_KHR_DRIVER_PROPERTIES_EXTENSION_NAME))
-                  goto DONT;
-            }
-            enabled_extensions.push_back(VK_KHR_DRIVER_PROPERTIES_EXTENSION_NAME);
-            DONT:
-            goto FOUND;
+            // VK_KHR_get_physical_device_properties2 became core in 1.1
+            if (instance_data->api_version < VK_API_VERSION_1_1)
+               enabled_extensions.insert(VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME);
+            enabled_extensions.insert(VK_KHR_DRIVER_PROPERTIES_EXTENSION_NAME);
          }
+
+         can_get_driver_info = true;
+         break;
+      }
+
+      if (can_get_driver_info && enabled_extensions.size() > pCreateInfo->enabledExtensionCount) {
+         modified_create_info = *pCreateInfo;
+         modified_enabled_extensions.assign(enabled_extensions.begin(), enabled_extensions.end());
+         modified_create_info.ppEnabledExtensionNames = modified_enabled_extensions.data();
+         modified_create_info.enabledExtensionCount = modified_enabled_extensions.size();
       }
-      can_get_driver_info = false;
-      FOUND:;
    }
 
+
+   if (modified_create_info.sType)
+      pCreateInfo = &modified_create_info;
+
    VkResult result = fpCreateDevice(physicalDevice, pCreateInfo, pAllocator, pDevice);
    if (result != VK_SUCCESS) return result;