From fa1c1736c21d297a6794d587124530ecc8450631 Mon Sep 17 00:00:00 2001 From: Dominik Witczak Date: Wed, 30 Mar 2016 13:59:48 +0200 Subject: [PATCH] #37: vkAcquireNextImageKHR() will no longer treat VK_NULL_HANDLE arg as a valid semaphore handle --- layers/core_validation.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index 3bfcc36..2b1e975 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -10606,7 +10606,8 @@ VKAPI_ATTR VkResult VKAPI_CALL vkAcquireNextImageKHR(VkDevice device, VkSwapchai bool skipCall = false; #if MTMERGESOURCE loader_platform_thread_lock_mutex(&globalLock); - if (dev_data->semaphoreMap.find(semaphore) != dev_data->semaphoreMap.end()) { + if (semaphore != VK_NULL_HANDLE && + dev_data->semaphoreMap.find(semaphore) != dev_data->semaphoreMap.end()) { if (dev_data->semaphoreMap[semaphore].state != MEMTRACK_SEMAPHORE_STATE_UNSET) { skipCall = log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_SEMAPHORE_EXT, (uint64_t)semaphore, __LINE__, MEMTRACK_NONE, "SEMAPHORE", -- 2.7.4