From c19a572d8d80ebc80ddaf7621f366018c3fb106b Mon Sep 17 00:00:00 2001 From: Peter Kohaut Date: Tue, 22 Aug 2017 15:52:12 +0200 Subject: [PATCH] Fix barries for framebuffer attachment tests Test was using incorrect stages for vkCmdResolveImage from graphics pipeline instead of transfer pipeline. Components: Vulkan VK-GL-CTS issue: 638 Affected tests: dEQP-VK.pipeline.framebuffer_attachment.* Change-Id: I79d552da6f2c91257f0592b82aaeb98d9c676913 --- .../modules/vulkan/pipeline/vktPipelineFramebufferAttachmentTests.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineFramebufferAttachmentTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineFramebufferAttachmentTests.cpp index 2ca4f3d..71efb0b 100644 --- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineFramebufferAttachmentTests.cpp +++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineFramebufferAttachmentTests.cpp @@ -713,7 +713,7 @@ tcu::TestStatus test (Context& context, const CaseDef caseDef) } }; - vk.cmdPipelineBarrier(*cmdBuffer, VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT, VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT, 0u, + vk.cmdPipelineBarrier(*cmdBuffer, VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, 0u, 0u, DE_NULL, 0u, DE_NULL, 2u, imageBarriers); const VkImageResolve region = @@ -746,7 +746,7 @@ tcu::TestStatus test (Context& context, const CaseDef caseDef) } }; - vk.cmdPipelineBarrier(*cmdBuffer, VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, 0u, + vk.cmdPipelineBarrier(*cmdBuffer, caseDef.multisample ? VK_PIPELINE_STAGE_TRANSFER_BIT : VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, 0u, 0u, DE_NULL, 0u, DE_NULL, 1u, imageBarriers); const VkBufferImageCopy region = -- 2.7.4