commit 34e04bf30a239931424b86ccb0e9649eeb4d8cbf
author Mark Lobodzinski <mark@lunarg.com> Fri Apr 19 13:31:53 2019 -0600
committer Mark Lobodzinski <mark@lunarg.com> Tue Apr 23 08:46:22 2019 -0600
tree 348aebb606ac630838d7d0b0a2fcaa316db39213
parent b02a4859a704ac2e2be0d9ef8459e66e13cb542c

corechecks: Remove GetImageMap helper

Change-Id: Ib7f2dfb345dccfbe7a554813b759b411161ca75b

layers/buffer_validation.cpp

diff --git a/layers/buffer_validation.cpp b/layers/buffer_validation.cpp
index 8937e3d..4ae86b8 100644
--- a/layers/buffer_validation.cpp
+++ b/layers/buffer_validation.cpp
@@ -1447,7 +1447,7 @@
     if (GetDeviceExtensions()->vk_android_external_memory_android_hardware_buffer) {
         RecordCreateImageANDROID(pCreateInfo, is_node);
     }
-    GetImageMap()->insert(std::make_pair(*pImage, std::unique_ptr<IMAGE_STATE>(is_node)));
+    imageMap.insert(std::make_pair(*pImage, std::unique_ptr<IMAGE_STATE>(is_node)));
     ImageSubresourcePair subpair{*pImage, false, VkImageSubresource()};
     (*GetImageSubresourceMap())[*pImage].push_back(subpair);
     (*GetImageLayoutMap())[subpair] = image_state;
@@ -1479,7 +1479,7 @@
     ClearMemoryObjectBindings(obj_struct.handle, kVulkanObjectTypeImage);
     EraseQFOReleaseBarriers<VkImageMemoryBarrier>(image);
     // Remove image from imageMap
-    GetImageMap()->erase(image);
+    imageMap.erase(image);
     std::unordered_map<VkImage, std::vector<ImageSubresourcePair>> *imageSubresourceMap = GetImageSubresourceMap();
 
     const auto &sub_entry = imageSubresourceMap->find(image);