Remove spurious TS/GS stage bits from renderpass test barriers
authorChris Forbes <chrisforbes@google.com>
Fri, 18 May 2018 17:46:27 +0000 (10:46 -0700)
committerAlexander Galazin <Alexander.Galazin@arm.com>
Thu, 24 May 2018 12:28:11 +0000 (08:28 -0400)
None of this code actually uses these stages, and we weren't checking
whether they were supported. This was invalid on devices that don't
support the TS/GS stages.

Change-Id: I06cd1df95f52060150e36d28bc0525f2d398aef0
VK-GL-CTS: 1180
Components: Vulkan
Affects: dEQP-VK.renderpass.*

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

index d6b29fc..9c202dd 100644 (file)
@@ -461,15 +461,13 @@ VkAccessFlags getMemoryFlagsForLayout (const VkImageLayout layout)
 
 VkPipelineStageFlags getAllPipelineStageFlags (void)
 {
-       return VK_PIPELINE_STAGE_TESSELLATION_EVALUATION_SHADER_BIT
-                  | VK_PIPELINE_STAGE_TRANSFER_BIT
-                  | VK_PIPELINE_STAGE_GEOMETRY_SHADER_BIT
+       /* All relevant flags for a pipeline containing VS+PS. */
+       return VK_PIPELINE_STAGE_TRANSFER_BIT
                   | VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT
                   | VK_PIPELINE_STAGE_DRAW_INDIRECT_BIT
                   | VK_PIPELINE_STAGE_VERTEX_INPUT_BIT
                   | VK_PIPELINE_STAGE_VERTEX_SHADER_BIT
                   | VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT
-                  | VK_PIPELINE_STAGE_TESSELLATION_CONTROL_SHADER_BIT
                   | VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT
                   | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT
                   | VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT