From bcb02fe7e3bc5ec226ffa5389978a4023282758c Mon Sep 17 00:00:00 2001 From: Slawomir Cygan Date: Fri, 28 Aug 2020 21:39:14 +0200 Subject: [PATCH] Fix regression in diff_attachments test Fix issue introduced in ce82fe2a: use same image layout for barrier newLayout and subsequent renderpass initialLayout. Components: Vulkan VK-GL_CTS Issue: 2568 Change-Id: I3118a7a2b1c7548fe669484f24414648b4cd246c Affects: dEQP-VK.pipeline.framebuffer_attachment.diff_attachments_* --- .../vulkan/pipeline/vktPipelineFramebufferAttachmentTests.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineFramebufferAttachmentTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineFramebufferAttachmentTests.cpp index f525da16a..50d6856dc 100644 --- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineFramebufferAttachmentTests.cpp +++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineFramebufferAttachmentTests.cpp @@ -962,7 +962,7 @@ Move makeRenderPassDifferentAttachmentSizes (const DeviceInterface VK_ATTACHMENT_STORE_OP_STORE, // VkAttachmentStoreOp storeOp; VK_ATTACHMENT_LOAD_OP_DONT_CARE, // VkAttachmentLoadOp stencilLoadOp; VK_ATTACHMENT_STORE_OP_DONT_CARE, // VkAttachmentStoreOp stencilStoreOp; - VK_IMAGE_LAYOUT_GENERAL, // VkImageLayout initialLayout; + VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL, // VkImageLayout initialLayout; VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL, // VkImageLayout finalLayout; }; attachmentDescriptions[i] = colorAttachmentDescription; -- 2.34.1