Fixes fragment density map tests

Multiview extension struct being passed to
render pass 2 is not valid. Need to use
viewMask in the render pass 2 structs instead.

Components: Vulkan
VK-GL-CTS Issue: 2899

Affects:
dEQP-VK.renderpass2.fragment_density_map.*

Change-Id: Ieedaacae4fe7ba6d3c222610d96f1785fa01719a

diff --git a/external/vulkancts/modules/vulkan/renderpass/vktRenderPassFragmentDensityMapTests.cpp b/external/vulkancts/modules/vulkan/renderpass/vktRenderPassFragmentDensityMapTests.cpp
index b25ee17..73cf98a 100644 (file)
--- a/external/vulkancts/modules/vulkan/renderpass/vktRenderPassFragmentDensityMapTests.cpp
+++ b/external/vulkancts/modules/vulkan/renderpass/vktRenderPassFragmentDensityMapTests.cpp
@@ -306,28 +306,8 @@ Move<VkRenderPass> createRenderPassProduceDynamicDensityMap(const DeviceInterfac
                }
        };
 
-       vk::VkRenderPassMultiviewCreateInfo     renderPassMultiviewCreateInfo;
-       void*                                                           renderPassInfoPNext = DE_NULL;
-       std::vector<deUint32>                           viewMasks(subpassDescriptions.size(), viewMask);
-
-       if (testParams.viewCount > 1)
-       {
-               renderPassMultiviewCreateInfo =
-               {
-                       VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO,
-                       renderPassInfoPNext,
-                       static_cast<deUint32>(viewMasks.size()),
-                       viewMasks.data(),
-                       0,
-                       DE_NULL,
-                       0U,
-                       DE_NULL
-               };
-               renderPassInfoPNext = (void*)&renderPassMultiviewCreateInfo;
-       }
-
        const RenderPassCreateInfo renderPassInfo(
-               renderPassInfoPNext,                                                                                                    // const void*                                          pNext
+               DE_NULL,                                                                                                                                // const void*                                          pNext
                (VkRenderPassCreateFlags)0,                                                                                             // VkRenderPassCreateFlags                      flags
                static_cast<deUint32>(attachmentDescriptions.size()),                                   // deUint32                                                     attachmentCount
                attachmentDescriptions.data(),                                                                                  // const VkAttachmentDescription*       pAttachments
@@ -543,26 +523,6 @@ Move<VkRenderPass> createRenderPassProduceSubsampledImage(const DeviceInterface&
        renderPassInfoPNext = DE_NULL;
 #endif
 
-       vk::VkRenderPassMultiviewCreateInfo     renderPassMultiviewCreateInfo;
-       std::vector<deUint32>                           viewMasks               (subpassDescriptions.size(), viewMask);
-       deInt32                                                         pViewOffsets    (0);
-
-       if (testParams.viewCount > 1)
-       {
-               renderPassMultiviewCreateInfo =
-               {
-                       VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO,
-                       renderPassInfoPNext,
-                       static_cast<deUint32>(viewMasks.size()),                                                                // deUint32                             subpassCount
-                       viewMasks.data(),                                                                                                               // const deUint32*              pViewMasks
-                       makeCopySubpass ? 1u : 0u,                                                                                              // deUint32                             dependencyCount
-                       makeCopySubpass ? &pViewOffsets : DE_NULL,                                                              // const deInt32*               pViewOffsets
-                       0u,                                                                                                                                             // deUint32                             correlationMaskCount
-                       DE_NULL,                                                                                                                                // const deUint32*              pCorrelationMasks
-               };
-               renderPassInfoPNext = (void*)&renderPassMultiviewCreateInfo;
-       }
-
        const RenderPassCreateInfo      renderPassInfo(
                renderPassInfoPNext,                                                                                                            // const void*                                          pNext
                (VkRenderPassCreateFlags)0,                                                                                                     // VkRenderPassCreateFlags                      flags