commit 3d8dc1f0b7082672757a92ddb7f5a35be6ea6be3
author Courtney Goeltzenleuchter <courtney@LunarG.com> Mon Jun 08 15:09:22 2015 -0600
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Thu Jun 18 10:18:20 2015 -0600
tree 8cabc4e352029af66612698e4d1eae42603f0938
parent 8afefb5096305216b66a6e18ff653fde6f1f908a

loader: Fix DestroyInstance

loader/trampoline.c

diff --git a/loader/trampoline.c b/loader/trampoline.c
index 572db27..a616f0f 100644
--- a/loader/trampoline.c
+++ b/loader/trampoline.c
@@ -110,9 +110,16 @@
 
     disp = loader_get_instance_dispatch(instance);
 
-    /* TODO: Need to free memory allocated in trampoline's CreateInstance call */
+    VkResult res = disp->DestroyInstance(instance);
 
-    return disp->DestroyInstance(instance);
+    struct loader_instance *ptr_instance = loader_instance(instance);
+    loader_deactivate_instance_layers(ptr_instance);
+    loader_destroy_ext_list(&ptr_instance->enabled_instance_extensions);
+    loader_destroy_ext_list(&ptr_instance->activated_layer_list);
+
+    free(ptr_instance);
+
+    return res;
 }
 
 LOADER_EXPORT VkResult VKAPI vkEnumeratePhysicalDevices(