From 582a82d9b43613a6962be831f0eeebfe9fed5eae Mon Sep 17 00:00:00 2001 From: GeorgH93 Date: Thu, 29 Jul 2021 15:32:23 +0200 Subject: [PATCH] Fix issues with debug layers --- openVulkanoCpp/Vulkan/Debuging/ValidationLayer.cpp | 3 ++- openVulkanoCpp/Vulkan/RenderPass.hpp | 2 +- openVulkanoCpp/Vulkan/Scene/IRecordable.hpp | 11 +++++++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/openVulkanoCpp/Vulkan/Debuging/ValidationLayer.cpp b/openVulkanoCpp/Vulkan/Debuging/ValidationLayer.cpp index ca97eae..e6ae466 100644 --- a/openVulkanoCpp/Vulkan/Debuging/ValidationLayer.cpp +++ b/openVulkanoCpp/Vulkan/Debuging/ValidationLayer.cpp @@ -15,6 +15,7 @@ namespace openVulkanoCpp::Vulkan const std::initializer_list activeValidationLayerNames = { "VK_LAYER_LUNARG_assistant_layer", "VK_LAYER_LUNARG_standard_validation", + "VK_LAYER_KHRONOS_validation", //"VK_EXT_debug_marker", #ifdef RENDER_DOC "VK_LAYER_RENDERDOC_Capture", // RenderDoc must be open for this layer to work! @@ -29,7 +30,7 @@ namespace openVulkanoCpp::Vulkan auto layers = vk::enumerateInstanceLayerProperties(); for (const auto& layer: layers) { - availableLayers.insert(layer.layerName); + availableLayers.insert(layer.layerName.data()); } Logger::RENDER->debug("Available Vulkan Validation Layers: {0}", fmt::join(availableLayers, ", ")); } diff --git a/openVulkanoCpp/Vulkan/RenderPass.hpp b/openVulkanoCpp/Vulkan/RenderPass.hpp index 211abd7..2eb3eb6 100644 --- a/openVulkanoCpp/Vulkan/RenderPass.hpp +++ b/openVulkanoCpp/Vulkan/RenderPass.hpp @@ -31,7 +31,7 @@ namespace openVulkanoCpp RenderPass() = default; - ~RenderPass() + ~RenderPass() override { if (frameBuffer) RenderPass::Close(); } diff --git a/openVulkanoCpp/Vulkan/Scene/IRecordable.hpp b/openVulkanoCpp/Vulkan/Scene/IRecordable.hpp index b9752c0..1c27b29 100644 --- a/openVulkanoCpp/Vulkan/Scene/IRecordable.hpp +++ b/openVulkanoCpp/Vulkan/Scene/IRecordable.hpp @@ -1,5 +1,12 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + #pragma once -#include "vulkan/vulkan.hpp" + +#include namespace openVulkanoCpp { @@ -12,4 +19,4 @@ namespace openVulkanoCpp virtual void Record(vk::CommandBuffer& cmdBuffer, uint32_t bufferId) = 0; }; } -} \ No newline at end of file +}