aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Witczak <Dominik.Witczak@amd.com>2016-03-30 13:59:48 +0200
committerTobin Ehlis <tobine@google.com>2016-03-30 07:15:54 -0600
commitfa1c1736c21d297a6794d587124530ecc8450631 (patch)
tree6d63a7cf0501be74907f87cfc5884c4eb72c373a
parent1da36c368a1a36db73033a325e7c3563ef2c3edc (diff)
downloadusermoji-fa1c1736c21d297a6794d587124530ecc8450631.tar.xz
#37: vkAcquireNextImageKHR() will no longer treat VK_NULL_HANDLE arg as a valid semaphore handle
-rw-r--r--layers/core_validation.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp
index 3bfcc369..2b1e975e 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",