Use another callback for pre-transfer synchronization

[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 4207e87d35d96a4bde10ff3dc642eb02f9c90267..14164daf208a8b67f4fdba00284b10df2d2aedc3 100644 (file)
--- a/source/backends/vulkan/buffer_backend.cpp
+++ b/source/backends/vulkan/buffer_backend.cpp
@@ -52,28 +52,19 @@ void VulkanBuffer::allocate()
 
 void VulkanBuffer::sub_data(size_t off, size_t sz, const void *d)
 {
-       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);
-
-               VkBufferMemoryBarrier barrier = { };
-               barrier.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER;
-               barrier.srcAccessMask = VK_ACCESS_MEMORY_WRITE_BIT;
-               barrier.dstAccessMask = VK_ACCESS_MEMORY_READ_BIT;
-               barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
-               barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
-               barrier.buffer = handle_cast<::VkBuffer>(handle);
-               barrier.offset = off;
-               barrier.size = sz;
-
-               vk.CmdPipelineBarrier(cmd_buf, VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
-                       0, 0, 0, 1, &barrier, 0, 0);
-       });
+       void *staging = device.get_transfer_queue().prepare_transfer(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));