X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbackends%2Fvulkan%2Fcommands_backend.cpp;h=d55a4dfdbad3095bc253f57820f9bfa37a10c775;hb=8ab7589d65c4f8ca799f2a6886d128f4c36ff046;hp=54282c36b675235e9b642c099bf8b588adb40d0c;hpb=a16145549dc87c3b12671f797bd77b14bcc7786b;p=libs%2Fgl.git

diff --git a/source/backends/vulkan/commands_backend.cpp b/source/backends/vulkan/commands_backend.cpp
index 54282c36..d55a4dfd 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;
@@ -78,7 +85,7 @@ void VulkanCommands::begin_render_pass(bool clear, const ClearValue *clear_value
 		if(dynamic_cast<const SwapChainTexture *>(framebuffer->get_attachment(i)))
 			to_present = true;
 	if(!to_present)
-		framebuffer->synchronize(clear);
+		framebuffer->prepare_image_layouts(clear);
 	VkRenderPass render_pass = device.get_pipeline_cache().get_render_pass(framebuffer->get_format(), clear, !clear_values, to_present);
 
 	framebuffer->refresh();
@@ -158,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;
 	}
 }