Merge branch 'jekstrand_renderpass_transfer_bit_fix' into 'master'

dEQP-VK.renderpass: Set IMAGE_USAGE_TRANSFER_SRC_BIT when needed

Later on in the test, if "lazy" is not set, we try and download the image.

See merge request !266

diff --git a/external/vulkancts/modules/vulkan/vktRenderPassTests.cpp b/external/vulkancts/modules/vulkan/vktRenderPassTests.cpp
index e04c7d4..07a1aaa 100644 (file)
--- a/external/vulkancts/modules/vulkan/vktRenderPassTests.cpp
+++ b/external/vulkancts/modules/vulkan/vktRenderPassTests.cpp
@@ -1184,7 +1184,7 @@ public:
                                                 const UVec2&                           size,
                                                 const Attachment&                      attachmentInfo,
                                                 bool                                           lazy)
-               : m_image                       (createAttachmentImage(vk, device, queueIndex, size, attachmentInfo.getFormat(), attachmentInfo.getSamples(), lazy ? VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT : 0, VK_IMAGE_LAYOUT_UNDEFINED))
+               : m_image                       (createAttachmentImage(vk, device, queueIndex, size, attachmentInfo.getFormat(), attachmentInfo.getSamples(), lazy ? VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT : VK_IMAGE_USAGE_TRANSFER_SRC_BIT, VK_IMAGE_LAYOUT_UNDEFINED))
                , m_imageMemory         (createImageMemory(vk, device, allocator, *m_image, lazy))
                , m_attachmentView      (createImageAttachmentView(vk, device, *m_image, attachmentInfo.getFormat(), getImageAspectFlags(attachmentInfo.getFormat())))
        {