commit cd69acfb3a5d9a4a32c4067ad869bc9eda1fca04
author Igor Ostrowski <igor.ostrowski@intel.com> Tue Jul 04 18:01:23 2017 +0200
committer Alexander Galazin <Alexander.Galazin@arm.com> Fri Jul 21 12:02:07 2017 -0400
tree fd6e15fb579bd23d2f22ccb977d4c43a6b8231af
parent 35013e60be397bb75ccedfa6ac2e36c337ff1009

Fix layout transition in blitting tests

Affects:
dEQP-VK.api.copy_and_blit.*.blit_image.*

Components: Vulkan
VK-GL-CTS issue: 571

Change-Id: I780374a8fbff336a7789bd6a745e635ac1202b62

external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp

diff --git a/external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp
index fad5eda..c08e6bd 100644
--- a/external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp
@@ -1921,8 +1921,8 @@
 
 	VK_CHECK(vk.beginCommandBuffer(*m_cmdBuffer, &cmdBufferBeginInfo));
 	vk.cmdPipelineBarrier(*m_cmdBuffer, VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, (VkDependencyFlags)0, 0, (const VkMemoryBarrier*)DE_NULL, 0, (const VkBufferMemoryBarrier*)DE_NULL, 1, &srcImageBarrier);
+	vk.cmdPipelineBarrier(*m_cmdBuffer, VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, (VkDependencyFlags)0, 0, (const VkMemoryBarrier*)DE_NULL, 0, (const VkBufferMemoryBarrier*)DE_NULL, 1, &dstImageBarrier);
 	vk.cmdBlitImage(*m_cmdBuffer, m_source.get(), m_params.src.image.operationLayout, m_destination.get(), m_params.dst.image.operationLayout, (deUint32)m_params.regions.size(), &regions[0], m_params.filter);
-	vk.cmdPipelineBarrier(*m_cmdBuffer, VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, (VkDependencyFlags)0, 0, (const VkMemoryBarrier*)DE_NULL, 0, (const VkBufferMemoryBarrier*)DE_NULL, 1, &dstImageBarrier);
 	VK_CHECK(vk.endCommandBuffer(*m_cmdBuffer));
 	submitCommandsAndWait(vk, vkDevice, queue, *m_cmdBuffer);
 
@@ -3134,20 +3134,20 @@
 	const tcu::TextureFormat		dstTcuFormat		= mapVkFormat(m_params.dst.image.format);
 
 	// upload the destination image
-		m_destinationTextureLevel	= de::MovePtr<tcu::TextureLevel>(new tcu::TextureLevel(dstTcuFormat,
-																				(int)m_params.dst.image.extent.width,
-																				(int)m_params.dst.image.extent.height,
-																				(int)m_params.dst.image.extent.depth));
-		generateBuffer(m_destinationTextureLevel->getAccess(), m_params.dst.image.extent.width, m_params.dst.image.extent.height, m_params.dst.image.extent.depth);
-		uploadImage(m_destinationTextureLevel->getAccess(), m_destination.get(), m_params.dst.image);
+	m_destinationTextureLevel	= de::MovePtr<tcu::TextureLevel>(new tcu::TextureLevel(dstTcuFormat,
+																			(int)m_params.dst.image.extent.width,
+																			(int)m_params.dst.image.extent.height,
+																			(int)m_params.dst.image.extent.depth));
+	generateBuffer(m_destinationTextureLevel->getAccess(), m_params.dst.image.extent.width, m_params.dst.image.extent.height, m_params.dst.image.extent.depth);
+	uploadImage(m_destinationTextureLevel->getAccess(), m_destination.get(), m_params.dst.image);
 
-		m_sourceTextureLevel = de::MovePtr<tcu::TextureLevel>(new tcu::TextureLevel(srcTcuFormat,
-																		(int)m_params.src.image.extent.width,
-																		(int)m_params.src.image.extent.height,
-																		(int)m_params.dst.image.extent.depth));
+	m_sourceTextureLevel = de::MovePtr<tcu::TextureLevel>(new tcu::TextureLevel(srcTcuFormat,
+																	(int)m_params.src.image.extent.width,
+																	(int)m_params.src.image.extent.height,
+																	(int)m_params.dst.image.extent.depth));
 
-		generateBuffer(m_sourceTextureLevel->getAccess(), m_params.src.image.extent.width, m_params.src.image.extent.height, m_params.dst.image.extent.depth, FILL_MODE_MULTISAMPLE);
-		generateExpectedResult();
+	generateBuffer(m_sourceTextureLevel->getAccess(), m_params.src.image.extent.width, m_params.src.image.extent.height, m_params.dst.image.extent.depth, FILL_MODE_MULTISAMPLE);
+	generateExpectedResult();
 
 	switch (m_options)
 	{
@@ -3320,7 +3320,7 @@
 
 	const VkImageMemoryBarrier		imageBarriers[]		=
 	{
-		//// source image
+		// source image
 		{
 			VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,		// VkStructureType			sType;
 			DE_NULL,									// const void*				pNext;