tests: Fix VkLayerTest.EnableWsiBeforeUse
authorChris Forbes <chrisforbes@google.com>
Tue, 13 Sep 2016 06:19:21 +0000 (18:19 +1200)
committerChris Forbes <chrisforbes@google.com>
Wed, 14 Sep 2016 21:18:57 +0000 (09:18 +1200)
This was producing a spurious error for completion of the ANI call not
being observable without either a fence or a semaphore.

Signed-off-by: Chris Forbes <chrisforbes@google.com>
tests/layer_validation_tests.cpp

index f1a04d6..fe9d79d 100644 (file)
@@ -2286,13 +2286,20 @@ TEST_F(VkLayerTest, EnableWsiBeforeUse) {
     ASSERT_TRUE(pass);
     m_errorMonitor->VerifyFound();
 
+    // Add a fence to avoid (justifiable) error about not providing fence OR semaphore
+    VkFenceCreateInfo fci = { VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, nullptr, 0 };
+    VkFence fence;
+    err = vkCreateFence(m_device->device(), &fci, nullptr, &fence);
+
     // Try to acquire an image:
     m_errorMonitor->SetDesiredFailureMsg(VK_DEBUG_REPORT_ERROR_BIT_EXT, "extension was not enabled for this");
-    err = vkAcquireNextImageKHR(m_device->device(), swapchain, 0, VK_NULL_HANDLE, VK_NULL_HANDLE, &image_index);
+    err = vkAcquireNextImageKHR(m_device->device(), swapchain, 0, VK_NULL_HANDLE, fence, &image_index);
     pass = (err != VK_SUCCESS);
     ASSERT_TRUE(pass);
     m_errorMonitor->VerifyFound();
 
+    vkDestroyFence(m_device->device(), fence, nullptr);
+
     // Try to present an image:
     //
     // NOTE: Currently can't test this because a real swapchain is needed (as