Merge vk-gl-cts/vulkan-cts-1.2.4 into vk-gl-cts/vulkan-cts-1.2.5

Change-Id: I911747cbf1726e161c457fa6ae666148ff0b36c7

diff --cc external/vulkancts/modules/vulkan/renderpass/vktRenderPassDepthStencilResolveTests.cpp
index 53ea47c,e27aed6..3fc8f1d
--- 1/external/vulkancts/modules/vulkan/renderpass/vktRenderPassDepthStencilResolveTests.cpp
--- 2/external/vulkancts/modules/vulkan/renderpass/vktRenderPassDepthStencilResolveTests.cpp
+++ b/external/vulkancts/modules/vulkan/renderpass/vktRenderPassDepthStencilResolveTests.cpp
@@@ -580,10 -528,10 +580,10 @@@ Move<VkRenderPass> DepthStencilResolveT
        AttachmentReference2 singlesampleAttachmentRef                  // VkAttachmentReference2
        (
                                                                                                                                // VkStructureType                                      sType;
-               DE_NULL,                                                                                                // const void*                                          pNext;
+               attachmentRefStencil,                                                                   // const void*                                          pNext;
                (m_config.unusedResolve ? VK_ATTACHMENT_UNUSED : 1u),   // deUint32                                                     attachment;
                layout,                                                                                                 // VkImageLayout                                        layout;
 -              0u                                                                                                              // VkImageAspectFlags                           aspectMask;
 +              aspectFlags                                                                                             // VkImageAspectFlags                           aspectMask;
        );
  
        std::vector<AttachmentDescription2> attachments;