Fix initial color attachment layout in conditional rendering tests

Color attachments were never properly transitioned out of the undefined
layout into the general layout as specified in the render pass.

Affected tests:
dEQP-VK.conditional_rendering.*

Components: Vulkan
VK-GL-CTS issue: 3781

Change-Id: Iaa2dbe3badaa1ed6ab49c02259c7d0a626e60fde

diff --git a/external/vulkancts/modules/vulkan/conditional_rendering/vktConditionalClearAttachmentTests.cpp b/external/vulkancts/modules/vulkan/conditional_rendering/vktConditionalClearAttachmentTests.cpp
index dcb9939..f0887f8 100644 (file)
--- a/external/vulkancts/modules/vulkan/conditional_rendering/vktConditionalClearAttachmentTests.cpp
+++ b/external/vulkancts/modules/vulkan/conditional_rendering/vktConditionalClearAttachmentTests.cpp
@@ -94,6 +94,7 @@ tcu::TestStatus ConditionalClearAttachmentTest::iterate (void)
        const tcu::Vec4 drawColor       = tcu::RGBA::blue().toVec();
 
        beginCommandBuffer(m_vk, *m_cmdBuffer, 0u);
+       preRenderBarriers();
        const bool useSecondaryCmdBuffer = m_conditionalData.conditionInherited || m_conditionalData.conditionInSecondaryCommandBuffer;
        beginLegacyRender(*m_cmdBuffer, useSecondaryCmdBuffer ? vk::VK_SUBPASS_CONTENTS_SECONDARY_COMMAND_BUFFERS : vk::VK_SUBPASS_CONTENTS_INLINE);
 

diff --git a/external/vulkancts/modules/vulkan/conditional_rendering/vktConditionalDrawTests.cpp b/external/vulkancts/modules/vulkan/conditional_rendering/vktConditionalDrawTests.cpp
index 0c6edd0..2e382ee 100644 (file)
--- a/external/vulkancts/modules/vulkan/conditional_rendering/vktConditionalDrawTests.cpp
+++ b/external/vulkancts/modules/vulkan/conditional_rendering/vktConditionalDrawTests.cpp
@@ -336,6 +336,7 @@ tcu::TestStatus ConditionalDraw::iterate (void)
        const vk::VkDevice      device  = m_context.getDevice();
 
        beginCommandBuffer(m_vk, *m_cmdBuffer, 0u);
+       preRenderBarriers();
        const bool useSecondaryCmdBuffer = m_conditionalData.conditionInherited || m_conditionalData.conditionInSecondaryCommandBuffer;
        beginLegacyRender(*m_cmdBuffer, useSecondaryCmdBuffer ? vk::VK_SUBPASS_CONTENTS_SECONDARY_COMMAND_BUFFERS : vk::VK_SUBPASS_CONTENTS_INLINE);