X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbackends%2Fvulkan%2Fbuffer_backend.cpp;h=548f0a51b97e6420c2a92ff2567d275378fc79eb;hb=33253bf6d6a330181fda83ba23a6ac0a756d9a8d;hp=4207e87d35d96a4bde10ff3dc642eb02f9c90267;hpb=99ca354f18119f82f1adeca100cd665a8f640317;p=libs%2Fgl.git

diff --git a/source/backends/vulkan/buffer_backend.cpp b/source/backends/vulkan/buffer_backend.cpp
index 4207e87d..548f0a51 100644
--- a/source/backends/vulkan/buffer_backend.cpp
+++ b/source/backends/vulkan/buffer_backend.cpp
@@ -52,31 +52,24 @@ 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);
-	});
+	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