diff options
| author | Mark Lobodzinski <mark@lunarg.com> | 2017-11-13 12:00:12 -0700 |
|---|---|---|
| committer | Mark Lobodzinski <mark@lunarg.com> | 2017-11-21 15:24:46 -0700 |
| commit | 8ec683e75ef80f3a96762cfc68e57d51d2c5b6f7 (patch) | |
| tree | 33dd944325891bfe6e61939cdfa53c704acfb7ad /layers/core_validation.cpp | |
| parent | 541be909e1b312d7a6eee21ff0bb698830766672 (diff) | |
| download | usermoji-8ec683e75ef80f3a96762cfc68e57d51d2c5b6f7.tar.xz | |
layers: Remove redundant query_state_pair checks
Change-Id: I62b722124c58d98da642cc2c5c17670a7f290d64
Diffstat (limited to 'layers/core_validation.cpp')
| -rw-r--r-- | layers/core_validation.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index 56143924..c07fe5b9 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -3407,8 +3407,7 @@ static bool PreCallValidateGetQueryPoolResults(layer_data *dev_data, VkQueryPool auto query_state_pair = dev_data->queryToStateMap.find(query); if (query_state_pair != dev_data->queryToStateMap.end()) { // Available and in flight - if (qif_pair != queries_in_flight->end() && query_state_pair != dev_data->queryToStateMap.end() && - query_state_pair->second) { + if (qif_pair != queries_in_flight->end() && query_state_pair->second) { for (auto cmd_buffer : qif_pair->second) { auto cb = GetCBNode(dev_data, cmd_buffer); auto query_event_pair = cb->waitedEventsBeforeQueryReset.find(query); @@ -3420,8 +3419,7 @@ static bool PreCallValidateGetQueryPoolResults(layer_data *dev_data, VkQueryPool } } // Unavailable and in flight - } else if (qif_pair != queries_in_flight->end() && query_state_pair != dev_data->queryToStateMap.end() && - !query_state_pair->second) { + } else if (qif_pair != queries_in_flight->end() && !query_state_pair->second) { // TODO : Can there be the same query in use by multiple command buffers in flight? bool make_available = false; for (auto cmd_buffer : qif_pair->second) { @@ -3435,7 +3433,7 @@ static bool PreCallValidateGetQueryPoolResults(layer_data *dev_data, VkQueryPool HandleToUint64(query_pool), first_query + i); } // Unavailable - } else if (query_state_pair != dev_data->queryToStateMap.end() && !query_state_pair->second) { + } else if (!query_state_pair->second) { skip |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_QUERY_POOL_EXT, 0, __LINE__, DRAWSTATE_INVALID_QUERY, "DS", "Cannot get query results on queryPool 0x%" PRIx64 " with index %d which is unavailable.", |