X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbackends%2Fvulkan%2Fcommands_backend.cpp;h=13acd8a38495baa6091afe43beb1a07ae0af7216;hb=03937c4f58465cb0fe7492feb17f19e81eee6abb;hp=bf8ee3f13d5652c21a14db09ff1e077e016740cc;hpb=6d2e2a0bb28496a8c25b441009bdd2a1a1e72d81;p=libs%2Fgl.git

diff --git a/source/backends/vulkan/commands_backend.cpp b/source/backends/vulkan/commands_backend.cpp
index bf8ee3f1..13acd8a3 100644
--- a/source/backends/vulkan/commands_backend.cpp
+++ b/source/backends/vulkan/commands_backend.cpp
@@ -36,20 +36,20 @@ void VulkanCommands::begin_buffer(VkRenderPass render_pass)
 
 	const VulkanFunctions &vk = device.get_functions();
 
-	CommandPool *current_pool = &command_pools[frame_index];
-	if(!current_pool->in_use)
+	CommandPool &current_pool = command_pools[frame_index];
+	if(!current_pool.in_use)
 	{
-		current_pool->fence.reset();
-		current_pool->in_use = true;
+		current_pool.fence.reset();
+		current_pool.in_use = true;
 	}
 
-	CommandBuffers &buffers = (render_pass ? current_pool->secondary : current_pool->primary);
+	CommandBuffers &buffers = (render_pass ? current_pool.secondary : current_pool.primary);
 
 	if(buffers.next_buffer>=buffers.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.commandPool = handle_cast<::VkCommandPool>(current_pool.pool);
 		alloc_info.level = (render_pass ? VK_COMMAND_BUFFER_LEVEL_SECONDARY : VK_COMMAND_BUFFER_LEVEL_PRIMARY);
 		alloc_info.commandBufferCount = 1;
 
@@ -78,6 +78,7 @@ void VulkanCommands::begin_buffer(VkRenderPass render_pass)
 	}
 
 	vk.BeginCommandBuffer(buffer, begin_info);
+	last_pipeline = 0;
 }
 
 void VulkanCommands::begin_render_pass(bool clear, const ClearValue *clear_values)
@@ -97,11 +98,15 @@ void VulkanCommands::begin_render_pass(bool clear, const ClearValue *clear_value
 		if(dynamic_cast<const SwapChainTexture *>(framebuffer->get_attachment(i)))
 			fb_is_swapchain = true;
 
-	discard_fb_contents = (clear && !viewport);
+	Rect fb_rect = framebuffer->get_rect();
+	Rect render_area = fb_rect.intersect(viewport);
+	bool full_viewport = render_area==fb_rect;
+	discard_fb_contents = (clear && full_viewport);
 
 	framebuffer->refresh();
 
-	VkRenderPass render_pass = device.get_pipeline_cache().get_render_pass(framebuffer->get_format(), clear, (!clear_values && !viewport), fb_is_swapchain);
+	VkRenderPass render_pass = device.get_pipeline_cache().get_render_pass(framebuffer->get_format(),
+		clear, (!clear_values && full_viewport), fb_is_swapchain);
 	begin_buffer(render_pass);
 
 	StructureBuilder sb(pass_begin_info, 2);
@@ -112,18 +117,10 @@ void VulkanCommands::begin_render_pass(bool clear, const ClearValue *clear_value
 	begin_info->renderPass = handle_cast<::VkRenderPass>(render_pass);
 	begin_info->framebuffer = handle_cast<::VkFramebuffer>(framebuffer->handle);
 
-	if(viewport)
-	{
-		begin_info->renderArea.offset.x = viewport->left;
-		begin_info->renderArea.offset.y = viewport->bottom;
-		begin_info->renderArea.extent.width = viewport->width;
-		begin_info->renderArea.extent.height = viewport->height;
-	}
-	else
-	{
-		begin_info->renderArea.extent.width = framebuffer->get_width();
-		begin_info->renderArea.extent.height = framebuffer->get_height();
-	}
+	begin_info->renderArea.offset.x = render_area.left;
+	begin_info->renderArea.offset.y = render_area.bottom;
+	begin_info->renderArea.extent.width = render_area.width;
+	begin_info->renderArea.extent.height = render_area.height;
 
 	if(clear_values)
 	{
@@ -169,7 +166,7 @@ void VulkanCommands::end_render_pass()
 	vk.CmdEndRenderPass(primary_buffer);
 
 	framebuffer = 0;
-	viewport = 0;
+	viewport = Rect::max();
 	pass_buffer = 0;
 }
 
@@ -185,15 +182,17 @@ void VulkanCommands::begin_frame(unsigned index)
 			command_pools.emplace_back(device);
 	}
 
-	CommandPool *current_pool = &command_pools[frame_index];
-	if(current_pool->in_use)
+	CommandPool &current_pool = command_pools[frame_index];
+	if(current_pool.in_use)
 	{
-		current_pool->fence.wait();
-		vk.ResetCommandPool(current_pool->pool, 0);
-		current_pool->in_use = false;
-		current_pool->primary.next_buffer = 0;
-		current_pool->secondary.next_buffer = 0;
+		current_pool.fence.wait();
+		vk.ResetCommandPool(current_pool.pool, 0);
+		current_pool.in_use = false;
+		current_pool.primary.next_buffer = 0;
+		current_pool.secondary.next_buffer = 0;
 	}
+
+	device.get_descriptor_pool().begin_frame();
 }
 
 void VulkanCommands::submit_frame(Semaphore *wait_sem, Semaphore *signal_sem)
@@ -259,7 +258,8 @@ void VulkanCommands::draw_instanced(const Batch &batch, unsigned count)
 		 begin_render_pass(false, 0);
 
 	pipeline_state->refresh();
-	pipeline_state->apply(pass_buffer, frame_index, fb_is_swapchain);
+	pipeline_state->apply(pass_buffer, last_pipeline, frame_index, fb_is_swapchain);
+	last_pipeline = pipeline_state;
 	unsigned first_index = batch.get_offset()/batch.get_index_size();
 	vk.CmdDrawIndexed(pass_buffer, batch.size(), count, first_index, 0, 0);
 }