X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fbackends%2Fvulkan%2Fcommands_backend.cpp;h=8243b58fe1ba66849b10a2cf2d94538f5d4450a8;hp=d55a4dfdbad3095bc253f57820f9bfa37a10c775;hb=d98d835a6359844efcbc13b18ea6c93ace117359;hpb=098a0475c25dc59fa31288cff011333f49f0382b

diff --git a/source/backends/vulkan/commands_backend.cpp b/source/backends/vulkan/commands_backend.cpp
index d55a4dfd..8243b58f 100644
--- a/source/backends/vulkan/commands_backend.cpp
+++ b/source/backends/vulkan/commands_backend.cpp
@@ -69,6 +69,8 @@ void VulkanCommands::begin_render_pass(bool clear, const ClearValue *clear_value
 	if(!framebuffer)
 		throw invalid_operation("VulkanCommands::begin_render_pass");
 
+	viewport = pipeline_state->get_viewport();
+
 	const VulkanFunctions &vk = device.get_functions();
 
 	if(!current_buffer)
@@ -85,8 +87,8 @@ 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->prepare_image_layouts(clear);
-	VkRenderPass render_pass = device.get_pipeline_cache().get_render_pass(framebuffer->get_format(), clear, !clear_values, to_present);
+		framebuffer->prepare_image_layouts(clear && !viewport);
+	VkRenderPass render_pass = device.get_pipeline_cache().get_render_pass(framebuffer->get_format(), clear, (!clear_values && !viewport), to_present);
 
 	framebuffer->refresh();
 
@@ -97,7 +99,6 @@ 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);
 
-	viewport = pipeline_state->get_viewport();
 	if(viewport)
 	{
 		begin_info.renderArea.offset.x = viewport->left;