Refactor TransferQueue to require explicit finalization of transfers

[libs/gl.git] / source / backends / vulkan / buffer_backend.cpp

diff --git a/source/backends/vulkan/buffer_backend.cpp b/source/backends/vulkan/buffer_backend.cpp
index 29dd15ef363fa26fe36794e3d1a877bc821cb996..548f0a51b97e6420c2a92ff2567d275378fc79eb 100644 (file)
--- a/source/backends/vulkan/buffer_backend.cpp
+++ b/source/backends/vulkan/buffer_backend.cpp
@@ -52,20 +52,24 @@ void VulkanBuffer::allocate()
 
 void VulkanBuffer::sub_data(size_t off, size_t sz, const void *d)
 {
-       device.get_synchronizer().access(handle, off, sz);
-
-       void *staging = device.get_transfer_queue().prepare_transfer(sz, [this, off, sz](VkCommandBuffer cmd_buf, VkBuffer staging_buf, size_t src_off){
-               const VulkanFunctions &vk = device.get_functions();
-
-               VkBufferCopy region = { };
-               region.srcOffset = src_off;
-               region.dstOffset = off;
-               region.size = sz;
-               vk.CmdCopyBuffer(cmd_buf, staging_buf, handle, 1, &region);
-       });
+       TransferQueue &tq = device.get_transfer_queue();
+       void *staging = tq.prepare_transfer(this, false, sz,
+               [this, off, sz](){
+                       device.get_synchronizer().write_buffer(handle, off, sz);
+               },
+               [this, off, sz](VkCommandBuffer cmd_buf, VkBuffer staging_buf, size_t src_off){
+                       const VulkanFunctions &vk = device.get_functions();
+
+                       VkBufferCopy region = { };
+                       region.srcOffset = src_off;
+                       region.dstOffset = off;
+                       region.size = sz;
+                       vk.CmdCopyBuffer(cmd_buf, staging_buf, handle, 1, &region);
+               });
 
        const char *src = static_cast<const char *>(d);
        copy(src, src+sz, static_cast<char *>(staging));
+       tq.finalize_transfer(staging);
 }
 
 bool VulkanBuffer::can_map() const