sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move Vulkan debug callback to module

Browse Source
This commit is contained in:
Lynix
2020-04-13 15:12:58 +02:00
parent 7447875753
commit e905c3a004
11 changed files with 366 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
examples/VulkanTest/main.cpp
View File

@@ -6,32 +6,8 @@
#include <array>
#include <iostream>
VKAPI_ATTR VkBool32 VKAPI_CALL MyDebugReportCallback(
VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity,
VkDebugUtilsMessageTypeFlagsEXT messageTypes,
const VkDebugUtilsMessengerCallbackDataEXT* pCallbackData,
void* pUserData)
{
if (pCallbackData->messageIdNumber != 0)
std::cerr << "#" << pCallbackData->messageIdNumber << " " << pCallbackData->messageIdNumber << ": ";
std::cerr << pCallbackData->pMessage << std::endl;
return VK_FALSE;
}
int main()
{
Nz::ParameterList params;
params.SetParameter("VkInstanceInfo_EnabledExtensionCount", 1LL);
params.SetParameter("VkInstanceInfo_EnabledExtension0", "VK_EXT_debug_report");
params.SetParameter("VkDeviceInfo_EnabledLayerCount", 1LL);
params.SetParameter("VkDeviceInfo_EnabledLayer0", "VK_LAYER_LUNARG_standard_validation");
params.SetParameter("VkInstanceInfo_EnabledLayerCount", 1LL);
params.SetParameter("VkInstanceInfo_EnabledLayer0", "VK_LAYER_LUNARG_standard_validation");
Nz::Renderer::SetParameters(params);
Nz::Initializer<Nz::Renderer> loader;
if (!loader)
{
@@ -39,31 +15,6 @@ int main()
return __LINE__;
}
Nz::Vk::Instance& instance = Nz::Vulkan::GetInstance();
VkDebugUtilsMessengerCreateInfoEXT callbackCreateInfo = { VK_STRUCTURE_TYPE_DEBUG_UTILS_MESSENGER_CREATE_INFO_EXT };
callbackCreateInfo.messageSeverity = VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT | VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT | VK_DEBUG_UTILS_MESSAGE_SEVERITY_INFO_BIT_EXT | VK_DEBUG_UTILS_MESSAGE_SEVERITY_VERBOSE_BIT_EXT;
callbackCreateInfo.messageType = VK_DEBUG_UTILS_MESSAGE_TYPE_GENERAL_BIT_EXT | VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT | VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT;
callbackCreateInfo.pfnUserCallback = &MyDebugReportCallback;
/* Register the callback */
VkDebugUtilsMessengerEXT callback;
instance.vkCreateDebugUtilsMessengerEXT(instance, &callbackCreateInfo, nullptr, &callback);
std::vector<VkLayerProperties> layerProperties;
if (!Nz::Vk::Loader::EnumerateInstanceLayerProperties(&layerProperties))
{
NazaraError("Failed to enumerate instance layer properties");
return __LINE__;
}
for (const VkLayerProperties& properties : layerProperties)
{
std::cout << properties.layerName << ": \t" << properties.description << std::endl;
}
Nz::RenderWindow window;
Nz::MeshParams meshParams;
@@ -370,7 +321,5 @@ int main()
}
}
instance.vkDestroyDebugUtilsMessengerEXT(instance, callback, nullptr);
return EXIT_SUCCESS;
}