Get the list of Vulkan device extensions

corporateshark · Nov 2, 2024 · 1a41b67 · 1a41b67
1 parent 27d1aa5
commit 1a41b67
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/lvk/vulkan/VulkanClasses.cpp b/lvk/vulkan/VulkanClasses.cpp
@@ -5905,6 +5905,14 @@ lvk::Result lvk::VulkanContext::initContext(const HWDeviceDesc& desc) {
 #endif
   };
 
+  std::vector<VkExtensionProperties> allDeviceExtensions;
+  getDeviceExtensionProps(vkPhysicalDevice_, allDeviceExtensions);
+  if (config_.enableValidation) {
+    for (const char* layer : kDefaultValidationLayers) {
+      getDeviceExtensionProps(vkPhysicalDevice_, allDeviceExtensions, layer);
+    }
+  }
+
   for (const char* ext : config_.extensionsDevice) {
     if (ext) {
       deviceExtensionNames.push_back(ext);
@@ -6051,16 +6059,9 @@ lvk::Result lvk::VulkanContext::initContext(const HWDeviceDesc& desc) {
 
   // check extensions
   {
-    std::vector<VkExtensionProperties> props;
-    getDeviceExtensionProps(vkPhysicalDevice_, props);
-    if (config_.enableValidation) {
-      for (const char* layer : kDefaultValidationLayers) {
-        getDeviceExtensionProps(vkPhysicalDevice_, props, layer);
-      }
-    }
     std::string missingExtensions;
     for (const char* ext : deviceExtensionNames) {
-      if (!hasExtension(ext, props))
+      if (!hasExtension(ext, allDeviceExtensions))
         missingExtensions += "\n   " + std::string(ext);
     }
     if (!missingExtensions.empty()) {

diff --git a/lvk/vulkan/VulkanClasses.h b/lvk/vulkan/VulkanClasses.h
@@ -494,8 +494,7 @@ class VulkanContext final : public IContext {
 
   Holder<ComputePipelineHandle> createComputePipeline(const ComputePipelineDesc& desc, Result* outResult) override;
   Holder<RenderPipelineHandle> createRenderPipeline(const RenderPipelineDesc& desc, Result* outResult) override;
-  Holder<RayTracingPipelineHandle> createRayTracingPipeline(const RayTracingPipelineDesc& desc,
-                                                            Result* outResult = nullptr) override;
+  Holder<RayTracingPipelineHandle> createRayTracingPipeline(const RayTracingPipelineDesc& desc, Result* outResult = nullptr) override;
   Holder<ShaderModuleHandle> createShaderModule(const ShaderModuleDesc& desc, Result* outResult) override;
 
   Holder<QueryPoolHandle> createQueryPool(uint32_t numQueries, const char* debugName, Result* outResult) override;