X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=external%2Fvulkancts%2Fmodules%2Fvulkan%2Fimage%2FvktImageMutableTests.cpp;h=11948969799680c82f456199522b9a37edc53d15;hb=6cbd0fdde04085a6b91e8bd31964708473bbefa8;hp=d977131d9697f2058667b2856a536b0640ff0371;hpb=d559edb0db4a4b4f1af3158e326f0ac38db65f10;p=platform%2Fupstream%2FVK-GL-CTS.git

diff --git a/external/vulkancts/modules/vulkan/image/vktImageMutableTests.cpp b/external/vulkancts/modules/vulkan/image/vktImageMutableTests.cpp
index d977131..1194896 100644
--- a/external/vulkancts/modules/vulkan/image/vktImageMutableTests.cpp
+++ b/external/vulkancts/modules/vulkan/image/vktImageMutableTests.cpp
@@ -1144,7 +1144,7 @@ void UploadDownloadExecutor::uploadClear(Context& context)
 		subresourceRange								// VkImageSubresourceRange	subresourceRange;
 	};
 
-	m_vk.cmdPipelineBarrier(*m_cmdBuffer, VK_PIPELINE_STAGE_HOST_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, 0u,
+	m_vk.cmdPipelineBarrier(*m_cmdBuffer, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, 0u,
 		0u, DE_NULL, 0u, DE_NULL, 1u, &imageInitBarrier);
 
 	for (deUint32 layer = 0; layer < m_caseDef.numLayers; layer++)
@@ -1262,8 +1262,8 @@ void UploadDownloadExecutor::uploadCopy(Context& context)
 	{
 		VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,				// VkStructureType			sType;
 		DE_NULL,											// const void*				pNext;
-		0u,													// VkAccessFlags			outputMask;
-		VK_ACCESS_TRANSFER_WRITE_BIT,						// VkAccessFlags			inputMask;
+		0u,													// VkAccessFlags			srcAccessMask;
+		VK_ACCESS_TRANSFER_WRITE_BIT,						// VkAccessFlags			dstAccessMask;
 		VK_IMAGE_LAYOUT_UNDEFINED,							// VkImageLayout			oldLayout;
 		VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,				// VkImageLayout			newLayout;
 		VK_QUEUE_FAMILY_IGNORED,							// deUint32					srcQueueFamilyIndex;
@@ -1300,8 +1300,8 @@ void UploadDownloadExecutor::uploadCopy(Context& context)
 	{
 		VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,				// VkStructureType			sType;
 		DE_NULL,											// const void*				pNext;
-		VK_ACCESS_TRANSFER_WRITE_BIT,						// VkAccessFlags			outputMask;
-		VK_ACCESS_TRANSFER_READ_BIT,						// VkAccessFlags			inputMask;
+		VK_ACCESS_TRANSFER_WRITE_BIT,						// VkAccessFlags			srcAccessMask;
+		VK_ACCESS_TRANSFER_READ_BIT,						// VkAccessFlags			dstAccessMask;
 		VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,				// VkImageLayout			oldLayout;
 		VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,				// VkImageLayout			newLayout;
 		VK_QUEUE_FAMILY_IGNORED,							// deUint32					srcQueueFamilyIndex;
@@ -1310,7 +1310,7 @@ void UploadDownloadExecutor::uploadCopy(Context& context)
 		makeColorSubresourceRange(0, m_caseDef.numLayers)	// VkImageSubresourceRange	subresourceRange;
 	};
 
-	m_vk.cmdPipelineBarrier(*m_cmdBuffer, VK_PIPELINE_STAGE_HOST_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, 0u,
+	m_vk.cmdPipelineBarrier(*m_cmdBuffer, VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, 0u,
 		0u, DE_NULL, 0u, DE_NULL, 1u, &imagePostInitBarrier);
 
 	m_imageLayoutAfterUpload	= VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
@@ -1581,8 +1581,8 @@ void UploadDownloadExecutor::copyImageToBuffer(VkImage				sourceImage,
 	{
 		VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,		// VkStructureType			sType;
 		DE_NULL,									// const void*				pNext;
-		srcAccessMask,								// VkAccessFlags			outputMask;
-		VK_ACCESS_TRANSFER_READ_BIT,				// VkAccessFlags			inputMask;
+		srcAccessMask,								// VkAccessFlags			srcAccessMask;
+		VK_ACCESS_TRANSFER_READ_BIT,				// VkAccessFlags			dstAccessMask;
 		oldLayout,									// VkImageLayout			oldLayout;
 		VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,		// VkImageLayout			newLayout;
 		VK_QUEUE_FAMILY_IGNORED,					// deUint32					srcQueueFamilyIndex;