From 506e2d46ca1fad5a971dc481a896d15d62243b1d Mon Sep 17 00:00:00 2001
From: Mark Lobodzinski <mark@lunarg.com>
Date: Tue, 17 Jan 2017 16:24:29 -0700
Subject: [PATCH] layers: Fixup CreateImage paramter list

Change-Id: Idfcc569d3985a4ff31503535af9c8329c6304f6a
---
 layers/buffer_validation.cpp | 14 +++++++-------
 layers/buffer_validation.h   |  8 ++++----
 layers/core_validation.cpp   |  3 ++-
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/layers/buffer_validation.cpp b/layers/buffer_validation.cpp
index 0f47b30..4094b0a 100644
--- a/layers/buffer_validation.cpp
+++ b/layers/buffer_validation.cpp
@@ -23,15 +23,15 @@
 
 #include "buffer_validation.h"
 
-VK_LAYER_EXPORT void PostCallRecordCreateImage(std::unordered_map<VkImage, std::unique_ptr<IMAGE_STATE>> &imageMap,
-                                               std::unordered_map<VkImage, std::vector<ImageSubresourcePair>> &imageSubresourceMap,
-                                               std::unordered_map<ImageSubresourcePair, IMAGE_LAYOUT_NODE> &imageLayoutMap,
-                                               const VkImageCreateInfo *pCreateInfo, VkImage *pImage) {
+void PostCallRecordCreateImage(std::unordered_map<VkImage, std::unique_ptr<IMAGE_STATE>> *imageMap,
+                               std::unordered_map<VkImage, std::vector<ImageSubresourcePair>> *imageSubresourceMap,
+                               std::unordered_map<ImageSubresourcePair, IMAGE_LAYOUT_NODE> *imageLayoutMap,
+                               const VkImageCreateInfo *pCreateInfo, VkImage *pImage) {
     IMAGE_LAYOUT_NODE image_state;
     image_state.layout = pCreateInfo->initialLayout;
     image_state.format = pCreateInfo->format;
-    imageMap.insert(std::make_pair(*pImage, std::unique_ptr<IMAGE_STATE>(new IMAGE_STATE(*pImage, pCreateInfo))));
+    (*imageMap).insert(std::make_pair(*pImage, std::unique_ptr<IMAGE_STATE>(new IMAGE_STATE(*pImage, pCreateInfo))));
     ImageSubresourcePair subpair{*pImage, false, VkImageSubresource()};
-    imageSubresourceMap[*pImage].push_back(subpair);
-    imageLayoutMap[subpair] = image_state;
+    (*imageSubresourceMap)[*pImage].push_back(subpair);
+    (*imageLayoutMap)[subpair] = image_state;
 }
diff --git a/layers/buffer_validation.h b/layers/buffer_validation.h
index d99e565..b8c094d 100644
--- a/layers/buffer_validation.h
+++ b/layers/buffer_validation.h
@@ -26,9 +26,9 @@
 #include <unordered_map>
 #include <vector>
 
-VK_LAYER_EXPORT void PostCallRecordCreateImage(std::unordered_map<VkImage, std::unique_ptr<IMAGE_STATE>> &imageMap,
-                                               std::unordered_map<VkImage, std::vector<ImageSubresourcePair>> &imageSubresourceMap,
-                                               std::unordered_map<ImageSubresourcePair, IMAGE_LAYOUT_NODE> &imageLayoutMap,
-                                               const VkImageCreateInfo *pCreateInfo, VkImage *pImage);
+void PostCallRecordCreateImage(std::unordered_map<VkImage, std::unique_ptr<IMAGE_STATE>> *imageMap,
+                               std::unordered_map<VkImage, std::vector<ImageSubresourcePair>> *imageSubresourceMap,
+                               std::unordered_map<ImageSubresourcePair, IMAGE_LAYOUT_NODE> *imageLayoutMap,
+                               const VkImageCreateInfo *pCreateInfo, VkImage *pImage);
 
 #endif // CORE_VALIDATION_BUFFER_VALIDATION_H_
diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp
index 03429a1..4087178 100644
--- a/layers/core_validation.cpp
+++ b/layers/core_validation.cpp
@@ -6483,7 +6483,8 @@ VKAPI_ATTR VkResult VKAPI_CALL CreateImage(VkDevice device, const VkImageCreateI
 
     if (VK_SUCCESS == result) {
         std::lock_guard<std::mutex> lock(global_lock);
-        PostCallRecordCreateImage(dev_data->imageMap, dev_data->imageSubresourceMap, dev_data->imageLayoutMap, pCreateInfo, pImage);
+        PostCallRecordCreateImage(&dev_data->imageMap, &dev_data->imageSubresourceMap, &dev_data->imageLayoutMap, pCreateInfo,
+                                  pImage);
     }
     return result;
 }
-- 
2.7.4