Only enable instance validation layers when requested and available

ZephyrEngine · Apr 7, 2024 · ae3c801 · ae3c801
1 parent 1361400
commit ae3c801
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/app/next/src/main_window.cpp b/app/next/src/main_window.cpp
@@ -88,7 +88,12 @@ namespace zephyr {
     required_extension_names.resize(extension_count);
     SDL_Vulkan_GetInstanceExtensions(m_window, &extension_count, required_extension_names.data());
 
-    m_vk_instance = VulkanInstance::Create(app_info, required_extension_names, {"VK_LAYER_KHRONOS_validation"});
+    std::vector<const char*> required_layer_names{};
+    if(enable_validation_layers && VulkanInstance::QueryInstanceLayerSupport("VK_LAYER_KHRONOS_validation")) {
+      required_layer_names.push_back("VK_LAYER_KHRONOS_validation");
+    }
+
+    m_vk_instance = VulkanInstance::Create(app_info, required_extension_names, required_layer_names);
   }
 
   VulkanPhysicalDevice* MainWindow::PickPhysicalDevice() {