commit 342b9bfb2e100f077baf14caf51501532877131c
author Tobin Ehlis <tobin@lunarg.com> Tue Sep 22 10:11:37 2015 -0600
committer Tobin Ehlis <tobin@lunarg.com> Thu Sep 24 08:52:00 2015 -0600
tree 2a3e2646daaccc4bfeca7d4843d0166d41f98495
parent 3561380178e03a4f8a03867ff43d37a0d5455fe0

layers: Added Image layer to validation test suite with new test for bad ImageView

layers/image.cpp

diff --git a/layers/image.cpp b/layers/image.cpp
index 10fc36c..d822b2e 100644
--- a/layers/image.cpp
+++ b/layers/image.cpp
@@ -50,7 +50,7 @@
     debug_report_data *report_data;
     VkDbgMsgCallback logging_callback;
     VkPhysicalDevice physicalDevice;
-    unordered_map<uint64_t, unique_ptr<VkImageCreateInfo>> imageMap;
+    unordered_map<uint64_t, unique_ptr<IMAGE_STATE>> imageMap;
 } layer_data;
 
 static unordered_map<void*, layer_data*> layer_data_map;
@@ -171,6 +171,7 @@
         layer_data *device_data = get_my_data_ptr(get_dispatch_key(*pDevice), layer_data_map);
         device_data->report_data = layer_debug_report_create_device(instance_data->report_data, *pDevice);
         device_data->physicalDevice = physicalDevice;
+        device_data->imageMap.reserve(10);
     }
 
     return result;
@@ -285,7 +286,7 @@
     VkResult result = get_dispatch_table(image_device_table_map, device)->CreateImage(device, pCreateInfo, pImage);
 
     if(result == VK_SUCCESS) {
-        device_data->imageMap[pImage->handle] = unique_ptr<VkImageCreateInfo>(new VkImageCreateInfo(*pCreateInfo));
+        device_data->imageMap[pImage->handle] = unique_ptr<IMAGE_STATE>(new IMAGE_STATE(pCreateInfo));
     }
     return result;
 }
@@ -433,6 +434,8 @@
         return (PFN_vkVoidFunction) vkDestroyDevice;
     if (!strcmp(funcName, "vkCreateImage"))
         return (PFN_vkVoidFunction) vkCreateImage;
+    if (!strcmp(funcName, "vkCreateImageView"))
+        return (PFN_vkVoidFunction) vkCreateImageView;
     if (!strcmp(funcName, "vkCreateRenderPass"))
         return (PFN_vkVoidFunction) vkCreateRenderPass;