remove USE_VALIDATION_LAYERS

KhronosGroup · Aug 28, 2023 · 8b0b919 · 8b0b919
1 parent 3391f22
commit 8b0b919
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 22 deletions.
diff --git a/framework/core/hpp_instance.cpp b/framework/core/hpp_instance.cpp
@@ -22,22 +22,18 @@
 #include <volk.h>
 
 #if defined(VKB_DEBUG) || defined(VKB_VALIDATION_LAYERS)
-#	define USE_VALIDATION_LAYERS 1
+#	define USE_VALIDATION_LAYERS
 #endif
 
 #if defined(USE_VALIDATION_LAYERS) && (defined(VKB_VALIDATION_LAYERS_GPU_ASSISTED) || defined(VKB_VALIDATION_LAYERS_BEST_PRACTICES) || defined(VKB_VALIDATION_LAYERS_SYNCHRONIZATION))
-#	define USE_VALIDATION_LAYER_FEATURES 1
-#endif
-
-#ifdef USE_VALIDATION_LAYERS
-#	define USE_VULKAN_LOGGER
+#	define USE_VALIDATION_LAYER_FEATURES
 #endif
 
 namespace vkb
 {
 namespace
 {
-#ifdef USE_VULKAN_LOGGER
+#ifdef USE_VALIDATION_LAYERS
 VKAPI_ATTR VkBool32 VKAPI_CALL debug_utils_messenger_callback(VkDebugUtilsMessageSeverityFlagBitsEXT message_severity, VkDebugUtilsMessageTypeFlagsEXT message_type,
                                                               const VkDebugUtilsMessengerCallbackDataEXT *callback_data,
                                                               void                                       *user_data)
@@ -193,7 +189,7 @@ HPPInstance::HPPInstance(const std::string                            &applicati
 {
 	std::vector<vk::ExtensionProperties> available_instance_extensions = vk::enumerateInstanceExtensionProperties();
 
-#ifdef USE_VULKAN_LOGGER
+#ifdef USE_VALIDATION_LAYERS
 	// Check if VK_EXT_debug_utils is supported, which supersedes VK_EXT_Debug_Report
 	const bool has_debug_utils  = enable_extension(VK_EXT_DEBUG_UTILS_EXTENSION_NAME,
 	                                               available_instance_extensions, enabled_extensions);
@@ -305,7 +301,7 @@ HPPInstance::HPPInstance(const std::string                            &applicati
 
 	vk::InstanceCreateInfo instance_info({}, &app_info, requested_validation_layers, enabled_extensions);
 
-#ifdef USE_VULKAN_LOGGER
+#ifdef USE_VALIDATION_LAYERS
 	vk::DebugUtilsMessengerCreateInfoEXT debug_utils_create_info;
 	vk::DebugReportCallbackCreateInfoEXT debug_report_create_info;
 	if (has_debug_utils)
@@ -358,7 +354,7 @@ HPPInstance::HPPInstance(const std::string                            &applicati
 	// Need to load volk for all the not-yet Vulkan-Hpp calls
 	volkLoadInstance(handle);
 
-#ifdef USE_VULKAN_LOGGER
+#ifdef USE_VALIDATION_LAYERS
 	if (has_debug_utils)
 	{
 		debug_utils_messenger = handle.createDebugUtilsMessengerEXT(debug_utils_create_info);
@@ -387,7 +383,7 @@ HPPInstance::HPPInstance(vk::Instance instance) :
 
 HPPInstance::~HPPInstance()
 {
-#ifdef USE_VULKAN_LOGGER
+#ifdef USE_VALIDATION_LAYERS
 	if (debug_utils_messenger)
 	{
 		handle.destroyDebugUtilsMessengerEXT(debug_utils_messenger);

diff --git a/framework/core/instance.cpp b/framework/core/instance.cpp
@@ -23,22 +23,18 @@
 #include <functional>
 
 #if defined(VKB_DEBUG) || defined(VKB_VALIDATION_LAYERS)
-#	define USE_VALIDATION_LAYERS 1
+#	define USE_VALIDATION_LAYERS
 #endif
 
 #if defined(USE_VALIDATION_LAYERS) && (defined(VKB_VALIDATION_LAYERS_GPU_ASSISTED) || defined(VKB_VALIDATION_LAYERS_BEST_PRACTICES) || defined(VKB_VALIDATION_LAYERS_SYNCHRONIZATION))
-#	define USE_VALIDATION_LAYER_FEATURES 1
-#endif
-
-#ifdef USE_VALIDATION_LAYERS
-#	define USE_VULKAN_LOGGER
+#	define USE_VALIDATION_LAYER_FEATURES
 #endif
 
 namespace vkb
 {
 namespace
 {
-#ifdef USE_VULKAN_LOGGER
+#ifdef USE_VALIDATION_LAYERS
 
 VKAPI_ATTR VkBool32 VKAPI_CALL debug_utils_messenger_callback(VkDebugUtilsMessageSeverityFlagBitsEXT message_severity, VkDebugUtilsMessageTypeFlagsEXT message_type,
                                                               const VkDebugUtilsMessengerCallbackDataEXT *callback_data,
@@ -197,7 +193,7 @@ Instance::Instance(const std::string                            &application_nam
 	std::vector<VkExtensionProperties> available_instance_extensions(instance_extension_count);
 	VK_CHECK(vkEnumerateInstanceExtensionProperties(nullptr, &instance_extension_count, available_instance_extensions.data()));
 
-#ifdef USE_VULKAN_LOGGER
+#ifdef USE_VALIDATION_LAYERS
 	// Check if VK_EXT_debug_utils is supported, which supersedes VK_EXT_Debug_Report
 	const bool has_debug_utils  = enable_extension(VK_EXT_DEBUG_UTILS_EXTENSION_NAME,
 	                                               available_instance_extensions, enabled_extensions);
@@ -331,7 +327,7 @@ Instance::Instance(const std::string                            &application_nam
 	instance_info.enabledLayerCount   = to_u32(requested_validation_layers.size());
 	instance_info.ppEnabledLayerNames = requested_validation_layers.data();
 
-#ifdef USE_VULKAN_LOGGER
+#ifdef USE_VALIDATION_LAYERS
 	VkDebugUtilsMessengerCreateInfoEXT debug_utils_create_info  = {VK_STRUCTURE_TYPE_DEBUG_UTILS_MESSENGER_CREATE_INFO_EXT};
 	VkDebugReportCallbackCreateInfoEXT debug_report_create_info = {VK_STRUCTURE_TYPE_DEBUG_REPORT_CREATE_INFO_EXT};
 	if (has_debug_utils)
@@ -388,7 +384,7 @@ Instance::Instance(const std::string                            &application_nam
 
 	volkLoadInstance(handle);
 
-#ifdef USE_VULKAN_LOGGER
+#ifdef USE_VALIDATION_LAYERS
 	if (has_debug_utils)
 	{
 		result = vkCreateDebugUtilsMessengerEXT(handle, &debug_utils_create_info, nullptr, &debug_utils_messenger);
@@ -425,7 +421,7 @@ Instance::Instance(VkInstance instance) :
 
 Instance::~Instance()
 {
-#ifdef USE_VULKAN_LOGGER
+#ifdef USE_VALIDATION_LAYERS
 	if (debug_utils_messenger != VK_NULL_HANDLE)
 	{
 		vkDestroyDebugUtilsMessengerEXT(handle, debug_utils_messenger, nullptr);