tests: Enable WaitEventThenSet test

KhronosGroup · Dec 24, 2024 · 1a84a5c · 1a84a5c
1 parent b78313a
commit 1a84a5c
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/tests/unit/sync_object.cpp b/tests/unit/sync_object.cpp
@@ -3753,8 +3753,7 @@ TEST_F(NegativeSyncObject, ResetEventThenSet) {
     m_default_queue->Wait();
 }
 
-// TODO: https://github.com/KhronosGroup/Vulkan-ValidationLayers/issues/8748
-TEST_F(NegativeSyncObject, DISABLED_WaitEventThenSet) {
+TEST_F(NegativeSyncObject, WaitEventThenSet) {
 #if defined(VVL_ENABLE_TSAN)
     // NOTE: This test in particular has failed sporadically on CI when TSAN is enabled.
     GTEST_SKIP() << "https://github.com/KhronosGroup/Vulkan-ValidationLayers/issues/5965";
@@ -3763,6 +3762,10 @@ TEST_F(NegativeSyncObject, DISABLED_WaitEventThenSet) {
 
     RETURN_IF_SKIP(Init());
 
+    if (!m_second_queue) {
+        GTEST_SKIP() << "2 queues are needed";
+    }
+
     vkt::Event event(*m_device);
 
     m_command_buffer.Begin();
@@ -3775,6 +3778,15 @@ TEST_F(NegativeSyncObject, DISABLED_WaitEventThenSet) {
     m_errorMonitor->SetDesiredError("VUID-vkSetEvent-event-09543");
     vk::SetEvent(device(), event.handle());
     m_errorMonitor->VerifyFound();
+
+    vkt::CommandPool second_pool(*m_device, m_second_queue->family_index);
+    vkt::CommandBuffer commandBuffer1(*m_device, second_pool);
+    commandBuffer1.begin();
+    vk::CmdSetEvent(commandBuffer1.handle(), event.handle(), VK_PIPELINE_STAGE_ALL_COMMANDS_BIT);
+    commandBuffer1.end();
+    m_second_queue->Submit(commandBuffer1);
+    m_second_queue->Wait();
+
     m_default_queue->Wait();
 }