From 323cceb74e8c744b6f181fca6f99a2dcadd1ef08 Mon Sep 17 00:00:00 2001
From: Jon Ashburn <jon@lunarg.com>
Date: Fri, 9 Oct 2015 09:40:30 -0600
Subject: Loader: Fix locking bug in CreateInstance

---
 loader/loader.h     | 2 --
 loader/trampoline.c | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'loader')

diff --git a/loader/loader.h b/loader/loader.h
index 4956ae68..890821ca 100644
--- a/loader/loader.h
+++ b/loader/loader.h
@@ -174,8 +174,6 @@ struct loader_instance {
     struct loader_layer_list instance_layer_list;
     struct loader_layer_list device_layer_list;
 
-    /* TODO: Should keep track of application provided allocation functions */
-
     struct loader_msg_callback_map_entry *icd_msg_callback_map;
 
     struct loader_layer_list activated_layer_list;
diff --git a/loader/trampoline.c b/loader/trampoline.c
index 2ac48eef..e87d151e 100644
--- a/loader/trampoline.c
+++ b/loader/trampoline.c
@@ -85,6 +85,7 @@ LOADER_EXPORT VkResult VKAPI vkCreateInstance(
                                      pCreateInfo->ppEnabledLayerNames,
                                      &ptr_instance->instance_layer_list);
         if (res != VK_SUCCESS) {
+            loader_platform_thread_unlock_mutex(&loader_lock);
             return res;
         }
     }
-- 
cgit v1.2.3