Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions tests/unit/sync_object.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4407,11 +4407,10 @@ TEST_F(NegativeSyncObject, DecreasingTimelineSignals) {

m_default_queue->Submit(vkt::no_cmd, vkt::TimelineSignal(semaphore, 2));

// NOTE: VerifyFound goes after Wait because validation is performed by the Queue thread
m_errorMonitor->SetDesiredError("VUID-VkSubmitInfo-pSignalSemaphores-03242");
m_default_queue->Submit(vkt::no_cmd, vkt::TimelineSignal(semaphore, 1));
m_default_queue->Wait();
m_errorMonitor->VerifyFound();
m_default_queue->Wait();
}

TEST_F(NegativeSyncObject, TimelineHostSignalLargerThanPendingSignal) {
Expand Down Expand Up @@ -4467,11 +4466,10 @@ TEST_F(NegativeSyncObject, DifferentSignalingOrderThanSubmitOrder) {
m_default_queue->Submit(vkt::no_cmd, vkt::TimelineSignal(semaphore, 2));

// Signal 3 resolves wait 1 then value 2 is signaled
// NOTE: VerifyFound goes after Wait because validation is performed by the Queue thread
m_errorMonitor->SetDesiredError("VUID-VkSubmitInfo-pSignalSemaphores-03242");
m_second_queue->Submit(vkt::no_cmd, vkt::TimelineSignal(semaphore, 3));
m_default_queue->Wait();
m_errorMonitor->VerifyFound();
m_default_queue->Wait();
}

TEST_F(NegativeSyncObject, DifferentSignalingOrderThanSubmitOrder2) {
Expand All @@ -4491,11 +4489,10 @@ TEST_F(NegativeSyncObject, DifferentSignalingOrderThanSubmitOrder2) {
m_default_queue->Submit2(vkt::no_cmd, vkt::TimelineSignal(semaphore, 1));

// Signal 3 resolves wait 1 then value 1 is signaled
// NOTE: VerifyFound goes after Wait because validation is performed by the Queue thread
m_errorMonitor->SetDesiredError("VUID-VkSubmitInfo2-semaphore-03882");
m_second_queue->Submit2(vkt::no_cmd, vkt::TimelineSignal(semaphore, 3));
m_default_queue->Wait();
m_errorMonitor->VerifyFound();
m_default_queue->Wait();
}

TEST_F(NegativeSyncObject, BinarySyncDependsOnTimelineWait) {
Expand Down
5 changes: 1 addition & 4 deletions tests/unit/wsi.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3231,11 +3231,8 @@ TEST_F(NegativeWsi, PresentImageWithWrongLayout2) {

m_errorMonitor->SetDesiredError("VUID-VkPresentInfoKHR-pImageIndices-01430");
m_default_queue->Present(m_swapchain, image_index, acquire_semaphore);
m_default_queue->Wait();
// NOTE: in the current implementation submit time validation is run by the queue thread
// (so all dependencies are resolved), that's why we check vuid after Wait(). There's an idea
// to move this validation to actual submit/present call, then we can put Verify after Present.
m_errorMonitor->VerifyFound();
m_default_queue->Wait();
}

TEST_F(NegativeWsi, CreatingSwapchainWithExtent) {
Expand Down
Loading