commit f347439c8b4c569fe391f0e36369edb0a204eea1
author Jon Ashburn <jon@lunarg.com> Tue May 19 14:33:18 2015 -0600
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Wed Jun 17 19:47:02 2015 -0600
tree d442acee04b395f4a7a31654d99a330268c113a9
parent 1c286bb1b9c55a4d73862f0f811f32c61ed3fcbe

loader: make the instance dispatch table per instance

loader/loader.c

diff --git a/loader/loader.c b/loader/loader.c
index 737bf66..6064100 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -1242,6 +1242,7 @@
             for (i = 0; i < ptr_instance->extension_count; i++) {
                 free(ptr_instance->extension_names[i]);
             }
+            free(ptr_instance->disp);
             if (prev)
                 prev->next = next->next;
             else

loader/trampoline.c

diff --git a/loader/trampoline.c b/loader/trampoline.c
index 908b47d..7453f1b 100644
--- a/loader/trampoline.c
+++ b/loader/trampoline.c
@@ -70,9 +70,12 @@
             return VK_ERROR_OUT_OF_HOST_MEMORY;
         strcpy(ptr_instance->extension_names[i], pCreateInfo->ppEnabledExtensionNames[i]);
     }
+    ptr_instance->disp = malloc(sizeof(VkLayerInstanceDispatchTable));
+    if (ptr_instance->disp == NULL)
+        return VK_ERROR_OUT_OF_HOST_MEMORY;
+    memcpy(ptr_instance->disp, &instance_disp, sizeof(instance_disp));
     ptr_instance->next = loader.instances;
     loader.instances = ptr_instance;
-    ptr_instance->disp = &instance_disp;
     loader_activate_instance_layers(ptr_instance);
 
     res = instance_disp.CreateInstance(pCreateInfo, (VkInstance *) ptr_instance);