X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fbackends%2Fvulkan%2Fsynchronizer.cpp;h=93f48b847f9290cc456d06fe4d108bea1068bf2b;hp=3ec04026a09ae2e2617c3461e4a746544f0ab119;hb=d011ee2084d610c711ab7ed82e1f7a2337f6cba2;hpb=2c060874dcf5cee7ffa52e3d2caee505371fa1a8

diff --git a/source/backends/vulkan/synchronizer.cpp b/source/backends/vulkan/synchronizer.cpp
index 3ec04026..93f48b84 100644
--- a/source/backends/vulkan/synchronizer.cpp
+++ b/source/backends/vulkan/synchronizer.cpp
@@ -212,29 +212,28 @@ void Synchronizer::barrier(VkCommandBuffer command_buffer)
 		}
 	}
 
-	bool sparse_levels = false;
 	for(auto i=image_accesses.begin(); i!=image_accesses.end(); )
 	{
-		if(i->level==-2)
-		{
-			sparse_levels = true;
-			++i;
-		}
-		else if(i->pending_layout==VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL)
+		if(i->level!=-1)
 		{
-			VkImage image = i->image;
-			i = image_accesses.erase(i);
-			if(i->image!=image)
+			auto j = i;
+			if(j->level==-2)
+				++j;
+
+			bool remove_image = true;
+			for(; (j!=image_accesses.end() && j->image==i->image); ++j)
+				remove_image &= (j->pending_layout==VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
+
+			if(remove_image)
+				i = image_accesses.erase(i, j);
+			else
 			{
-				if(sparse_levels)
-				{
-					auto j = prev(i);
-					if(j->level==-2)
-						i = image_accesses.erase(j);
-				}
-				sparse_levels = false;
+				for(; i!=j; ++i)
+					i->current_layout = i->pending_layout;
 			}
 		}
+		else if(i->pending_layout==VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL)
+			i = image_accesses.erase(i);
 		else
 		{
 			i->current_layout = i->pending_layout;