Partial revert of CL 8054: Fix invalid layout transitions in some dynamic rendering...

This image barrier change was wrong. I thought this was a duplicate
barrier for the color attachment image, but it was actually
one for the depth/stencil attachment image.

Affects:

dEQP-VK.multiview.dynamic_rendering.depth.*
dEQP-VK.multiview.dynamic_rendering.stencil.*

Components: Vulkan

VK-GL-CTS issue: 3164

Change-Id: Id65e226eaec2c158289d684a0a997d8a929a5f45
(cherry picked from commit 46888763ffc567b84befacc92aeea40171373111)

diff --git a/external/vulkancts/modules/vulkan/multiview/vktMultiViewRenderTests.cpp b/external/vulkancts/modules/vulkan/multiview/vktMultiViewRenderTests.cpp
index e2686cc..6ea3c94 100644 (file)
--- a/external/vulkancts/modules/vulkan/multiview/vktMultiViewRenderTests.cpp
+++ b/external/vulkancts/modules/vulkan/multiview/vktMultiViewRenderTests.cpp
@@ -3748,9 +3748,9 @@ void MultiViewDepthStencilTestInstance::beforeDraw (void)
                m_parameters.extent.depth,                                                                      //deUint32                              layerCount;
        };
        imageBarrier(*m_device, *m_cmdBuffer, m_dsAttachment->getImage(), subresourceRange,
-               VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
-               VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT, VK_ACCESS_TRANSFER_WRITE_BIT,
-               VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT);
+               VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+               0, VK_ACCESS_TRANSFER_WRITE_BIT,
+               VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT);
 
        const tcu::Vec4         baseColor       = getQuarterRefColor(0u, 0u, 0u, false);
        const float                     clearDepth      = baseColor[0];