From ec1fc0570d679da142a33c768211380e7b62b14b Mon Sep 17 00:00:00 2001 From: kidrigger Date: Fri, 7 Feb 2025 13:32:20 +0100 Subject: [PATCH] Removed layer hard-coding. --- .gitignore | 1 + aster/context.cpp | 6 ------ aster/context.h | 6 +++--- flake.nix | 4 +++- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index f495c32..eb8e901 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ build/ .vs/ .direnv/ +.ccls-cache/ diff --git a/aster/context.cpp b/aster/context.cpp index d17e85a..7b13b27 100644 --- a/aster/context.cpp +++ b/aster/context.cpp @@ -7,10 +7,6 @@ #include #include -constexpr eastl::array VALIDATION_LAYERS = { - "VK_LAYER_KHRONOS_validation", -}; - VKAPI_ATTR b32 VKAPI_CALL DebugCallback(const VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity, const VkDebugUtilsMessageTypeFlagsEXT messageType, @@ -80,8 +76,6 @@ Context::Context(const cstr appName, const Version version, bool enableValidatio const auto instanceCreateInfo = vk::InstanceCreateInfo{ .pNext = enableValidation ? &debugUtilsMessengerCreateInfo : nullptr, .pApplicationInfo = &appInfo, - .enabledLayerCount = enableValidation ? Cast(VALIDATION_LAYERS.size()) : 0, - .ppEnabledLayerNames = enableValidation ? VALIDATION_LAYERS.data() : nullptr, .enabledExtensionCount = Cast(instanceExtensions.size()), .ppEnabledExtensionNames = instanceExtensions.data(), }; diff --git a/aster/context.h b/aster/context.h index b17d00f..9d73991 100644 --- a/aster/context.h +++ b/aster/context.h @@ -21,7 +21,7 @@ struct Context final vk::DebugUtilsMessengerEXT m_DebugMessenger = nullptr; // Ctor/Dtor - Context(cstr appName, Version version, bool enableValidation = ENABLE_VALIDATION_DEFAULT_VALUE); + Context(cstr appName, Version version, bool enableValidation = ENABLE_LAYER_MESSAGES_DEFAULT_VALUE); ~Context(); // Move @@ -29,9 +29,9 @@ struct Context final Context &operator=(Context &&other) noexcept; #if !defined(ASTER_NDEBUG) - constexpr static bool ENABLE_VALIDATION_DEFAULT_VALUE = true; + constexpr static bool ENABLE_LAYER_MESSAGES_DEFAULT_VALUE = true; #else - constexpr static bool ENABLE_VALIDATION_DEFAULT_VALUE = false; + constexpr static bool ENABLE_LAYER_MESSAGES_DEFAULT_VALUE = false; #endif DISALLOW_COPY_AND_ASSIGN(Context); diff --git a/flake.nix b/flake.nix index e63c4c3..6300e07 100644 --- a/flake.nix +++ b/flake.nix @@ -23,7 +23,9 @@ nativeBuildInputs = [ cmake ninja - ccls + ccls + clang-tools + lldb (imgui.override {IMGUI_BUILD_VULKAN_BINDING = true; IMGUI_BUILD_GLFW_BINDING=true; }) ];