Sligthly rework validation layer logging to tet file
This commit is contained in:
parent
2e6bf58914
commit
d34494602c
10 changed files with 47 additions and 26 deletions
|
|
@ -14,6 +14,7 @@ namespace vks
|
|||
namespace debug
|
||||
{
|
||||
bool logToFile{ false };
|
||||
std::string logFileName{ "validation_output.txt" };
|
||||
|
||||
PFN_vkCreateDebugUtilsMessengerEXT vkCreateDebugUtilsMessengerEXT;
|
||||
PFN_vkDestroyDebugUtilsMessengerEXT vkDestroyDebugUtilsMessengerEXT;
|
||||
|
|
@ -31,25 +32,33 @@ namespace vks
|
|||
if (messageSeverity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_VERBOSE_BIT_EXT) {
|
||||
prefix = "VERBOSE: ";
|
||||
#if defined(_WIN32)
|
||||
prefix = "\033[32m" + prefix + "\033[0m";
|
||||
if (!logToFile) {
|
||||
prefix = "\033[32m" + prefix + "\033[0m";
|
||||
}
|
||||
#endif
|
||||
}
|
||||
else if (messageSeverity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_INFO_BIT_EXT) {
|
||||
prefix = "INFO: ";
|
||||
#if defined(_WIN32)
|
||||
prefix = "\033[36m" + prefix + "\033[0m";
|
||||
if (!logToFile) {
|
||||
prefix = "\033[36m" + prefix + "\033[0m";
|
||||
}
|
||||
#endif
|
||||
}
|
||||
else if (messageSeverity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT) {
|
||||
prefix = "WARNING: ";
|
||||
#if defined(_WIN32)
|
||||
prefix = "\033[33m" + prefix + "\033[0m";
|
||||
if (!logToFile) {
|
||||
prefix = "\033[33m" + prefix + "\033[0m";
|
||||
}
|
||||
#endif
|
||||
}
|
||||
else if (messageSeverity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT) {
|
||||
prefix = "ERROR: ";
|
||||
#if defined(_WIN32)
|
||||
prefix = "\033[31m" + prefix + "\033[0m";
|
||||
if (!logToFile) {
|
||||
prefix = "\033[31m" + prefix + "\033[0m";
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
@ -76,10 +85,7 @@ namespace vks
|
|||
std::cout << debugMessage.str() << "\n\n";
|
||||
}
|
||||
if (logToFile) {
|
||||
std::ofstream logfile;
|
||||
logfile.open("validation.txt", std::ios_base::app);
|
||||
logfile << debugMessage.str() << std::endl;
|
||||
logfile.close();
|
||||
log(debugMessage.str());
|
||||
}
|
||||
fflush(stdout);
|
||||
#endif
|
||||
|
|
@ -99,6 +105,18 @@ namespace vks
|
|||
debugUtilsMessengerCI.pfnUserCallback = debugUtilsMessageCallback;
|
||||
}
|
||||
|
||||
void log(std::string message)
|
||||
{
|
||||
if (logToFile) {
|
||||
time_t timestamp;
|
||||
time(×tamp);
|
||||
std::ofstream logfile;
|
||||
logfile.open(logFileName, std::ios_base::app);
|
||||
logfile << strtok(ctime(×tamp), "\n") << ": " << message << std::endl;
|
||||
logfile.close();
|
||||
}
|
||||
}
|
||||
|
||||
void setupDebugging(VkInstance instance)
|
||||
{
|
||||
vkCreateDebugUtilsMessengerEXT = reinterpret_cast<PFN_vkCreateDebugUtilsMessengerEXT>(vkGetInstanceProcAddr(instance, "vkCreateDebugUtilsMessengerEXT"));
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@ namespace vks
|
|||
namespace debug
|
||||
{
|
||||
extern bool logToFile;
|
||||
extern std::string logFileName;
|
||||
|
||||
// Default debug callback
|
||||
VKAPI_ATTR VkBool32 VKAPI_CALL debugUtilsMessageCallback(
|
||||
|
|
@ -49,6 +50,7 @@ namespace vks
|
|||
void freeDebugCallback(VkInstance instance);
|
||||
// Used to populate a VkDebugUtilsMessengerCreateInfoEXT with our example messenger function and desired flags
|
||||
void setupDebugingMessengerCreateInfo(VkDebugUtilsMessengerCreateInfoEXT& debugUtilsMessengerCI);
|
||||
void log(std::string message);
|
||||
}
|
||||
|
||||
// Wrapper for the VK_EXT_debug_utils extension
|
||||
|
|
|
|||
|
|
@ -802,7 +802,7 @@ VulkanExampleBase::VulkanExampleBase()
|
|||
// Command line arguments
|
||||
commandLineParser.add("help", { "--help" }, 0, "Show help");
|
||||
commandLineParser.add("validation", { "-v", "--validation" }, 0, "Enable validation layers");
|
||||
commandLineParser.add("validationlog", { "-vl", "--validationlog" }, 0, "Log validation messages to a textfile (validation.txt)");
|
||||
commandLineParser.add("validationlogfile", { "-vl", "--validationlogfile" }, 0, "Log validation messages to a textfile");
|
||||
commandLineParser.add("vsync", { "-vs", "--vsync" }, 0, "Enable V-Sync");
|
||||
commandLineParser.add("fullscreen", { "-f", "--fullscreen" }, 0, "Start in fullscreen mode");
|
||||
commandLineParser.add("width", { "-w", "--width" }, 1, "Set window width");
|
||||
|
|
@ -831,12 +831,8 @@ VulkanExampleBase::VulkanExampleBase()
|
|||
if (commandLineParser.isSet("validation")) {
|
||||
settings.validation = true;
|
||||
}
|
||||
if (commandLineParser.isSet("validationlog")) {
|
||||
if (commandLineParser.isSet("validationlogfile")) {
|
||||
vks::debug::logToFile = true;
|
||||
std::ofstream logfile;
|
||||
logfile.open("validation.txt", std::ios_base::app);
|
||||
logfile << std::endl << "Sample: " << name << std::endl;
|
||||
logfile.close();
|
||||
}
|
||||
if (commandLineParser.isSet("vsync")) {
|
||||
settings.vsync = true;
|
||||
|
|
@ -1034,6 +1030,11 @@ bool VulkanExampleBase::initVulkan()
|
|||
this->settings.validation = true;
|
||||
#endif
|
||||
|
||||
// Validation messages can be stored, e.g. to be used in external tools like CI/CD
|
||||
if (commandLineParser.isSet("validationlogfile")) {
|
||||
vks::debug::log("Sample: " + title);
|
||||
}
|
||||
|
||||
// Create the instance
|
||||
VkResult result = createInstance();
|
||||
if (result != VK_SUCCESS) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue