layers: Fix test fallout in CommandBufferTwoSubmits
This test was accidentally triggering the fence reuse case as well, and
blindly continuing past that error. It doesn't need to use the fence at
all, so don't supply one.
Also tweak the layer to not run into the assert if the caller elected to
skip -- QueueSubmit still has validation and updates tangled together,
but this improves it slightly.
Signed-off-by: Chris Forbes <chrisforbes@google.com>
diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index bdb10bc..39fdbca 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -4165,18 +4165,11 @@
}
TEST_F(VkLayerTest, CommandBufferTwoSubmits) {
- vk_testing::Fence testFence;
-
m_errorMonitor->SetDesiredFailureMsg(
VK_DEBUG_REPORT_ERROR_BIT_EXT,
"was begun w/ VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT set, but has "
"been submitted");
- VkFenceCreateInfo fenceInfo = {};
- fenceInfo.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO;
- fenceInfo.pNext = NULL;
- fenceInfo.flags = 0;
-
ASSERT_NO_FATAL_FAILURE(InitState());
ASSERT_NO_FATAL_FAILURE(InitViewport());
ASSERT_NO_FATAL_FAILURE(InitRenderTarget());
@@ -4188,8 +4181,6 @@
m_stencil_clear_color, NULL);
EndCommandBuffer();
- testFence.init(*m_device, fenceInfo);
-
// Bypass framework since it does the waits automatically
VkResult err = VK_SUCCESS;
VkSubmitInfo submit_info;
@@ -4203,12 +4194,12 @@
submit_info.signalSemaphoreCount = 0;
submit_info.pSignalSemaphores = NULL;
- err = vkQueueSubmit(m_device->m_queue, 1, &submit_info, testFence.handle());
+ err = vkQueueSubmit(m_device->m_queue, 1, &submit_info, VK_NULL_HANDLE);
ASSERT_VK_SUCCESS(err);
// Cause validation error by re-submitting cmd buffer that should only be
// submitted once
- err = vkQueueSubmit(m_device->m_queue, 1, &submit_info, testFence.handle());
+ err = vkQueueSubmit(m_device->m_queue, 1, &submit_info, VK_NULL_HANDLE);
m_errorMonitor->VerifyFound();
}