Fix dEQP-VK.synchronization* to not duplicate primary command buffers in a VkSubmitInfo

Several tests in dEQP-VK.synchronization* call a helper which adds a
primary command buffer to the submit info, then use a queue submit
helper which adds the same command buffer again.

Components: Vulkan

VK-GL-CTS Issue: 2798

Affects:
dEQP-VK.synchronization*.op.multi_queue.fence.*

Change-Id: Id84f9c327ff6bc54af331c4bdb95167b2958dcd0

diff --git a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationOperationMultiQueueTests.cpp b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationOperationMultiQueueTests.cpp
index ea9d831..c29f64b 100644 (file)
--- a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationOperationMultiQueueTests.cpp
+++ b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationOperationMultiQueueTests.cpp
@@ -735,23 +735,6 @@ public:
                        VkCommandBuffer                                 writeCmdBuffer  = cmdBufferInfos[QUEUETYPE_WRITE].commandBuffer;
                        VkCommandBuffer                                 readCmdBuffer   = cmdBufferInfos[QUEUETYPE_READ].commandBuffer;
 
-                       synchronizationWrapper[QUEUETYPE_WRITE]->addSubmitInfo(
-                               0u,
-                               DE_NULL,
-                               1u,
-                               &cmdBufferInfos[QUEUETYPE_WRITE],
-                               0u,
-                               DE_NULL
-                       );
-                       synchronizationWrapper[QUEUETYPE_READ]->addSubmitInfo(
-                               0u,
-                               DE_NULL,
-                               1u,
-                               &cmdBufferInfos[QUEUETYPE_READ],
-                               0u,
-                               DE_NULL
-                       );
-
                        beginCommandBuffer              (vk, writeCmdBuffer);
                        writeOp->recordCommands (writeCmdBuffer);
                        createBarrierMultiQueue (synchronizationWrapper[QUEUETYPE_WRITE], writeCmdBuffer, writeSync, readSync, *resource, queuePairs[pairNdx].familyIndexWrite, queuePairs[pairNdx].familyIndexRead, m_sharingMode);
@@ -764,7 +747,7 @@ public:
                        readOp->recordCommands  (readCmdBuffer);
                        endCommandBuffer                (vk, readCmdBuffer);
 
-                       submitCommandsAndWait   (vk, device, queuePairs[pairNdx].queueRead, readCmdBuffer);
+                       submitCommandsAndWait(synchronizationWrapper[QUEUETYPE_READ], vk, device, queuePairs[pairNdx].queueRead, readCmdBuffer);
 
                        {
                                const Data      expected = writeOp->getData();