asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #42909 from godotengine/revert-40849-zulauf_buffer_update_err_msg

Browse source 
Revert "Cause buffer_update to emit error if called during compute/draw list"
This commit is contained in:
Juan Linietsky 2020-10-19 17:00:31 -03:00 committed by GitHub
commit f83d7e67db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/vulkan/rendering_device_vulkan.cpp
View file

@ -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) { 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 //submitting may get chunked for various reasons, so convert this to a task
size_t to_submit = p_data_size; size_t to_submit = p_data_size;
size_t submit_from = 0; size_t submit_from = 0;