From 6e40341a34fdb399ad1e93e706b04418b0f91d81 Mon Sep 17 00:00:00 2001 From: Jari Komppa Date: Wed, 1 Dec 2021 17:00:14 +0200 Subject: [PATCH] Fix stencil layout transitions in samplemask tests This change fixes the validation layer errors for the _samplemask cases. affects: dEQP-VK.renderpass2.depth_stencil_resolve.*_samplemask Components: Vulkan VK-GL-CTS issue: 3362 Change-Id: I0e1d9a44c3ed127fbde3765725243fae722ad938 --- .../modules/vulkan/renderpass/vktRenderPassDepthStencilResolveTests.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/vulkancts/modules/vulkan/renderpass/vktRenderPassDepthStencilResolveTests.cpp b/external/vulkancts/modules/vulkan/renderpass/vktRenderPassDepthStencilResolveTests.cpp index cc42a64..77b8d4d 100644 --- a/external/vulkancts/modules/vulkan/renderpass/vktRenderPassDepthStencilResolveTests.cpp +++ b/external/vulkancts/modules/vulkan/renderpass/vktRenderPassDepthStencilResolveTests.cpp @@ -467,7 +467,7 @@ Move DepthStencilResolveTest::createRenderPass(VkFormat vkformat, } else { - layout = VK_IMAGE_LAYOUT_GENERAL; + layout = m_config.sampleMask ? VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL_KHR : VK_IMAGE_LAYOUT_GENERAL; stencilLayout.stencilLayout = VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL_KHR; finalLayout = VK_IMAGE_LAYOUT_GENERAL; // This aspect should be unused. stencilFinalLayout.stencilFinalLayout = VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL; -- 2.7.4