Skip to content

Commit 6d82cb9

Browse files
committed
sync: Fix submit time check
1 parent 53a2448 commit 6d82cb9

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

layers/sync/sync_validation.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2337,7 +2337,7 @@ void SyncValidator::PostCallRecordDeviceWaitIdle(VkDevice device, const RecordOb
23372337
bool SyncValidator::PreCallValidateQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR* pPresentInfo,
23382338
const ErrorObject& error_obj) const {
23392339
bool skip = false;
2340-
if (!syncval_settings.legacy_submit_time_validation) {
2340+
if (!syncval_settings.IsSubmitTimeProcessingEnabled()) {
23412341
return skip;
23422342
}
23432343
std::lock_guard lock_guard(queue_mutex_);
@@ -2421,15 +2421,15 @@ uint32_t SyncValidator::SetupPresentInfo(const VkPresentInfoKHR& present_info, B
24212421
void SyncValidator::PostCallRecordAcquireNextImageKHR(VkDevice device, VkSwapchainKHR swapchain, uint64_t timeout,
24222422
VkSemaphore semaphore, VkFence fence, uint32_t* pImageIndex,
24232423
const RecordObject& record_obj) {
2424-
if (!syncval_settings.legacy_submit_time_validation) {
2424+
if (!syncval_settings.IsSubmitTimeProcessingEnabled()) {
24252425
return;
24262426
}
24272427
RecordAcquireNextImageState(device, swapchain, timeout, semaphore, fence, pImageIndex, record_obj);
24282428
}
24292429

24302430
void SyncValidator::PostCallRecordAcquireNextImage2KHR(VkDevice device, const VkAcquireNextImageInfoKHR* pAcquireInfo,
24312431
uint32_t* pImageIndex, const RecordObject& record_obj) {
2432-
if (!syncval_settings.legacy_submit_time_validation) {
2432+
if (!syncval_settings.IsSubmitTimeProcessingEnabled()) {
24332433
return;
24342434
}
24352435
RecordAcquireNextImageState(device, pAcquireInfo->swapchain, pAcquireInfo->timeout, pAcquireInfo->semaphore,
@@ -2710,7 +2710,7 @@ bool SyncValidator::PropagateTimelineSignals(SignalsUpdate& signals_update) {
27102710
}
27112711

27122712
void SyncValidator::PostCallRecordGetFenceStatus(VkDevice device, VkFence fence, const RecordObject& record_obj) {
2713-
if (!syncval_settings.legacy_submit_time_validation) {
2713+
if (!syncval_settings.IsSubmitTimeProcessingEnabled()) {
27142714
return;
27152715
}
27162716
if (record_obj.result == VK_SUCCESS) {
@@ -2721,7 +2721,7 @@ void SyncValidator::PostCallRecordGetFenceStatus(VkDevice device, VkFence fence,
27212721

27222722
void SyncValidator::PostCallRecordWaitForFences(VkDevice device, uint32_t fenceCount, const VkFence* pFences, VkBool32 waitAll,
27232723
uint64_t timeout, const RecordObject& record_obj) {
2724-
if (!syncval_settings.legacy_submit_time_validation) {
2724+
if (!syncval_settings.IsSubmitTimeProcessingEnabled()) {
27252725
return;
27262726
}
27272727
if ((record_obj.result == VK_SUCCESS) && ((VK_TRUE == waitAll) || (1 == fenceCount))) {
@@ -2735,7 +2735,7 @@ void SyncValidator::PostCallRecordWaitForFences(VkDevice device, uint32_t fenceC
27352735
bool SyncValidator::PreCallValidateSignalSemaphore(VkDevice device, const VkSemaphoreSignalInfo* pSignalInfo,
27362736
const ErrorObject& error_obj) const {
27372737
bool skip = false;
2738-
if (!syncval_settings.legacy_submit_time_validation) {
2738+
if (!syncval_settings.IsSubmitTimeProcessingEnabled()) {
27392739
return skip;
27402740
}
27412741
// Although SignalSemaphore does not run on the queue, the signalling can resolve
@@ -2778,7 +2778,7 @@ bool SyncValidator::ProcessSignalSemaphore(VkDevice device, const VkSemaphoreSig
27782778

27792779
void SyncValidator::PostCallRecordWaitSemaphores(VkDevice device, const VkSemaphoreWaitInfo* pWaitInfo, uint64_t timeout,
27802780
const RecordObject& record_obj) {
2781-
if (!syncval_settings.legacy_submit_time_validation) {
2781+
if (!syncval_settings.IsSubmitTimeProcessingEnabled()) {
27822782
return;
27832783
}
27842784
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
27962796

27972797
void SyncValidator::PostCallRecordGetSemaphoreCounterValue(VkDevice device, VkSemaphore semaphore, uint64_t* pValue,
27982798
const RecordObject& record_obj) {
2799-
if (!syncval_settings.legacy_submit_time_validation) {
2799+
if (!syncval_settings.IsSubmitTimeProcessingEnabled()) {
28002800
return;
28012801
}
28022802
if (record_obj.result == VK_SUCCESS) {

0 commit comments

Comments
 (0)