Remove Vulkan validation layer plumbing

Author: anirul

README.md

@@ -87,7 +87,6 @@ Available examples:
 Useful runtime flags:
 
 - `--device={vulkan|opengl}`: choose rendering backend
-- `--vk_validation={true|false}`: toggle Vulkan validation layers
 
 ## Run Tests
 

frame/common/application.cpp

@@ -15,11 +15,6 @@
 #include "frame/vulkan/window_factory.h"
 
 ABSL_FLAG(std::string, device, "vulkan", "Rendering backend (vulkan|opengl).");
-#if defined(_DEBUG)
-ABSL_FLAG(bool, vk_validation, true, "Enable Vulkan validation layers.");
-#else
-ABSL_FLAG(bool, vk_validation, false, "Enable Vulkan validation layers.");
-#endif
 ABSL_FLAG(
     double,
     auto_exit_seconds,
@@ -42,9 +37,8 @@ bool StartsWith(std::string_view value, std::string_view prefix)
 
 std::string NormalizeKnownFlag(std::string_view arg)
 {
-    constexpr std::array<std::string_view, 4> kKnownFlags = {
+    constexpr std::array<std::string_view, 3> kKnownFlags = {
         "device",
-        "vk_validation",
         "auto_exit_seconds",
         "screenshot_on_exit"};
     for (const auto flag_name : kKnownFlags)

frame/common/application.h

@@ -10,7 +10,6 @@
 #include "frame/api.h"
 #include "frame/window_interface.h"
 
-ABSL_DECLARE_FLAG(bool, vk_validation);
 ABSL_DECLARE_FLAG(double, auto_exit_seconds);
 ABSL_DECLARE_FLAG(bool, screenshot_on_exit);
 

frame/vulkan/CMakeLists.txt

@@ -42,8 +42,6 @@ set(FRAME_VULKAN_SOURCES
   texture_resources.cpp
   texture_resources.h
   dispatcher.cpp
-  debug_callback.cpp
-  debug_callback.h
   device.h
   device.cpp
   sdl_vulkan_none.h

frame/vulkan/debug_callback.cpp

@@ -1,64 +1,20 @@
 #include "frame/vulkan/sdl_vulkan_none.h"
 
-#include <SDL3/SDL.h>
-#include <SDL3/SDL_vulkan.h>
-#include <cstring>
+#include <SDL3/SDL.h>
+#include <SDL3/SDL_vulkan.h>
 #include <format>
 #include <string>
 #include <vector>
 
-#include "absl/flags/flag.h"
-
 #include "frame/common/application.h"
-#include "frame/vulkan/debug_callback.h"
-
+
 namespace frame::vulkan
 {
 namespace
 {
-constexpr const char* kValidationLayerName = "VK_LAYER_KHRONOS_validation";
-
-bool HasExtension(
-    const std::vector<vk::ExtensionProperties>& extensions,
-    const char* name)
-{
-    for (const auto& ext : extensions)
-    {
-        if (std::strcmp(ext.extensionName, name) == 0)
-        {
-            return true;
-        }
-    }
-    return false;
-}
-
-bool HasLayer(
-    const std::vector<vk::LayerProperties>& layers,
-    const char* name)
-{
-    for (const auto& layer : layers)
-    {
-        if (std::strcmp(layer.layerName, name) == 0)
-        {
-            return true;
-        }
-    }
-    return false;
-}
-
-bool IsValidationEnabled()
-{
-#if defined(_DEBUG)
-    bool enabled = true;
-#else
-    bool enabled = false;
-#endif
-    enabled = absl::GetFlag(FLAGS_vk_validation);
-    return enabled;
-}
 } // namespace
-
-SDLVulkanNone::SDLVulkanNone(glm::uvec2 size) : size_(size)
+
+SDLVulkanNone::SDLVulkanNone(glm::uvec2 size) : size_(size)
 {
     if (!SDL_Init(SDL_INIT_VIDEO))
     {
@@ -101,34 +57,11 @@ SDLVulkanNone::SDLVulkanNone(glm::uvec2 size) : size_(size)
     extensions.reserve(static_cast<std::size_t>(extension_count) + 1);
     extensions.insert(
         extensions.end(), extension_names, extension_names + extension_count);
-    const auto available_extensions =
-        vk::enumerateInstanceExtensionProperties();
-    const bool want_validation = IsValidationEnabled();
-    const bool has_debug_utils =
-        HasExtension(available_extensions, VK_EXT_DEBUG_UTILS_EXTENSION_NAME);
-    if (want_validation && has_debug_utils)
-    {
-        extensions.push_back(VK_EXT_DEBUG_UTILS_EXTENSION_NAME);
-    }
     for (const auto& extension : extensions)
     {
         logger_->info("Extension: {}", extension);
     }
 
-    std::vector<const char*> layers;
-    if (want_validation)
-    {
-        const auto available_layers = vk::enumerateInstanceLayerProperties();
-        if (HasLayer(available_layers, kValidationLayerName))
-        {
-            layers.push_back(kValidationLayerName);
-        }
-        else
-        {
-            logger_->warn("Vulkan validation layer not found.");
-        }
-    }
-
     vk::ApplicationInfo application_info(
         "Frame",
         VK_MAKE_VERSION(0, 5, 1),
@@ -138,35 +71,13 @@ SDLVulkanNone::SDLVulkanNone(glm::uvec2 size) : size_(size)
     vk::InstanceCreateInfo instance_create_info(
         {},
         &application_info,
-        static_cast<std::uint32_t>(layers.size()),
-        layers.data(),
+        0,
+        nullptr,
         static_cast<std::uint32_t>(extensions.size()),
         extensions.data());
 
-    vk::DebugUtilsMessengerCreateInfoEXT debug_info{};
-    if (want_validation && has_debug_utils)
-    {
-        debug_info.messageSeverity =
-            vk::DebugUtilsMessageSeverityFlagBitsEXT::eWarning |
-            vk::DebugUtilsMessageSeverityFlagBitsEXT::eError |
-            vk::DebugUtilsMessageSeverityFlagBitsEXT::eInfo;
-        debug_info.messageType =
-            vk::DebugUtilsMessageTypeFlagBitsEXT::eGeneral |
-            vk::DebugUtilsMessageTypeFlagBitsEXT::eValidation |
-            vk::DebugUtilsMessageTypeFlagBitsEXT::ePerformance;
-        debug_info.pfnUserCallback =
-            reinterpret_cast<vk::PFN_DebugUtilsMessengerCallbackEXT>(
-                DebugCallback);
-        instance_create_info.setPNext(&debug_info);
-    }
-
     vk_unique_instance_ = vk::createInstanceUnique(instance_create_info);
     VULKAN_HPP_DEFAULT_DISPATCHER.init(*vk_unique_instance_, vk_get_instance_proc_addr);
-    if (want_validation && has_debug_utils)
-    {
-        debug_messenger_ =
-            vk_unique_instance_->createDebugUtilsMessengerEXTUnique(debug_info);
-    }
 
     VkSurfaceKHR surface = VK_NULL_HANDLE;
     if (!SDL_Vulkan_CreateSurface(

frame/vulkan/debug_callback.h

@@ -110,7 +110,6 @@ class SDLVulkanNone : public WindowInterface
     std::string open_file_name_ = "";
     frame::Logger& logger_ = frame::Logger::GetInstance();
     vk::UniqueInstance vk_unique_instance_;
-    vk::UniqueDebugUtilsMessengerEXT debug_messenger_;
     vk::SurfaceKHR vk_surface_ = VK_NULL_HANDLE;
 };