Use SRC image layout for copy image to buffer
authorSlawomir Cygan <slawomir.cygan@intel.com>
Wed, 6 Sep 2017 14:47:04 +0000 (16:47 +0200)
committerSlawomir Cygan <slawomir.cygan@intel.com>
Wed, 6 Sep 2017 14:48:59 +0000 (16:48 +0200)
The test was calling vkCmdCopyImageToBuffer with
VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL layout, which is not a valid
parameter value for this function (and not the layout the image is currently in).

Affects: dEQP-VK.memory.binding.*.*.image_*

Components: Vulkan

VK-GL-CTS issue: 666

Change-Id: Ifb5a1bd8726535de02a0dc134f5ac76a2734a661

external/vulkancts/modules/vulkan/memory/vktMemoryBindingTests.cpp

index b1ad7b2..6e47e24 100644 (file)
@@ -757,7 +757,7 @@ void                                                                        readUpResource                                          (Move<VkImage>&                 source,
 
        VK_CHECK(vk.beginCommandBuffer(*cmdBuffer, &cmdBufferBeginInfo));
        vk.cmdPipelineBarrier(*cmdBuffer, VK_PIPELINE_STAGE_HOST_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, (VkDependencyFlags)0, 0, (const VkMemoryBarrier*)DE_NULL, 0, (const VkBufferMemoryBarrier*)DE_NULL, 1, &srcImageBarrier);
-       vk.cmdCopyImageToBuffer(*cmdBuffer, *source, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, *target, 1, (&copyRegion));
+       vk.cmdCopyImageToBuffer(*cmdBuffer, *source, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, *target, 1, (&copyRegion));
        vk.cmdPipelineBarrier(*cmdBuffer, VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, (VkDependencyFlags)0, 0, (const VkMemoryBarrier*)DE_NULL, 1, &dstBufferBarrier, 1, &postImageBarrier);
        VK_CHECK(vk.endCommandBuffer(*cmdBuffer));