Fix device mask in swapchain tests

All elements of pCommandBufferDeviceMasks must be valid device masks

Affects:
dEQP-VK.wsi.*.swapchain.render.device_group

Components: Vulkan
VK-GL-CTS issue: 1618

Change-Id: Ic3857672a99b3d4039b26cd0139c08bca7a0e5da

diff --git a/external/vulkancts/modules/vulkan/wsi/vktWsiSwapchainTests.cpp b/external/vulkancts/modules/vulkan/wsi/vktWsiSwapchainTests.cpp
index 5a37589..76e7c09 100644 (file)
--- a/external/vulkancts/modules/vulkan/wsi/vktWsiSwapchainTests.cpp
+++ b/external/vulkancts/modules/vulkan/wsi/vktWsiSwapchainTests.cpp
@@ -1629,10 +1629,13 @@ tcu::TestStatus deviceGroupRenderTest (Context& context, Type wsiType)
                                renderer.recordDeviceGroupFrame(commandBuffer, firstDeviceID, secondDeviceID, physicalDevicesInGroupCount, imageNdx, frameNdx);
 
                                // submit queue
-                               deUint32 deviceMask = (1 << firstDeviceID) | (1 << secondDeviceID);
+                               deUint32 deviceMask = (1 << firstDeviceID);
                                std::vector<deUint32> deviceIndices(1, firstDeviceID);
                                if (physicalDevicesInGroupCount > 1)
+                               {
+                                       deviceMask |= (1 << secondDeviceID);
                                        deviceIndices.push_back(secondDeviceID);
+                               }
                                const VkDeviceGroupSubmitInfo deviceGroupSubmitInfo =
                                {
                                        VK_STRUCTURE_TYPE_DEVICE_GROUP_SUBMIT_INFO_KHR,         // sType