commit 50c4ad949d767308614da1dcf70151874fbd9129
author Chia-I Wu <olvaffe@gmail.com> Thu Apr 28 16:04:15 2016 +0800
committer Tobin Ehlis <tobine@google.com> Thu May 05 06:42:19 2016 -0600
tree dd26ed44453a7576e319a08ed16ee3a1f0840496
parent 79d1c8d936a9f4e625f17f0ddf79c5d463b2ee5d

device_limits: avoid invalid GIPA call in vkCreateDevice

Save VkInstance in layer_data so that we query vkCreateDevice with a valid
instance.

layers/device_limits.cpp

diff --git a/layers/device_limits.cpp b/layers/device_limits.cpp
index e97c54a..8aa538e 100644
--- a/layers/device_limits.cpp
+++ b/layers/device_limits.cpp
@@ -49,6 +49,8 @@
 
 // This struct will be stored in a map hashed by the dispatchable object
 struct layer_data {
+    VkInstance instance;
+
     debug_report_data *report_data;
     std::vector<VkDebugReportCallbackEXT> logging_callback;
     VkLayerDispatchTable *device_dispatch_table;
@@ -116,6 +118,7 @@
         return result;
 
     layer_data *my_data = get_my_data_ptr(get_dispatch_key(*pInstance), layer_data_map);
+    my_data->instance = *pInstance;
     my_data->instance_dispatch_table = new VkLayerInstanceDispatchTable;
     layer_init_instance_dispatch_table(*pInstance, my_data->instance_dispatch_table, fpGetInstanceProcAddr);
 
@@ -403,7 +406,7 @@
     assert(chain_info->u.pLayerInfo);
     PFN_vkGetInstanceProcAddr fpGetInstanceProcAddr = chain_info->u.pLayerInfo->pfnNextGetInstanceProcAddr;
     PFN_vkGetDeviceProcAddr fpGetDeviceProcAddr = chain_info->u.pLayerInfo->pfnNextGetDeviceProcAddr;
-    PFN_vkCreateDevice fpCreateDevice = (PFN_vkCreateDevice)fpGetInstanceProcAddr(NULL, "vkCreateDevice");
+    PFN_vkCreateDevice fpCreateDevice = (PFN_vkCreateDevice)fpGetInstanceProcAddr(phy_dev_data->instance, "vkCreateDevice");
     if (fpCreateDevice == NULL) {
         return VK_ERROR_INITIALIZATION_FAILED;
     }