diff options
| author | Chris Forbes <chrisforbes@google.com> | 2016-06-15 13:03:31 +1200 |
|---|---|---|
| committer | Mark Lobodzinski <mark@lunarg.com> | 2016-06-20 15:48:32 -0600 |
| commit | 6f5bf2f2c7ee5dbabd9ed449f66fa34aef99ce16 (patch) | |
| tree | 541f204f1fb3f317812598cd74148f0db0499d2f | |
| parent | c9daf8f06c8187c0be4ca3dc433916b4a8662c92 (diff) | |
| download | usermoji-6f5bf2f2c7ee5dbabd9ed449f66fa34aef99ce16.tar.xz | |
layers: use getFenceNode in verifyWaitFenceState
Change-Id: I46f4ef4c225e199c0415507bd19dc4ffc98a77bc
Signed-off-by: Chris Forbes <chrisforbes@google.com>
| -rw-r--r-- | layers/core_validation.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index a95f99b7..392eab1a 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -4781,16 +4781,17 @@ static void initializeAndTrackMemory(layer_data *dev_data, VkDeviceMemory mem, V static inline bool verifyWaitFenceState(VkDevice device, VkFence fence, const char *apiCall) { layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); bool skipCall = false; - auto pFenceInfo = my_data->fenceMap.find(fence); - if (pFenceInfo != my_data->fenceMap.end()) { - if (!pFenceInfo->second.firstTimeFlag) { - if (!pFenceInfo->second.needsSignaled) { + + auto pFence = getFenceNode(my_data, fence); + if (pFence) { + if (!pFence->firstTimeFlag) { + if (!pFence->needsSignaled) { skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_INFORMATION_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_FENCE_EXT, (uint64_t)fence, __LINE__, MEMTRACK_INVALID_FENCE_STATE, "MEM", "%s specified fence 0x%" PRIxLEAST64 " already in SIGNALED state.", apiCall, (uint64_t)fence); } - if (pFenceInfo->second.queues.empty() && !pFenceInfo->second.swapchain) { // Checking status of unsubmitted fence + if (pFence->queues.empty() && !pFence->swapchain) { // Checking status of unsubmitted fence skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_WARNING_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_FENCE_EXT, reinterpret_cast<uint64_t &>(fence), __LINE__, MEMTRACK_INVALID_FENCE_STATE, "MEM", "%s called for fence 0x%" PRIxLEAST64 " which has not been submitted on a Queue or during " @@ -4798,7 +4799,7 @@ static inline bool verifyWaitFenceState(VkDevice device, VkFence fence, const ch apiCall, reinterpret_cast<uint64_t &>(fence)); } } else { - pFenceInfo->second.firstTimeFlag = false; + pFence->firstTimeFlag = false; } } return skipCall; |