From fa6fb0ac70b2831c1a178377ee167dd211569283 Mon Sep 17 00:00:00 2001 From: Joe Marshall Date: Wed, 28 Jun 2023 13:50:25 +0100 Subject: [PATCH] fix threading bug in vulkan rendering device (cherry picked from commit c52fadbe7597c8a23e4ed692a3f31512a54ee904) --- drivers/vulkan/rendering_device_vulkan.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/vulkan/rendering_device_vulkan.cpp b/drivers/vulkan/rendering_device_vulkan.cpp index 0832a07f51d..23c69198544 100644 --- a/drivers/vulkan/rendering_device_vulkan.cpp +++ b/drivers/vulkan/rendering_device_vulkan.cpp @@ -7470,6 +7470,7 @@ uint32_t RenderingDeviceVulkan::draw_list_get_current_pass() { } RenderingDevice::DrawListID RenderingDeviceVulkan::draw_list_switch_to_next_pass() { + _THREAD_SAFE_METHOD_ ERR_FAIL_COND_V(draw_list == nullptr, INVALID_ID); ERR_FAIL_COND_V(draw_list_current_subpass >= draw_list_subpass_count - 1, INVALID_FORMAT_ID); @@ -7485,6 +7486,7 @@ RenderingDevice::DrawListID RenderingDeviceVulkan::draw_list_switch_to_next_pass return int64_t(ID_TYPE_DRAW_LIST) << ID_BASE_SHIFT; } Error RenderingDeviceVulkan::draw_list_switch_to_next_pass_split(uint32_t p_splits, DrawListID *r_split_ids) { + _THREAD_SAFE_METHOD_ ERR_FAIL_COND_V(draw_list == nullptr, ERR_INVALID_PARAMETER); ERR_FAIL_COND_V(draw_list_current_subpass >= draw_list_subpass_count - 1, ERR_INVALID_PARAMETER);