Fix multisample resolve tests with integer formats

If attachments use an integer format, resolveMode must be either
VK_RESOLVE_MODE_NONE or VK_RESOLVE_MODE_SAMPLED_ZERO_BIT

Components: Vulkan

VK-GL-CTS issue: 3935

Affected tests:
dEQP-VK.*.multisample_resolve.*

Change-Id: I3b410d06185a2572e4e199a23e0dffec9b457a22

diff --git a/external/vulkancts/modules/vulkan/renderpass/vktRenderPassMultisampleResolveTests.cpp b/external/vulkancts/modules/vulkan/renderpass/vktRenderPassMultisampleResolveTests.cpp
index ac52cb7..c3bb7f3 100644 (file)
--- a/external/vulkancts/modules/vulkan/renderpass/vktRenderPassMultisampleResolveTests.cpp
+++ b/external/vulkancts/modules/vulkan/renderpass/vktRenderPassMultisampleResolveTests.cpp
@@ -789,6 +789,9 @@ void MultisampleRenderPassTestInstance::submit (void)
                {
                        colorAttachments[i].imageView = **m_multisampleImageViews[i];
                        colorAttachments[i].resolveImageView = **m_singlesampleImageViews[i];
+                       if (isUintFormat(m_format) || isIntFormat(m_format)) {
+                               colorAttachments[i].resolveMode = vk::VK_RESOLVE_MODE_SAMPLE_ZERO_BIT;
+                       }
                }
 
                vk::VkRenderingInfoKHR renderingInfo