X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbackends%2Fvulkan%2Fsynchronizer.cpp;h=28488fd0d28ad81188fe882b7e2c81ede29ebc59;hb=1b4d387b74b2108f3926796d8115bee134fbf7f1;hp=93f48b847f9290cc456d06fe4d108bea1068bf2b;hpb=d011ee2084d610c711ab7ed82e1f7a2337f6cba2;p=libs%2Fgl.git

diff --git a/source/backends/vulkan/synchronizer.cpp b/source/backends/vulkan/synchronizer.cpp
index 93f48b84..28488fd0 100644
--- a/source/backends/vulkan/synchronizer.cpp
+++ b/source/backends/vulkan/synchronizer.cpp
@@ -15,7 +15,7 @@ Synchronizer::Synchronizer(Device &d):
 	device(d)
 { }
 
-void Synchronizer::write_buffer(VkBuffer buffer, size_t offset, size_t size)
+void Synchronizer::write_buffer(VkBuffer buffer, size_t offset, size_t size, bool mapped)
 {
 	auto i = lower_bound_member(buffer_accesses, buffer, &BufferAccess::buffer);
 	if(i==buffer_accesses.end() || i->buffer!=buffer)
@@ -33,6 +33,8 @@ void Synchronizer::write_buffer(VkBuffer buffer, size_t offset, size_t size)
 		i->size = end-begin;
 	}
 
+	if(mapped)
+		i->was_written = true;
 	i->pending_write = true;
 }
 
@@ -119,10 +121,8 @@ void Synchronizer::reset()
 		i.pending_layout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
 }
 
-void Synchronizer::barrier(VkCommandBuffer command_buffer)
+void Synchronizer::barrier(const VulkanCommandRecorder &vkCmd)
 {
-	const VulkanFunctions &vk = device.get_functions();
-
 	if(buffer_accesses.empty() && image_accesses.empty())
 		return;
 
@@ -131,7 +131,8 @@ void Synchronizer::barrier(VkCommandBuffer command_buffer)
 
 	static constexpr VkPipelineStageFlags buffer_read_stages = VK_PIPELINE_STAGE_VERTEX_INPUT_BIT|
 		VK_PIPELINE_STAGE_VERTEX_SHADER_BIT|VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT;
-	static constexpr VkPipelineStageFlags buffer_write_stages = VK_PIPELINE_STAGE_TRANSFER_BIT;
+	static constexpr VkPipelineStageFlags buffer_write_stages = VK_PIPELINE_STAGE_TRANSFER_BIT|
+		VK_PIPELINE_STAGE_HOST_BIT;
 
 	vector<VkBufferMemoryBarrier> buffer_barriers;
 	buffer_barriers.reserve(buffer_accesses.size());
@@ -198,7 +199,7 @@ void Synchronizer::barrier(VkCommandBuffer command_buffer)
 	if(!dst_stage)
 		dst_stage = VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT;
 
-	vk.CmdPipelineBarrier(command_buffer, src_stage, dst_stage, 0, 0, 0,
+	vkCmd.PipelineBarrier(src_stage, dst_stage, 0, 0, 0,
 		buffer_barriers.size(), buffer_barriers.data(), image_barriers.size(), image_barriers.data());
 
 	for(auto i=buffer_accesses.begin(); i!=buffer_accesses.end(); )