diff options
| author | Lenny Komow <lenny@lunarg.com> | 2018-01-15 15:43:36 -0700 |
|---|---|---|
| committer | Lenny Komow <lenny@lunarg.com> | 2018-01-16 15:49:54 -0700 |
| commit | 8151d72fc263001da497ee219d884e2e57cdfa3f (patch) | |
| tree | 0e9b5a99fd10f72b5260325346ee682afc45d87f /loader/loader.c | |
| parent | c784290e43bf89ef3c52f112d5e7e2d06f75ab69 (diff) | |
| download | usermoji-8151d72fc263001da497ee219d884e2e57cdfa3f.tar.xz | |
loader: Clean up mutexes on destruction
Change-Id: I7d1524da9167a576420c109ebbce8ebb5121cad0
Diffstat (limited to 'loader/loader.c')
| -rw-r--r-- | loader/loader.c | 34 |
1 files changed, 29 insertions, 5 deletions
diff --git a/loader/loader.c b/loader/loader.c index 0629d908..fd9e1165 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -92,8 +92,6 @@ uint32_t g_loader_log_msgs = 0; loader_platform_thread_mutex loader_lock; loader_platform_thread_mutex loader_json_lock; -LOADER_PLATFORM_THREAD_ONCE_DECLARATION(once_init); - void *loader_instance_heap_alloc(const struct loader_instance *instance, size_t size, VkSystemAllocationScope alloc_scope) { void *pMemory = NULL; #if (DEBUG_DISABLE_APP_ALLOCATORS == 1) @@ -1926,6 +1924,12 @@ struct loader_manifest_files { char **filename_list; }; +void loader_release() { + // release mutexs + loader_platform_thread_delete_mutex(&loader_lock); + loader_platform_thread_delete_mutex(&loader_json_lock); +} + // Get next file or dirname given a string list or registry key path // // \returns @@ -5888,7 +5892,6 @@ terminator_EnumerateInstanceExtensionProperties(const VkEnumerateInstanceExtensi // tls_instance = NULL; memset(&local_ext_list, 0, sizeof(local_ext_list)); memset(&instance_layers, 0, sizeof(instance_layers)); - // loader_platform_thread_once(&once_init, loader_initialize); // Get layer libraries if needed if (pLayerName && strlen(pLayerName) != 0) { @@ -5970,8 +5973,6 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_EnumerateInstanceLayerProperties(const struct loader_layer_list instance_layer_list; tls_instance = NULL; - loader_platform_thread_once(&once_init, loader_initialize); - uint32_t copy_size; // Get layer libraries @@ -6000,3 +6001,26 @@ out: loader_delete_layer_properties(NULL, &instance_layer_list); return result; } + +#if defined(_WIN32) +BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) { + switch (reason) { + case DLL_PROCESS_ATTACH: + loader_initialize(); + break; + case DLL_PROCESS_DETACH: + if (NULL == reserved) { + loader_release(); + } + break; + default: + // Do nothing + break; + } + return TRUE; +} +#else +__attribute__((constructor)) void loader_init_library() { loader_initialize(); } + +__attribute__((destructor)) void loader_free_library() { loader_release(); } +#endif |