Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
398f714d
Unverified
Commit
398f714d
authored
Mar 04, 2020
by
Rémi Verschelde
Committed by
GitHub
Mar 04, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #36792 from akien-mga/vulkan-better-debug-prints
Vulkan: Use Godot print macros matching MessageSeverity flag
parents
fadcb75e
3625b057
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
22 additions
and
24 deletions
+22
-24
vulkan_context.cpp
drivers/vulkan/vulkan_context.cpp
+22
-24
No files found.
drivers/vulkan/vulkan_context.cpp
View file @
398f714d
...
...
@@ -44,7 +44,8 @@
#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
#define APP_SHORT_NAME "GodotEngine"
VKAPI_ATTR
VkBool32
VKAPI_CALL
VulkanContext
::
_debug_messenger_callback
(
VkDebugUtilsMessageSeverityFlagBitsEXT
messageSeverity
,
VKAPI_ATTR
VkBool32
VKAPI_CALL
VulkanContext
::
_debug_messenger_callback
(
VkDebugUtilsMessageSeverityFlagBitsEXT
messageSeverity
,
VkDebugUtilsMessageTypeFlagsEXT
messageType
,
const
VkDebugUtilsMessengerCallbackDataEXT
*
pCallbackData
,
void
*
pUserData
)
{
...
...
@@ -67,24 +68,6 @@ VKAPI_ATTR VkBool32 VKAPI_CALL VulkanContext::_debug_messenger_callback(VkDebugU
return
VK_FALSE
;
}
String
severity_string
;
switch
(
messageSeverity
)
{
case
VK_DEBUG_UTILS_MESSAGE_SEVERITY_VERBOSE_BIT_EXT
:
severity_string
=
"VERBOSE : "
;
break
;
case
VK_DEBUG_UTILS_MESSAGE_SEVERITY_INFO_BIT_EXT
:
severity_string
=
"INFO : "
;
break
;
case
VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT
:
severity_string
=
"WARNING : "
;
break
;
case
VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT
:
severity_string
=
"ERROR : "
;
break
;
case
VK_DEBUG_UTILS_MESSAGE_SEVERITY_FLAG_BITS_MAX_ENUM_EXT
:
break
;
}
String
type_string
;
switch
(
messageType
)
{
case
(
VK_DEBUG_UTILS_MESSAGE_TYPE_GENERAL_BIT_EXT
):
...
...
@@ -133,16 +116,31 @@ VKAPI_ATTR VkBool32 VKAPI_CALL VulkanContext::_debug_messenger_callback(VkDebugU
}
}
String
error_message
(
severity_string
+
type_string
+
String
error_message
(
type_string
+
" - Message Id Number: "
+
String
::
num_int64
(
pCallbackData
->
messageIdNumber
)
+
" | Message Id Name: "
+
pCallbackData
->
pMessageIdName
+
"
\n\t
"
+
pCallbackData
->
pMessage
+
objects_string
+
labels_string
);
ERR_PRINT
(
error_message
);
CRASH_COND_MSG
(
Engine
::
get_singleton
()
->
is_abort_on_gpu_errors_enabled
(),
"Crashing, because abort on GPU errors is enabled."
);
// Convert VK severity to our own log macros.
switch
(
messageSeverity
)
{
case
VK_DEBUG_UTILS_MESSAGE_SEVERITY_VERBOSE_BIT_EXT
:
print_verbose
(
error_message
);
break
;
case
VK_DEBUG_UTILS_MESSAGE_SEVERITY_INFO_BIT_EXT
:
print_line
(
error_message
);
break
;
case
VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT
:
WARN_PRINT
(
error_message
);
break
;
case
VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT
:
ERR_PRINT
(
error_message
);
CRASH_COND_MSG
(
Engine
::
get_singleton
()
->
is_abort_on_gpu_errors_enabled
(),
"Crashing, because abort on GPU errors is enabled."
);
break
;
case
VK_DEBUG_UTILS_MESSAGE_SEVERITY_FLAG_BITS_MAX_ENUM_EXT
:
break
;
// Shouldn't happen, only handling to make compilers happy.
}
return
VK_FALSE
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment