X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbackends%2Fvulkan%2Fcommands_backend.cpp;h=84bc104a3e372fd1f19832d8a9a52562ec7411c4;hb=bbdf52425b736a59d01dda215458c3a1c9bdb320;hp=0134474b932d060e6a97eb8a4bd6d97f1fb0eadb;hpb=99ca354f18119f82f1adeca100cd665a8f640317;p=libs%2Fgl.git

diff --git a/source/backends/vulkan/commands_backend.cpp b/source/backends/vulkan/commands_backend.cpp
index 0134474b..84bc104a 100644
--- a/source/backends/vulkan/commands_backend.cpp
+++ b/source/backends/vulkan/commands_backend.cpp
@@ -9,6 +9,7 @@
 #include "pipelinestate.h"
 #include "rect.h"
 #include "semaphore.h"
+#include "swapchaintexture.h"
 #include "vulkan.h"
 
 using namespace std;
@@ -55,10 +56,10 @@ void VulkanCommands::begin_buffer()
 	vk.BeginCommandBuffer(current_buffer, begin_info);
 }
 
-void VulkanCommands::begin_render_pass(const ClearValue *clear_values)
+void VulkanCommands::begin_render_pass(bool clear, const ClearValue *clear_values)
 {
-	const Framebuffer *target = pipeline_state->get_framebuffer();
-	if(!target)
+	framebuffer = pipeline_state->get_framebuffer();
+	if(!framebuffer)
 		throw invalid_operation("VulkanCommands::begin_render_pass");
 
 	const VulkanFunctions &vk = device.get_functions();
@@ -68,17 +69,25 @@ void VulkanCommands::begin_render_pass(const ClearValue *clear_values)
 
 	device.get_transfer_queue().dispatch_transfers(current_buffer);
 
-	// TODO Use proper value for to_present
-	render_pass = device.get_pipeline_cache().get_render_pass(target->get_format(), clear_values, true);
+	Synchronizer &sync = device.get_synchronizer();
+	sync.reset();
+	sync.barrier(current_buffer);
 
-	target->refresh();
+	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->get_attachment(i)))
+			to_present = true;
+	VkRenderPass render_pass = device.get_pipeline_cache().get_render_pass(framebuffer->get_format(), clear, !clear_values, to_present);
+
+	framebuffer->refresh();
 
 	VkRenderPassBeginInfo begin_info = { };
 	begin_info.sType = VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO;
 	begin_info.renderPass = handle_cast<::VkRenderPass>(render_pass);
-	begin_info.framebuffer = handle_cast<::VkFramebuffer>(target->handle);
+	begin_info.framebuffer = handle_cast<::VkFramebuffer>(framebuffer->handle);
 
-	const Rect *viewport = pipeline_state->get_viewport();
+	viewport = pipeline_state->get_viewport();
 	if(viewport)
 	{
 		begin_info.renderArea.offset.x = viewport->left;
@@ -88,15 +97,15 @@ void VulkanCommands::begin_render_pass(const ClearValue *clear_values)
 	}
 	else
 	{
-		begin_info.renderArea.extent.width = target->get_width();
-		begin_info.renderArea.extent.height = target->get_height();
+		begin_info.renderArea.extent.width = framebuffer->get_width();
+		begin_info.renderArea.extent.height = framebuffer->get_height();
 	}
 
 	VkClearValue vk_clear_values[7];
 	if(clear_values)
 	{
 		unsigned i = 0;
-		for(FrameAttachment a: target->get_format())
+		for(FrameAttachment a: framebuffer->get_format())
 		{
 			if(get_attach_point(a)==get_attach_point(DEPTH_ATTACHMENT))
 				vk_clear_values[i].depthStencil.depth = clear_values[i].depth_stencil.depth;
@@ -112,7 +121,7 @@ void VulkanCommands::begin_render_pass(const ClearValue *clear_values)
 			++i;
 		}
 
-		begin_info.clearValueCount = target->get_format().size();
+		begin_info.clearValueCount = framebuffer->get_format().size();
 		begin_info.pClearValues = vk_clear_values;
 	}
 
@@ -124,7 +133,8 @@ void VulkanCommands::end_render_pass()
 	const VulkanFunctions &vk = device.get_functions();
 
 	vk.CmdEndRenderPass(current_buffer);
-	render_pass = 0;
+	framebuffer = 0;
+	viewport = 0;
 }
 
 void VulkanCommands::begin_frame(unsigned index)
@@ -158,7 +168,7 @@ void VulkanCommands::submit_frame(Semaphore *wait_sem, Semaphore *signal_sem)
 	::VkSemaphore vk_signal_sem = (signal_sem ? handle_cast<::VkSemaphore>(signal_sem->handle) : 0);
 	VkPipelineStageFlags wait_stages = VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT;
 
-	if(render_pass)
+	if(framebuffer)
 		end_render_pass();
 
 	vk.EndCommandBuffer(current_buffer);
@@ -180,21 +190,19 @@ void VulkanCommands::submit_frame(Semaphore *wait_sem, Semaphore *signal_sem)
 
 void VulkanCommands::use_pipeline(const PipelineState *ps)
 {
-	if(!pipeline_state || !ps || ps->get_framebuffer()!=pipeline_state->get_framebuffer() || ps->get_viewport()!=pipeline_state->get_viewport())
-		if(render_pass)
+	if(!pipeline_state || !ps || ps->get_framebuffer()!=framebuffer || ps->get_viewport()!=viewport)
+		if(framebuffer)
 			end_render_pass();
 
 	pipeline_state = ps;
-	if(pipeline_state)
-		pipeline_state->refresh();
 }
 
 void VulkanCommands::clear(const ClearValue *values)
 {
-	if(render_pass)
+	if(framebuffer)
 		throw invalid_operation("VulkanCommands::clear");
 
-	begin_render_pass(values);
+	begin_render_pass(true, values);
 }
 
 void VulkanCommands::draw(const Batch &batch)
@@ -209,9 +217,10 @@ void VulkanCommands::draw_instanced(const Batch &batch, unsigned count)
 
 	const VulkanFunctions &vk = device.get_functions();
 
-	if(!render_pass)
-		 begin_render_pass(0);
+	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);