Merge vk-gl-cts/vulkan-cts-1.2.6 into vk-gl-cts/vulkan-cts-1.2.7

[platform/upstream/VK-GL-CTS.git] / 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 6d636dc..649dd23 100644 (file)
--- a/external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp
@@ -1132,7 +1132,7 @@ tcu::TestStatus CopyImageToImage::iterate (void)
                }
        }
 
-       const VkImageMemoryBarrier      imageBarriers[]         =
+       VkImageMemoryBarrier    imageBarriers[]         =
        {
                // source image
                {
@@ -1187,6 +1187,8 @@ tcu::TestStatus CopyImageToImage::iterate (void)
                clearColor.float32[2] = 1.0f;
                clearColor.float32[3] = 1.0f;
                vk.cmdClearColorImage(*m_cmdBuffer, m_destination.get(), VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, &clearColor, 1u, &range);
+               imageBarriers[0].oldLayout = imageBarriers[0].newLayout;
+               imageBarriers[1].oldLayout = imageBarriers[1].newLayout;
                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, DE_LENGTH_OF_ARRAY(imageBarriers), imageBarriers);
        }