Update based on changes to main

This refactores handling of extensions and layers to support variable
arrays of extensions and layers based on querying for availability.

Author: llvm-beanz

lib/API/VK/Device.cpp

@@ -163,6 +163,8 @@ class VKDevice : public offloadtest::Device {
   Capabilities Caps;
   using LayerVector = std::vector<VkLayerProperties>;
   LayerVector Layers;
+  using ExtensionVector = std::vector<VkExtensionProperties>;
+  ExtensionVector Extensions;
 
   struct BufferRef {
     VkBuffer Buffer;
@@ -226,6 +228,20 @@ class VKDevice : public offloadtest::Device {
     return false;
   }
 
+  const ExtensionVector &getExtensions() {
+    if (Extensions.empty())
+      queryExtensions();
+    return Extensions;
+  }
+
+  bool isExtensionSupported(llvm::StringRef QueryName) {
+    for (const auto &Ext : getExtensions()) {
+      if (Ext.extensionName == QueryName)
+        return true;
+    }
+    return false;
+  }
+
   void printExtra(llvm::raw_ostream &OS) override {
     OS << "  Layers:\n";
     for (auto Layer : getLayers()) {
@@ -236,6 +252,12 @@ class VKDevice : public offloadtest::Device {
       Sz = strnlen(Layer.description, VK_MAX_DESCRIPTION_SIZE);
       OS << "    LayerDesc: " << llvm::StringRef(Layer.description, Sz) << "\n";
     }
+
+    OS << "  Extensions:\n";
+    for (const auto &Ext : getExtensions()) {
+      OS << "  - ExtensionName: " << llvm::StringRef(Ext.extensionName) << "\n";
+      OS << "    SpecVersion: " << Ext.specVersion << "\n";
+    }
   }
 
   const VkPhysicalDeviceProperties &getProps() const { return Props; }
@@ -301,6 +323,19 @@ class VKDevice : public offloadtest::Device {
     vkEnumerateInstanceLayerProperties(&LayerCount, Layers.data());
   }
 
+  void queryExtensions() {
+    assert(Extensions.empty() && "Should not be called twice!");
+    uint32_t ExtCount;
+    vkEnumerateDeviceExtensionProperties(Device, nullptr, &ExtCount, nullptr);
+
+    if (ExtCount == 0)
+      return;
+
+    Extensions.insert(Extensions.begin(), ExtCount, VkExtensionProperties());
+    vkEnumerateDeviceExtensionProperties(Device, nullptr, &ExtCount,
+                                         Extensions.data());
+  }
+
 public:
   llvm::Error createDevice(InvocationState &IS) {
 
@@ -907,6 +942,7 @@ class VKContext {
     CreateInfo.pApplicationInfo = &AppInfo;
 
     llvm::SmallVector<const char *> Extensions;
+    llvm::SmallVector<const char *> Layers;
 #if __APPLE__
     Extensions.push_back(VK_KHR_PORTABILITY_ENUMERATION_EXTENSION_NAME);
     CreateInfo.flags |= VK_INSTANCE_CREATE_ENUMERATE_PORTABILITY_BIT_KHR;
@@ -936,20 +972,23 @@ class VKContext {
     {
       auto TmpDev = std::make_shared<VKDevice>(PhysicalDevicesTmp[0]);
       AppInfo.apiVersion = TmpDev->getProps().apiVersion;
-    }
-    vkDestroyInstance(Instance, NULL);
-    Instance = VK_NULL_HANDLE;
 
-// TODO: This is a bit hacky but matches what I did in DX.
 #ifndef NDEBUG
-    const char *ValidationLayer = "VK_LAYER_KHRONOS_validation";
-    CreateInfo.ppEnabledLayerNames = &ValidationLayer;
-    CreateInfo.enabledLayerCount = 1;
+      const llvm::StringRef ValidationLayer = "VK_LAYER_KHRONOS_validation";
+      if (TmpDev->isLayerSupported(ValidationLayer))
+        Layers.push_back(ValidationLayer.data());
 
-    const char *DebugUtilsExtensionName = "VK_EXT_debug_utils";
-    CreateInfo.ppEnabledExtensionNames = &DebugUtilsExtensionName;
-    CreateInfo.enabledExtensionCount = 1;
+      const llvm::StringRef DebugUtilsExtensionName = "VK_EXT_debug_utils";
+      if (TmpDev->isExtensionSupported(DebugUtilsExtensionName))
+        Extensions.push_back(DebugUtilsExtensionName.data());
 #endif
+      CreateInfo.ppEnabledLayerNames = Layers.data();
+      CreateInfo.enabledLayerCount = Layers.size();
+      CreateInfo.ppEnabledExtensionNames = Extensions.data();
+      CreateInfo.enabledExtensionCount = Extensions.size();
+    }
+    vkDestroyInstance(Instance, NULL);
+    Instance = VK_NULL_HANDLE;
 
     // This second creation shouldn't ever fail, but it tries to create the
     // highest supported device version.