From: Graeme Leese <gleese@broadcom.com>
Date: Fri, 21 Sep 2018 09:35:55 +0000 (+0100)
Subject: Fix synchronisation in ycbcr tests
X-Git-Tag: upstream/1.3.5~2481
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ec430ef89b95e5bdfd0966b46938bff1780bc9d6;p=platform%2Fupstream%2FVK-GL-CTS.git

Fix synchronisation in ycbcr tests

Components: Vulkan
Affects: dEQP-VK.ycbcr.*

Change-Id: Idfe7ef9cd0d5c8f9547c599631eae3bfcfa93e8a
---

diff --git a/external/vulkancts/modules/vulkan/ycbcr/vktYCbCrUtil.cpp b/external/vulkancts/modules/vulkan/ycbcr/vktYCbCrUtil.cpp
index 741337639..7c67c69dc 100644
--- a/external/vulkancts/modules/vulkan/ycbcr/vktYCbCrUtil.cpp
+++ b/external/vulkancts/modules/vulkan/ycbcr/vktYCbCrUtil.cpp
@@ -403,7 +403,7 @@ void uploadImage (const DeviceInterface&		vkd,
 
 		vkd.cmdPipelineBarrier(*cmdBuffer,
 								(VkPipelineStageFlags)VK_PIPELINE_STAGE_TRANSFER_BIT,
-								(VkPipelineStageFlags)VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT,
+								(VkPipelineStageFlags)VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
 								(VkDependencyFlags)0u,
 								0u,
 								(const VkMemoryBarrier*)DE_NULL,
@@ -482,7 +482,7 @@ void fillImageMemory (const vk::DeviceInterface&							vkd,
 
 		vkd.cmdPipelineBarrier(*cmdBuffer,
 								(VkPipelineStageFlags)VK_PIPELINE_STAGE_HOST_BIT,
-								(VkPipelineStageFlags)VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT,
+								(VkPipelineStageFlags)VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
 								(VkDependencyFlags)0u,
 								0u,
 								(const VkMemoryBarrier*)DE_NULL,
@@ -572,7 +572,7 @@ void downloadImage (const DeviceInterface&	vkd,
 				makeExtent3D(planeW, planeH, 1u),
 			};
 
-			vkd.cmdCopyImageToBuffer(*cmdBuffer, image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, **stagingBuffers[planeNdx], 1u, &copy);
+			vkd.cmdCopyImageToBuffer(*cmdBuffer, image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, **stagingBuffers[planeNdx], 1u, &copy);
 		}
 		{
 			const VkBufferMemoryBarrier		postCopyBarrier	=
@@ -590,7 +590,7 @@ void downloadImage (const DeviceInterface&	vkd,
 
 			vkd.cmdPipelineBarrier(*cmdBuffer,
 									(VkPipelineStageFlags)VK_PIPELINE_STAGE_TRANSFER_BIT,
-									(VkPipelineStageFlags)VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT,
+									(VkPipelineStageFlags)VK_PIPELINE_STAGE_HOST_BIT,
 									(VkDependencyFlags)0u,
 									0u,
 									(const VkMemoryBarrier*)DE_NULL,
@@ -640,8 +640,8 @@ void readImageMemory (const vk::DeviceInterface&							vkd,
 		};
 
 		vkd.cmdPipelineBarrier(*cmdBuffer,
+								(VkPipelineStageFlags)VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
 								(VkPipelineStageFlags)VK_PIPELINE_STAGE_HOST_BIT,
-								(VkPipelineStageFlags)VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT,
 								(VkDependencyFlags)0u,
 								0u,
 								(const VkMemoryBarrier*)DE_NULL,