mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-27 09:16:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #98883 from ducklin5/fix/VkResultError

Browse Source 
Add vulkan error checks in command_queue_execute_and_present
This commit is contained in:
Thaddeus Crews 2024-11-10 12:12:41 -06:00
commit bbde4ed324
No known key found for this signature in database
GPG Key ID: 62181B86FE9E5D84
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/vulkan/rendering_device_driver_vulkan.cpp
View File

@ -2611,7 +2611,10 @@ Error RenderingDeviceDriverVulkan::command_queue_execute_and_present(CommandQueu
// it'll lead to very low performance in Android by entering an endless loop where it'll always resize the swap chain
// every frame.
ERR_FAIL_COND_V(err != VK_SUCCESS && err != VK_SUBOPTIMAL_KHR, FAILED);
ERR_FAIL_COND_V_MSG(
err != VK_SUCCESS && err != VK_SUBOPTIMAL_KHR,
FAILED,
"QueuePresentKHR failed with error: " + get_vulkan_result(err));
}
return OK;
@ -5434,6 +5437,23 @@ void RenderingDeviceDriverVulkan::print_lost_device_info() {
on_device_lost();
}
inline String RenderingDeviceDriverVulkan::get_vulkan_result(VkResult err) {
#if defined(DEBUG_ENABLED) || defined(DEV_ENABLED)
if (err == VK_ERROR_OUT_OF_HOST_MEMORY) {
return "VK_ERROR_OUT_OF_HOST_MEMORY";
} else if (err == VK_ERROR_OUT_OF_DEVICE_MEMORY) {
return "VK_ERROR_OUT_OF_DEVICE_MEMORY";
} else if (err == VK_ERROR_DEVICE_LOST) {
return "VK_ERROR_DEVICE_LOST";
} else if (err == VK_ERROR_SURFACE_LOST_KHR) {
return "VK_ERROR_SURFACE_LOST_KHR";
} else if (err == VK_ERROR_FULL_SCREEN_EXCLUSIVE_MODE_LOST_EXT) {
return "VK_ERROR_FULL_SCREEN_EXCLUSIVE_MODE_LOST_EXT";
}
#endif
return itos(err);
}
/********************/
/**** SUBMISSION ****/
/********************/

1
drivers/vulkan/rendering_device_driver_vulkan.h
View File

@ -655,6 +655,7 @@ public:
virtual void command_insert_breadcrumb(CommandBufferID p_cmd_buffer, uint32_t p_data) override final;
void print_lost_device_info();
void on_device_lost() const;
static String get_vulkan_result(VkResult err);
/********************/
/**** SUBMISSION ****/