Fix validation errors in renderpass tests

This CL fixes the validation errors in some of the renderpass
tests. The tests incorrectly defined subpass dependency access
scopes for depth/stencil attachments in some cases.

Affects:

dEQP-VK.renderpass*.attachment_allocation.*

Components: Vulkan

VK-GL-CTS Issue: 3385

Change-Id: Ia9cc78bd28dde5b9cdbf4e28ba759e3bde44a9d0

diff --git a/external/vulkancts/modules/vulkan/renderpass/vktRenderPassTests.cpp b/external/vulkancts/modules/vulkan/renderpass/vktRenderPassTests.cpp
index 68ee0d4..6b8a5d0 100644 (file)
--- a/external/vulkancts/modules/vulkan/renderpass/vktRenderPassTests.cpp
+++ b/external/vulkancts/modules/vulkan/renderpass/vktRenderPassTests.cpp
@@ -5517,7 +5517,8 @@ void addAttachmentAllocationTests (tcu::TestCaseGroup* group, const TestConfigEx
                                                                                                                                          | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT,
 
                                                                                                                                          VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT,
-                                                                                                                                         VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT,
+                                                                                                                                         VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT
+                                                                                                                                         | VK_ACCESS_INPUT_ATTACHMENT_READ_BIT,
 
                                                                                                                                          dependencyFlags);
                                                                for (SubpassDependency& dependency : deps)
@@ -5525,7 +5526,7 @@ void addAttachmentAllocationTests (tcu::TestCaseGroup* group, const TestConfigEx
                                                                        if (dependency.getSrcPass() == srcPass && dependency.getDstPass() == dstPass)
                                                                        {
                                                                                const VkAccessFlags newSrcFlags = dependency.getSrcAccessMask() | VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT;
-                                                                               const VkAccessFlags newDstFlags = dependency.getDstAccessMask() | VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT;
+                                                                               const VkAccessFlags newDstFlags = dependency.getDstAccessMask() | VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT | VK_ACCESS_INPUT_ATTACHMENT_READ_BIT;
                                                                                dependency.setDstAccessMask(newSrcFlags);
                                                                                dependency.setDstAccessMask(newDstFlags);
                                                                                foundDuplicate = true;