fix input dependency for renderpass depth/stencil format tests
authorConnor Abbott <cwabbott0@gmail.com>
Mon, 4 May 2020 16:43:11 +0000 (18:43 +0200)
committerAlexander Galazin <Alexander.Galazin@arm.com>
Fri, 8 May 2020 15:24:03 +0000 (11:24 -0400)
This appears to be a copy/paste mistake. The exact stage/access bits was
taken from other dependencies with an input attachment which is a
depth/stencil attachment.

Affected tests:
dEQP-VK.renderpass.*.formats.d16_unorm.input.*
dEQP-VK.renderpass.*.formats.x8_d24_unorm_pack32.input.*
dEQP-VK.renderpass.*.formats.d32_sfloat.input.*
dEQP-VK.renderpass.*.formats.d24_unorm_s8_uint.input.*
dEQP-VK.renderpass.*.formats.d32_sfloat_s8_uint.input.*

Change-Id: Ib1cde2371781cc8337905af04e0b7732b74333af
Components: Vulkan
VK-GL-CTS issue: 2351

external/vulkancts/modules/vulkan/renderpass/vktRenderPassTests.cpp

index d6dce0c..39f5a12 100644 (file)
@@ -6596,10 +6596,10 @@ void addFormatTests (tcu::TestCaseGroup* group, const TestConfigExternal testCon
                                                                                                                        vector<deUint32>()));
 
                                                                deps.push_back(SubpassDependency(0, 1,
-                                                                                                                               vk::VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT,
+                                                                                                                               vk::VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | vk::VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT,
                                                                                                                                vk::VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT,
 
-                                                                                                                               vk::VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT,
+                                                                                                                               vk::VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT,
                                                                                                                                vk::VK_ACCESS_INPUT_ATTACHMENT_READ_BIT,
                                                                                                                                0u));
 
@@ -6758,10 +6758,10 @@ void addFormatTests (tcu::TestCaseGroup* group, const TestConfigExternal testCon
                                                                                                                                vector<deUint32>()));
 
                                                                        deps.push_back(SubpassDependency(0, 1,
-                                                                                                                                       vk::VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT,
+                                                                                                                                       vk::VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | vk::VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT,
                                                                                                                                        vk::VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT,
 
-                                                                                                                                       vk::VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT,
+                                                                                                                                       vk::VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT,
                                                                                                                                        vk::VK_ACCESS_INPUT_ATTACHMENT_READ_BIT,
                                                                                                                                        0u));