From 06720ffbd8729ed8c0f5fa858f13c0ffe227c650 Mon Sep 17 00:00:00 2001 From: Charles Johnston Date: Tue, 26 Oct 2021 10:51:09 -0400 Subject: [PATCH] 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 --- .../modules/vulkan/draw/vktDrawMultipleInterpolationTests.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/external/vulkancts/modules/vulkan/draw/vktDrawMultipleInterpolationTests.cpp b/external/vulkancts/modules/vulkan/draw/vktDrawMultipleInterpolationTests.cpp index 6ac598b..fb7a089 100644 --- 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& 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.cmdBeginRenderingKHR(*cmdBuffer, &renderingInfo); } else -- 2.7.4