Fix image transition in dynamic rendering tests

The images need to be translated out of undefined layout,
before using them for dynamic rendering.

VK-GL-CTS issue: 3260

Components: Vulkan

Affects:
dEQP-VK.draw_with_dynamic_rendering.multiple_interpolation.*

Change-Id: I5cd1162683f77923a273bf774456cfb22b67b7c9

diff --git a/external/vulkancts/modules/vulkan/draw/vktDrawMultipleInterpolationTests.cpp b/external/vulkancts/modules/vulkan/draw/vktDrawMultipleInterpolationTests.cpp
index 4fdbcc2..39e2e76 100644 (file)
--- a/external/vulkancts/modules/vulkan/draw/vktDrawMultipleInterpolationTests.cpp
+++ b/external/vulkancts/modules/vulkan/draw/vktDrawMultipleInterpolationTests.cpp
@@ -596,6 +596,16 @@ void DrawTestInstance::render (de::SharedPtr<Image>& colorTargetImage,
                                DE_NULL,                                                                                                // const VkRenderingAttachmentInfoKHR*  pStencilAttachment;
                        };
 
+                       // Transition Images
+                       initialTransitionColor2DImage(vk, *cmdBuffer, colorTargetImage->object(), vk::VK_IMAGE_LAYOUT_GENERAL,
+                               vk::VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT, vk::VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT);
+
+                       if (useMultisampling)
+                       {
+                               initialTransitionColor2DImage(vk, *cmdBuffer, multisampleImage->object(), vk::VK_IMAGE_LAYOUT_GENERAL,
+                                       vk::VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT, vk::VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT);
+                       }
+
                        vk.cmdBeginRendering(*cmdBuffer, &renderingInfo);
                }
                else