From 68b587bf64a26833d7f707f7c0d8ea6c4d8e2560 Mon Sep 17 00:00:00 2001
From: Alex Laptop <alexander.gauggel@web.de>
Date: Thu, 16 Sep 2021 15:45:21 +0200
Subject: [PATCH] [#114] Add separate macro for vulkan debug labels, so labels
can be used in Release mode
---
CMakeLists.txt | 3 +++
src/vkcv/Core.cpp | 10 +++++-----
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2a0858b9..5f82b94a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,6 +45,9 @@ endif()
# configure everything to use the required dependencies
include(${vkcv_config}/Libraries.cmake)
+# set macro to enable vulkan debug labels
+list(APPEND vkcv_definitions VULKAN_DEBUG_LABELS)
+
# set the compile definitions aka preprocessor variables
add_compile_definitions(${vkcv_definitions})
diff --git a/src/vkcv/Core.cpp b/src/vkcv/Core.cpp
index 00ea4a9f..88fc4794 100644
--- a/src/vkcv/Core.cpp
+++ b/src/vkcv/Core.cpp
@@ -443,7 +443,7 @@ namespace vkcv
void Core::recordBeginDebugLabel(const CommandStreamHandle &cmdStream,
const std::string& label,
const std::array<float, 4>& color) {
-#ifndef NDEBUG
+ #ifdef VULKAN_DEBUG_LABELS
static PFN_vkCmdBeginDebugUtilsLabelEXT beginDebugLabel = reinterpret_cast<PFN_vkCmdBeginDebugUtilsLabelEXT>(
m_Context.getDevice().getProcAddr("vkCmdBeginDebugUtilsLabelEXT")
);
@@ -462,11 +462,11 @@ namespace vkcv
};
recordCommandsToStream(cmdStream, submitFunction, nullptr);
-#endif
+ #endif
}
void Core::recordEndDebugLabel(const CommandStreamHandle &cmdStream) {
-#ifndef NDEBUG
+ #ifdef VULKAN_DEBUG_LABELS
static PFN_vkCmdEndDebugUtilsLabelEXT endDebugLabel = reinterpret_cast<PFN_vkCmdEndDebugUtilsLabelEXT>(
m_Context.getDevice().getProcAddr("vkCmdEndDebugUtilsLabelEXT")
);
@@ -480,7 +480,7 @@ namespace vkcv
};
recordCommandsToStream(cmdStream, submitFunction, nullptr);
-#endif
+ #endif
}
void Core::recordComputeIndirectDispatchToCmdStream(
@@ -864,7 +864,7 @@ namespace vkcv
static void setDebugObjectLabel(const vk::Device& device, const vk::ObjectType& type,
uint64_t handle, const std::string& label) {
-#ifndef NDEBUG
+#ifndef VULKAN_DEBUG_LABELS
static PFN_vkSetDebugUtilsObjectNameEXT setDebugLabel = reinterpret_cast<PFN_vkSetDebugUtilsObjectNameEXT>(
device.getProcAddr("vkSetDebugUtilsObjectNameEXT")
);
--
GitLab