diff options
author | Chris Forbes <chrisforbes@google.com> | 2017-04-24 11:22:45 -0700 |
---|---|---|
committer | Chris Forbes <chrisf@ijw.co.nz> | 2017-04-25 07:39:07 +1200 |
commit | 7b34d10b918c1f69e7252174965c6a7a7c35ae05 (patch) | |
tree | 8b66b3187edcb0950ceaedf335222971792c3a61 | |
parent | 1c32b3aa96bc03f29da8fa1c89119a86b0de051b (diff) |
layers: Inline VkCommandBuffer overload of clear_cmd_buf_...
This was silly. On the very next line, we called GetCBNode again.
-rw-r--r-- | layers/core_validation.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index d7874c76..6e9a53a4 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -602,10 +602,6 @@ static void clear_cmd_buf_and_mem_references(layer_data *dev_data, GLOBAL_CB_NOD cb_node->validate_functions.clear(); } } -// Overloaded call to above function when GLOBAL_CB_NODE has not already been looked-up -static void clear_cmd_buf_and_mem_references(layer_data *dev_data, const VkCommandBuffer cb) { - clear_cmd_buf_and_mem_references(dev_data, GetCBNode(dev_data, cb)); -} // Clear a single object binding from given memory object, or report error if binding is missing static bool ClearMemoryObjectBinding(layer_data *dev_data, uint64_t handle, VulkanObjectType type, VkDeviceMemory mem) { @@ -5778,8 +5774,8 @@ static void PostCallRecordDestroyCommandPool(layer_data *dev_data, VkCommandPool // Must remove cmdpool from cmdpoolmap, after removing all cmdbuffers in its list from the commandBufferMap clearCommandBuffersInFlight(dev_data, cp_state); for (auto cb : cp_state->commandBuffers) { - clear_cmd_buf_and_mem_references(dev_data, cb); auto cb_node = GetCBNode(dev_data, cb); + clear_cmd_buf_and_mem_references(dev_data, cb_node); // Remove references to this cb_node prior to delete // TODO : Need better solution here, resetCB? for (auto obj : cb_node->object_bindings) { |