From 4b4b55da58f4b322a74b6e9aca00ececa0bc77fd Mon Sep 17 00:00:00 2001
From: Artem Kharytoniuk <artem@lunarg.com>
Date: Thu, 17 Sep 2026 23:07:39 +0200
Subject: [PATCH] sync: Fix submit time check

---
 layers/sync/sync_validation.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/layers/sync/sync_validation.cpp b/layers/sync/sync_validation.cpp
index f7cd36d9761..2c811e48330 100644
--- a/layers/sync/sync_validation.cpp
+++ b/layers/sync/sync_validation.cpp
@@ -2337,7 +2337,7 @@ void SyncValidator::PostCallRecordDeviceWaitIdle(VkDevice device, const RecordOb
 bool SyncValidator::PreCallValidateQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR* pPresentInfo,
                                                    const ErrorObject& error_obj) const {
     bool skip = false;
-    if (!syncval_settings.legacy_submit_time_validation) {
+    if (!syncval_settings.IsSubmitTimeProcessingEnabled()) {
         return skip;
     }
     std::lock_guard lock_guard(queue_mutex_);
@@ -2421,7 +2421,7 @@ uint32_t SyncValidator::SetupPresentInfo(const VkPresentInfoKHR& present_info, B
 void SyncValidator::PostCallRecordAcquireNextImageKHR(VkDevice device, VkSwapchainKHR swapchain, uint64_t timeout,
                                                       VkSemaphore semaphore, VkFence fence, uint32_t* pImageIndex,
                                                       const RecordObject& record_obj) {
-    if (!syncval_settings.legacy_submit_time_validation) {
+    if (!syncval_settings.IsSubmitTimeProcessingEnabled()) {
         return;
     }
     RecordAcquireNextImageState(device, swapchain, timeout, semaphore, fence, pImageIndex, record_obj);
@@ -2429,7 +2429,7 @@ void SyncValidator::PostCallRecordAcquireNextImageKHR(VkDevice device, VkSwapcha
 
 void SyncValidator::PostCallRecordAcquireNextImage2KHR(VkDevice device, const VkAcquireNextImageInfoKHR* pAcquireInfo,
                                                        uint32_t* pImageIndex, const RecordObject& record_obj) {
-    if (!syncval_settings.legacy_submit_time_validation) {
+    if (!syncval_settings.IsSubmitTimeProcessingEnabled()) {
         return;
     }
     RecordAcquireNextImageState(device, pAcquireInfo->swapchain, pAcquireInfo->timeout, pAcquireInfo->semaphore,
@@ -2710,7 +2710,7 @@ bool SyncValidator::PropagateTimelineSignals(SignalsUpdate& signals_update) {
 }
 
 void SyncValidator::PostCallRecordGetFenceStatus(VkDevice device, VkFence fence, const RecordObject& record_obj) {
-    if (!syncval_settings.legacy_submit_time_validation) {
+    if (!syncval_settings.IsSubmitTimeProcessingEnabled()) {
         return;
     }
     if (record_obj.result == VK_SUCCESS) {
@@ -2721,7 +2721,7 @@ void SyncValidator::PostCallRecordGetFenceStatus(VkDevice device, VkFence fence,
 
 void SyncValidator::PostCallRecordWaitForFences(VkDevice device, uint32_t fenceCount, const VkFence* pFences, VkBool32 waitAll,
                                                 uint64_t timeout, const RecordObject& record_obj) {
-    if (!syncval_settings.legacy_submit_time_validation) {
+    if (!syncval_settings.IsSubmitTimeProcessingEnabled()) {
         return;
     }
     if ((record_obj.result == VK_SUCCESS) && ((VK_TRUE == waitAll) || (1 == fenceCount))) {
@@ -2735,7 +2735,7 @@ void SyncValidator::PostCallRecordWaitForFences(VkDevice device, uint32_t fenceC
 bool SyncValidator::PreCallValidateSignalSemaphore(VkDevice device, const VkSemaphoreSignalInfo* pSignalInfo,
                                                    const ErrorObject& error_obj) const {
     bool skip = false;
-    if (!syncval_settings.legacy_submit_time_validation) {
+    if (!syncval_settings.IsSubmitTimeProcessingEnabled()) {
         return skip;
     }
     // Although SignalSemaphore does not run on the queue, the signalling can resolve
@@ -2778,7 +2778,7 @@ bool SyncValidator::ProcessSignalSemaphore(VkDevice device, const VkSemaphoreSig
 
 void SyncValidator::PostCallRecordWaitSemaphores(VkDevice device, const VkSemaphoreWaitInfo* pWaitInfo, uint64_t timeout,
                                                  const RecordObject& record_obj) {
-    if (!syncval_settings.legacy_submit_time_validation) {
+    if (!syncval_settings.IsSubmitTimeProcessingEnabled()) {
         return;
     }
     const bool wait_all = pWaitInfo->semaphoreCount == 1 || (pWaitInfo->flags & VK_SEMAPHORE_WAIT_ANY_BIT) == 0;
@@ -2796,7 +2796,7 @@ void SyncValidator::PostCallRecordWaitSemaphoresKHR(VkDevice device, const VkSem
 
 void SyncValidator::PostCallRecordGetSemaphoreCounterValue(VkDevice device, VkSemaphore semaphore, uint64_t* pValue,
                                                            const RecordObject& record_obj) {
-    if (!syncval_settings.legacy_submit_time_validation) {
+    if (!syncval_settings.IsSubmitTimeProcessingEnabled()) {
         return;
     }
     if (record_obj.result == VK_SUCCESS) {