diff options
| author | Jon Ashburn <jon@lunarg.com> | 2016-01-12 09:55:14 -0700 |
|---|---|---|
| committer | Jon Ashburn <jon@lunarg.com> | 2016-01-12 11:33:55 -0700 |
| commit | 990d4e647fb33e79d795792b6c7aac82aba591da (patch) | |
| tree | c555ea065b47b119b6dcb0d06e95f29ff5c277ad /loader | |
| parent | 5a0ef36d7be1c4b85bc868469c410db88b2e72c8 (diff) | |
| download | usermoji-990d4e647fb33e79d795792b6c7aac82aba591da.tar.xz | |
loader: Fix so unwrapped instance gets used for layer instance extension dispatch
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/loader.c | 4 | ||||
| -rw-r--r-- | loader/loader.h | 2 | ||||
| -rw-r--r-- | loader/trampoline.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/loader/loader.c b/loader/loader.c index f308105e..6d33f659 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -2892,12 +2892,12 @@ uint32_t loader_activate_instance_layers(struct loader_instance *inst) return inst->activated_layer_list.count; } -void loader_activate_instance_layer_extensions(struct loader_instance *inst) +void loader_activate_instance_layer_extensions(struct loader_instance *inst, VkInstance created_inst) { loader_init_instance_extension_dispatch_table(inst->disp, inst->disp->GetInstanceProcAddr, - (VkInstance) inst); + created_inst); } static VkResult loader_enable_device_layers( diff --git a/loader/loader.h b/loader/loader.h index 69b6c4d5..b5b3d2c9 100644 --- a/loader/loader.h +++ b/loader/loader.h @@ -491,7 +491,7 @@ VkResult loader_enable_instance_layers( const struct loader_layer_list *instance_layers); void loader_deactivate_instance_layers(struct loader_instance *instance); uint32_t loader_activate_instance_layers(struct loader_instance *inst); -void loader_activate_instance_layer_extensions(struct loader_instance *inst); +void loader_activate_instance_layer_extensions(struct loader_instance *inst, VkInstance created_inst); void* loader_heap_alloc( const struct loader_instance *instance, diff --git a/loader/trampoline.c b/loader/trampoline.c index 64285b04..96f9bf0c 100644 --- a/loader/trampoline.c +++ b/loader/trampoline.c @@ -191,7 +191,7 @@ LOADER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateInstance( * GetInstanceProcAddr functions to return valid extension functions * if enabled. */ - loader_activate_instance_layer_extensions(ptr_instance); + loader_activate_instance_layer_extensions(ptr_instance, *pInstance); /* Remove temporary debug_report callback */ util_DestroyDebugReportCallback(ptr_instance, instance_callback, pAllocator); |