X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbackends%2Fvulkan%2Fcommands_backend.cpp;h=6f5703f60d1c98ac7e9563dc8360638d082b11fb;hb=e4ae14435fa93ac1bcb13c6838b0ad3c923c8fde;hp=c2c86307f8bb668d3a3d8d13f06d050ae8e6bab6;hpb=644b81d62660bafa702bfd7acedd3a0039aad993;p=libs%2Fgl.git

diff --git a/source/backends/vulkan/commands_backend.cpp b/source/backends/vulkan/commands_backend.cpp
index c2c86307..6f5703f6 100644
--- a/source/backends/vulkan/commands_backend.cpp
+++ b/source/backends/vulkan/commands_backend.cpp
@@ -41,13 +41,20 @@ void VulkanCommands::begin_buffer()
 		current_pool->in_use = true;
 	}
 
-	VkCommandBufferAllocateInfo alloc_info = { };
-	alloc_info.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO;
-	alloc_info.commandPool = handle_cast<::VkCommandPool>(current_pool->pool);
-	alloc_info.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY;
-	alloc_info.commandBufferCount = 1;
+	if(current_pool->next_buffer>=current_pool->buffers.size())
+	{
+		VkCommandBufferAllocateInfo alloc_info = { };
+		alloc_info.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO;
+		alloc_info.commandPool = handle_cast<::VkCommandPool>(current_pool->pool);
+		alloc_info.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY;
+		alloc_info.commandBufferCount = 1;
+
+		VkCommandBuffer buffer;
+		vk.AllocateCommandBuffers(alloc_info, &buffer);
+		current_pool->buffers.push_back(buffer);
+	}
 
-	vk.AllocateCommandBuffers(alloc_info, &current_buffer);
+	current_buffer = current_pool->buffers[current_pool->next_buffer++];
 
 	VkCommandBufferBeginInfo begin_info = { };
 	begin_info.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO;
@@ -71,17 +78,20 @@ void VulkanCommands::begin_render_pass(bool clear, const ClearValue *clear_value
 
 	Synchronizer &sync = device.get_synchronizer();
 	sync.reset();
-	sync.barrier(current_buffer);
 
 	bool to_present = false;
 	unsigned n_attachments = framebuffer->get_format().size();
 	for(unsigned i=0; i<n_attachments; ++i)
-		if(dynamic_cast<const SwapChainTexture *>(framebuffer->VulkanFramebuffer::get_attachment(i)))
+		if(dynamic_cast<const SwapChainTexture *>(framebuffer->get_attachment(i)))
 			to_present = true;
+	if(!to_present)
+		framebuffer->synchronize(clear);
 	VkRenderPass render_pass = device.get_pipeline_cache().get_render_pass(framebuffer->get_format(), clear, !clear_values, to_present);
 
 	framebuffer->refresh();
 
+	sync.barrier(current_buffer);
+
 	VkRenderPassBeginInfo begin_info = { };
 	begin_info.sType = VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO;
 	begin_info.renderPass = handle_cast<::VkRenderPass>(render_pass);
@@ -155,6 +165,7 @@ void VulkanCommands::begin_frame(unsigned index)
 		current_pool->fence.wait();
 		vk.ResetCommandPool(current_pool->pool, 0);
 		current_pool->in_use = false;
+		current_pool->next_buffer = 0;
 	}
 }
 
@@ -195,8 +206,6 @@ void VulkanCommands::use_pipeline(const PipelineState *ps)
 			end_render_pass();
 
 	pipeline_state = ps;
-	if(pipeline_state)
-		pipeline_state->refresh();
 }
 
 void VulkanCommands::clear(const ClearValue *values)
@@ -222,6 +231,7 @@ void VulkanCommands::draw_instanced(const Batch &batch, unsigned count)
 	if(!framebuffer)
 		 begin_render_pass(false, 0);
 
+	pipeline_state->refresh();
 	pipeline_state->apply(current_buffer);
 	unsigned first_index = batch.get_offset()/batch.get_index_size();
 	vk.CmdDrawIndexed(current_buffer, batch.size(), count, first_index, 0, 0);