[vulkan] Check that additional extensions are supported before adding…

… them (#2667)

taichi/backends/vulkan/vulkan_api.cpp

@@ -273,9 +273,6 @@ void EmbeddedVulkanDevice::create_instance() {
   }
 
   auto extensions = get_required_extensions();
-  for (auto ext : params_.additional_instance_extensions) {
-    extensions.push_back(ext);
-  }
 
 #ifdef TI_VULKAN_DEBUG
   glfwInit();
@@ -302,6 +299,11 @@ void EmbeddedVulkanDevice::create_instance() {
         extensions.push_back(ext.extensionName);
       }
     }
+    if (std::find(params_.additional_instance_extensions.begin(),
+                  params_.additional_instance_extensions.end(),
+                  name) != params_.additional_instance_extensions.end()) {
+      extensions.push_back(ext.extensionName);
+    }
   }
 
   create_info.enabledExtensionCount = (uint32_t)extensions.size();
@@ -401,10 +403,6 @@ void EmbeddedVulkanDevice::create_logical_device() {
   // Detect extensions
   std::vector<const char *> enabled_extensions;
 
-  for (auto ext : params_.additional_device_extensions) {
-    enabled_extensions.push_back(ext);
-  }
-
   uint32_t extension_count = 0;
   vkEnumerateDeviceExtensionProperties(physical_device_, nullptr,
                                        &extension_count, nullptr);
@@ -458,6 +456,10 @@ void EmbeddedVulkanDevice::create_logical_device() {
       capability_.has_float16 = true;
       capability_.has_int8 = true;
       enabled_extensions.push_back(ext.extensionName);
+    } else if (std::find(params_.additional_device_extensions.begin(),
+                         params_.additional_device_extensions.end(),
+                         name) != params_.additional_device_extensions.end()) {
+      enabled_extensions.push_back(ext.extensionName);
     }
   }
 

taichi/backends/vulkan/vulkan_api.h

@@ -146,8 +146,8 @@ class EmbeddedVulkanDevice {
   struct Params {
     std::optional<uint32_t> api_version;
     bool is_for_ui{false};
-    std::vector<const char *> additional_instance_extensions;
-    std::vector<const char *> additional_device_extensions;
+    std::vector<std::string> additional_instance_extensions;
+    std::vector<std::string> additional_device_extensions;
     // the VkSurfaceKHR needs to be created after creating the VkInstance, but
     // before creating the VkPhysicalDevice thus, we allow the user to pass in a
     // custom surface creator