Fix further aspect masks in renderpass2 tests

Components: Vulkan
Affects: dEQP-VK.renderpass.suballocation.multisample.*
         dEQP-VK.renderpass2.suballocation.multisample.*

Change-Id: I52262321f00b2f7ffbe47efa4e455c80b6c5d251

diff --git a/external/vulkancts/modules/vulkan/renderpass/vktRenderPassMultisampleTests.cpp b/external/vulkancts/modules/vulkan/renderpass/vktRenderPassMultisampleTests.cpp
index 6ca9a20..2994964 100644 (file)
--- a/external/vulkancts/modules/vulkan/renderpass/vktRenderPassMultisampleTests.cpp
+++ b/external/vulkancts/modules/vulkan/renderpass/vktRenderPassMultisampleTests.cpp
@@ -464,7 +464,8 @@ Move<VkRenderPass> createRenderPass (const DeviceInterface& vkd,
                                                                         VkDevice                               device,
                                                                         VkFormat                               srcFormat,
                                                                         VkFormat                               dstFormat,
-                                                                        deUint32                               sampleCount)
+                                                                        deUint32                               sampleCount,
+                                                                        RenderPassType                 renderPassType)
 {
        const VkSampleCountFlagBits             samples                                         (sampleCountBitFromomSampleCount(sampleCount));
        const deUint32                                  splitSubpassCount                       (deDivRoundUp32(sampleCount, MAX_COLOR_ATTACHMENT_COUNT));
@@ -491,7 +492,9 @@ Move<VkRenderPass> createRenderPass (const DeviceInterface& vkd,
                DE_NULL,                                                                                                        //                                                                                                                              ||  const void*                                                 pNext;
                0u,                                                                                                                     //  deUint32                                            attachment;                                     ||  deUint32                                                    attachment;
                VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,                                       //  VkImageLayout                                       layout;                                         ||  VkImageLayout                                               layout;
-               0u                                                                                                                      //                                                                                                                              ||  VkImageAspectFlags                                  aspectMask;
+               (renderPassType == RENDERPASS_TYPE_RENDERPASS2)                         //                                                                                                                              ||  VkImageAspectFlags                                  aspectMask;
+                       ? getImageAspectFlags(srcFormat)
+                       : 0u
        );
 
        {
@@ -666,9 +669,9 @@ Move<VkRenderPass> createRenderPass (const DeviceInterface& vkd,
        switch (renderPassType)
        {
                case RENDERPASS_TYPE_LEGACY:
-                       return createRenderPass<AttachmentDescription1, AttachmentReference1, SubpassDescription1, SubpassDependency1, RenderPassCreateInfo1>(vkd, device, srcFormat, dstFormat, sampleCount);
+                       return createRenderPass<AttachmentDescription1, AttachmentReference1, SubpassDescription1, SubpassDependency1, RenderPassCreateInfo1>(vkd, device, srcFormat, dstFormat, sampleCount, renderPassType);
                case RENDERPASS_TYPE_RENDERPASS2:
-                       return createRenderPass<AttachmentDescription2, AttachmentReference2, SubpassDescription2, SubpassDependency2, RenderPassCreateInfo2>(vkd, device, srcFormat, dstFormat, sampleCount);
+                       return createRenderPass<AttachmentDescription2, AttachmentReference2, SubpassDescription2, SubpassDependency2, RenderPassCreateInfo2>(vkd, device, srcFormat, dstFormat, sampleCount, renderPassType);
                default:
                        TCU_THROW(InternalError, "Impossible");
        }