summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2020-10-19 17:00:31 -0300
committerGitHub <noreply@github.com>2020-10-19 17:00:31 -0300
commitf83d7e67db27175d994439da80fcc0bf46acfbbf (patch)
treeeee55ca15d74153d9d43e3ebecbc75098b89f4c0
parent5d120f9ffb85c2edd4d648a5323a997e96284257 (diff)
parent791b259a635360f25fc6cb7ff23c8be68ab88bf4 (diff)
Merge pull request #42909 from godotengine/revert-40849-zulauf_buffer_update_err_msg
Revert "Cause buffer_update to emit error if called during compute/draw list"
-rw-r--r--drivers/vulkan/rendering_device_vulkan.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/vulkan/rendering_device_vulkan.cpp b/drivers/vulkan/rendering_device_vulkan.cpp
index 08aadb82af..a01f63caae 100644
--- a/drivers/vulkan/rendering_device_vulkan.cpp
+++ b/drivers/vulkan/rendering_device_vulkan.cpp
@@ -1542,10 +1542,6 @@ Error RenderingDeviceVulkan::_staging_buffer_allocate(uint32_t p_amount, uint32_
}
Error RenderingDeviceVulkan::_buffer_update(Buffer *p_buffer, size_t p_offset, const uint8_t *p_data, size_t p_data_size, bool p_use_draw_command_buffer, uint32_t p_required_align) {
- // Buffer update not valid during draw or compute lists
- ERR_FAIL_COND_V_MSG(draw_list != nullptr, ERR_BUG, "Buffer update not valid when draw list is active.");
- ERR_FAIL_COND_V_MSG(compute_list != nullptr, ERR_BUG, "Buffer update not valid when compute list is active.");
-
//submitting may get chunked for various reasons, so convert this to a task
size_t to_submit = p_data_size;
size_t submit_from = 0;