From 17398f620a39f665106b2521ef3bb683e6b51037 Mon Sep 17 00:00:00 2001 From: Boris Zanin Date: Tue, 6 Jun 2017 08:42:14 +0200 Subject: [PATCH] Return back transient attachments tests Update tests: * dEQP-VK.renderpass.attachment.* * dEQP-VK.renderpass.attachment_allocation.* Components: Vulkan VK-GL-CTS issue 464 Change-Id: I11006ef75ee7fbeb6674d1876a535101edb2a667 --- .../modules/vulkan/renderpass/vktRenderPassTests.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/external/vulkancts/modules/vulkan/renderpass/vktRenderPassTests.cpp b/external/vulkancts/modules/vulkan/renderpass/vktRenderPassTests.cpp index 97a8070..650639a 100644 --- a/external/vulkancts/modules/vulkan/renderpass/vktRenderPassTests.cpp +++ b/external/vulkancts/modules/vulkan/renderpass/vktRenderPassTests.cpp @@ -2167,7 +2167,11 @@ public: } if (!selfDeps.empty()) + { + DE_ASSERT(srcStages != 0); + DE_ASSERT(dstStages != 0); vk.cmdPipelineBarrier(commandBuffer, srcStages, dstStages, VK_DEPENDENCY_BY_REGION_BIT, 0, DE_NULL, 0, DE_NULL, (deUint32)selfDeps.size(), &selfDeps[0]); + } if (m_renderInfo.getRenderQuad()) { @@ -3914,6 +3918,13 @@ void initializeAttachmentImageUsage (Context &context, vector attachmentImageUsage[attachmentNdx] |= VK_IMAGE_USAGE_TRANSFER_SRC_BIT; } + else + { + const VkImageUsageFlags allowedTransientBits = static_cast(VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT | VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT); + + attachmentImageUsage[attachmentNdx] &= allowedTransientBits; + attachmentImageUsage[attachmentNdx] |= VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT; + } } } -- 2.7.4