From 24fb688e68b85c2752c5ab81d8292a1fed1e9add Mon Sep 17 00:00:00 2001 From: scygan Date: Wed, 13 Jan 2016 17:21:21 +0100 Subject: [PATCH] dEQP-VK.renderpass.grow and others: do not use DEPTH layouts for color images, and vice versa. This is the continuation of issue #51, that was not completely fixed in merge request !106. This change just replicates what !106 did for other test cases. --- external/vulkancts/modules/vulkan/vktRenderPassTests.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/external/vulkancts/modules/vulkan/vktRenderPassTests.cpp b/external/vulkancts/modules/vulkan/vktRenderPassTests.cpp index 6e593a4..1a82a12 100644 --- a/external/vulkancts/modules/vulkan/vktRenderPassTests.cpp +++ b/external/vulkancts/modules/vulkan/vktRenderPassTests.cpp @@ -4005,10 +4005,18 @@ de::MovePtr createAttachmentAllocationTestGroup (tcu::TestCo VK_ATTACHMENT_STORE_OP_DONT_CARE }; - const VkImageLayout initialAndFinalLayouts[] = + const VkImageLayout initialAndFinalColorLayouts[] = { VK_IMAGE_LAYOUT_GENERAL, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL, + VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL, + VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, + VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL + }; + + const VkImageLayout initialAndFinalDepthStencilLayouts[] = + { + VK_IMAGE_LAYOUT_GENERAL, VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL, VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL, @@ -4112,8 +4120,8 @@ de::MovePtr createAttachmentAllocationTestGroup (tcu::TestCo const VkAttachmentLoadOp loadOp = rng.choose(DE_ARRAY_BEGIN(loadOps), DE_ARRAY_END(loadOps)); const VkAttachmentStoreOp storeOp = rng.choose(DE_ARRAY_BEGIN(storeOps), DE_ARRAY_END(storeOps)); - const VkImageLayout initialLayout = rng.choose(DE_ARRAY_BEGIN(initialAndFinalLayouts), DE_ARRAY_END(initialAndFinalLayouts)); - const VkImageLayout finalizeLayout = rng.choose(DE_ARRAY_BEGIN(initialAndFinalLayouts), DE_ARRAY_END(initialAndFinalLayouts)); + const VkImageLayout initialLayout = rng.choose(DE_ARRAY_BEGIN(initialAndFinalColorLayouts), DE_ARRAY_END(initialAndFinalColorLayouts)); + const VkImageLayout finalizeLayout = rng.choose(DE_ARRAY_BEGIN(initialAndFinalColorLayouts), DE_ARRAY_END(initialAndFinalColorLayouts)); const VkAttachmentLoadOp stencilLoadOp = rng.choose(DE_ARRAY_BEGIN(loadOps), DE_ARRAY_END(loadOps)); const VkAttachmentStoreOp stencilStoreOp = rng.choose(DE_ARRAY_BEGIN(storeOps), DE_ARRAY_END(storeOps)); -- 2.7.4