X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbackends%2Fvulkan%2Fbuffer_backend.cpp;h=5439548f886fd1d81ba0ac16181f12c4a213f28f;hb=6d2e2a0bb28496a8c25b441009bdd2a1a1e72d81;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..5439548f 100644
--- a/source/backends/vulkan/buffer_backend.cpp
+++ b/source/backends/vulkan/buffer_backend.cpp
@@ -37,7 +37,7 @@ void VulkanBuffer::allocate()
 
 	VkBufferCreateInfo buffer_info = { };
 	buffer_info.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO;
-	buffer_info.size = self.size;
+	buffer_info.size = self.get_total_size();
 	buffer_info.usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT|VK_BUFFER_USAGE_TRANSFER_DST_BIT|VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT|
 		VK_BUFFER_USAGE_INDEX_BUFFER_BIT|VK_BUFFER_USAGE_VERTEX_BUFFER_BIT;
 	buffer_info.sharingMode = VK_SHARING_MODE_EXCLUSIVE;
@@ -52,31 +52,30 @@ 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);
+}
+
+unsigned VulkanBuffer::get_multiplicity() const
+{
+	BufferUsage usage = static_cast<const Buffer *>(this)->usage;
+	return (usage==STREAMING ? device.get_n_frames_in_flight() : 1);
 }
 
 bool VulkanBuffer::can_map() const