From 428991a8def140d8bdbd90266d64d6ef112605cf Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Tue, 13 Sep 2016 18:19:21 +1200 Subject: [PATCH] tests: Fix VkLayerTest.EnableWsiBeforeUse 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 --- tests/layer_validation_tests.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp index f1a04d6..fe9d79d 100644 --- a/tests/layer_validation_tests.cpp +++ b/tests/layer_validation_tests.cpp @@ -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 -- 2.7.4