layers: Store ptr from device data to instance data

Signed-off-by: Chris Forbes <chrisforbes@google.com>

1 files changed, 3 insertions, 0 deletions

diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp
index 297aad58..d810f76b 100644
--- a/layers/core_validation.cpp
+++ b/layers/core_validation.cpp
@@ -140,6 +140,8 @@ struct layer_data {
     unordered_map<VkShaderModule, unique_ptr<shader_module>> shaderModuleMap;
     VkDevice device = VK_NULL_HANDLE;
 
+    layer_data *instance_data = nullptr;  // from device to enclosing instance
+
     VkPhysicalDeviceFeatures enabled_features = {};
     // Device specific data
     PHYS_DEV_PROPERTIES_NODE phys_dev_properties = {};
@@ -4472,6 +4474,7 @@ VKAPI_ATTR VkResult VKAPI_CALL CreateDevice(VkPhysicalDevice gpu, const VkDevice
 
     // Copy instance state into this device's layer_data struct
     my_device_data->instance_state = unique_ptr<INSTANCE_STATE>(new INSTANCE_STATE(*(my_instance_data->instance_state)));
+    my_device_data->instance_data = my_instance_data;
     // Setup device dispatch table
     my_device_data->device_dispatch_table = new VkLayerDispatchTable;
     layer_init_device_dispatch_table(*pDevice, my_device_data->device_dispatch_table, fpGetDeviceProcAddr);