commit 82742f6380e81786f4e80d56c031cdae08a06be1
author Mark Lobodzinski <mark@lunarg.com> Wed Sep 11 11:20:26 2019 -0600
committer Mark Lobodzinski <mark@lunarg.com> Mon Sep 16 16:30:49 2019 -0600
tree b553d3705e68cd4698693d8f75d84315a4fbf7a6
parent 1e76a7db549cd98eb1d5078af48b775924b5c8b3

objlifetimes: Remove unused param from RecordDestroyObject

Change-Id: I10f93b187cc1d738015c4673330e28b2b3f2be59

layers/object_tracker_utils.cpp

diff --git a/layers/object_tracker_utils.cpp b/layers/object_tracker_utils.cpp
index 69645b2..b332663 100644
--- a/layers/object_tracker_utils.cpp
+++ b/layers/object_tracker_utils.cpp
@@ -315,7 +315,7 @@
     for (const auto &iit : snapshot) {
         auto pNode = iit.second;
         VkPhysicalDevice physical_device = reinterpret_cast<VkPhysicalDevice>(pNode->handle);
-        RecordDestroyObject(instance, physical_device, kVulkanObjectTypePhysicalDevice);
+        RecordDestroyObject(physical_device, kVulkanObjectTypePhysicalDevice);
     }
 
     // Destroy child devices
@@ -325,12 +325,12 @@
         VkDevice device = reinterpret_cast<VkDevice>(pNode->handle);
         DestroyLeakedInstanceObjects(instance);
 
-        RecordDestroyObject(instance, device, kVulkanObjectTypeDevice);
+        RecordDestroyObject(device, kVulkanObjectTypeDevice);
     }
 }
 
 void ObjectLifetimes::PostCallRecordDestroyInstance(VkInstance instance, const VkAllocationCallbacks *pAllocator) {
-    RecordDestroyObject(instance, instance, kVulkanObjectTypeInstance);
+    RecordDestroyObject(instance, kVulkanObjectTypeInstance);
 }
 
 bool ObjectLifetimes::PreCallValidateDestroyDevice(VkDevice device, const VkAllocationCallbacks *pAllocator) {
@@ -348,7 +348,7 @@
     auto instance_data = GetLayerDataPtr(get_dispatch_key(physical_device), layer_data_map);
     ValidationObject *validation_data = GetValidationObject(instance_data->object_dispatch, LayerObjectTypeObjectTracker);
     ObjectLifetimes *object_lifetimes = static_cast<ObjectLifetimes *>(validation_data);
-    object_lifetimes->RecordDestroyObject(physical_device, device, kVulkanObjectTypeDevice);
+    object_lifetimes->RecordDestroyObject(device, kVulkanObjectTypeDevice);
     DestroyLeakedDeviceObjects(device);
 
     // Clean up Queue's MemRef Linked Lists
@@ -433,7 +433,7 @@
     if (itr != object_map[kVulkanObjectTypeDescriptorPool].end()) {
         auto pPoolNode = itr->second;
         for (auto set : *pPoolNode->child_objects) {
-            RecordDestroyObject(device, (VkDescriptorSet)set, kVulkanObjectTypeDescriptorSet);
+            RecordDestroyObject((VkDescriptorSet)set, kVulkanObjectTypeDescriptorSet);
         }
         pPoolNode->child_objects->clear();
     }
@@ -631,7 +631,7 @@
 void ObjectLifetimes::PreCallRecordFreeCommandBuffers(VkDevice device, VkCommandPool commandPool, uint32_t commandBufferCount,
                                                       const VkCommandBuffer *pCommandBuffers) {
     for (uint32_t i = 0; i < commandBufferCount; i++) {
-        RecordDestroyObject(device, pCommandBuffers[i], kVulkanObjectTypeCommandBuffer);
+        RecordDestroyObject(pCommandBuffers[i], kVulkanObjectTypeCommandBuffer);
     }
 }
 
@@ -643,7 +643,7 @@
 
 void ObjectLifetimes::PreCallRecordDestroySwapchainKHR(VkDevice device, VkSwapchainKHR swapchain,
                                                        const VkAllocationCallbacks *pAllocator) {
-    RecordDestroyObject(device, swapchain, kVulkanObjectTypeSwapchainKHR);
+    RecordDestroyObject(swapchain, kVulkanObjectTypeSwapchainKHR);
 
     auto snapshot = swapchainImageMap.snapshot(
         [swapchain](std::shared_ptr<ObjTrackState> pNode) { return pNode->parent_object == HandleToUint64(swapchain); });
@@ -677,7 +677,7 @@
         pPoolNode = itr->second;
     }
     for (uint32_t i = 0; i < descriptorSetCount; i++) {
-        RecordDestroyObject(device, pDescriptorSets[i], kVulkanObjectTypeDescriptorSet);
+        RecordDestroyObject(pDescriptorSets[i], kVulkanObjectTypeDescriptorSet);
         if (pPoolNode) {
             pPoolNode->child_objects->erase(HandleToUint64(pDescriptorSets[i]));
         }
@@ -713,11 +713,11 @@
     if (itr != object_map[kVulkanObjectTypeDescriptorPool].end()) {
         auto pPoolNode = itr->second;
         for (auto set : *pPoolNode->child_objects) {
-            RecordDestroyObject(device, (VkDescriptorSet)set, kVulkanObjectTypeDescriptorSet);
+            RecordDestroyObject((VkDescriptorSet)set, kVulkanObjectTypeDescriptorSet);
         }
         pPoolNode->child_objects->clear();
     }
-    RecordDestroyObject(device, descriptorPool, kVulkanObjectTypeDescriptorPool);
+    RecordDestroyObject(descriptorPool, kVulkanObjectTypeDescriptorPool);
 }
 
 bool ObjectLifetimes::PreCallValidateDestroyCommandPool(VkDevice device, VkCommandPool commandPool,
@@ -746,9 +746,9 @@
         [commandPool](std::shared_ptr<ObjTrackState> pNode) { return pNode->parent_object == HandleToUint64(commandPool); });
     // A CommandPool's cmd buffers are implicitly deleted when pool is deleted. Remove this pool's cmdBuffers from cmd buffer map.
     for (const auto &itr : snapshot) {
-        RecordDestroyObject(device, reinterpret_cast<VkCommandBuffer>(itr.first), kVulkanObjectTypeCommandBuffer);
+        RecordDestroyObject(reinterpret_cast<VkCommandBuffer>(itr.first), kVulkanObjectTypeCommandBuffer);
     }
-    RecordDestroyObject(device, commandPool, kVulkanObjectTypeCommandPool);
+    RecordDestroyObject(commandPool, kVulkanObjectTypeCommandPool);
 }
 
 bool ObjectLifetimes::PreCallValidateGetPhysicalDeviceQueueFamilyProperties2(VkPhysicalDevice physicalDevice,