commit 1208622fe6c70c23ab1a06ef1a49cfece08bc1da
author Courtney Goeltzenleuchter <courtneygo@google.com> Fri Feb 12 07:53:12 2016 -0700
committer Courtney Goeltzenleuchter <courtneygo@google.com> Fri Feb 12 11:39:42 2016 -0700
tree cbc94a38b91631b077fb21e0ab490c12da1dd4fe
parent c2a770925da019a82e23aacacf12be3bfe691766

loader: Add extension before CreateInstance chain

A developer can cause the loader to enable VK_EXT_debug_report
extension by setting a specific property. However, that check
was happening after the instance chain was called and thus
no layers saw the extension enabled.
Also fix use of AddExtensionToCreateInfo to always allocate
and insert VK_EXT_debug_report. Otherwise cannot distinguish
between the failure case and the extension is already present
case.

Change-Id: Id64bb14cb2086e94190625b4364329d634afda70

vulkan/libvulkan/loader.cpp

diff --git a/vulkan/libvulkan/loader.cpp b/vulkan/libvulkan/loader.cpp
index c82c420..1a57c22 100644
--- a/vulkan/libvulkan/loader.cpp
+++ b/vulkan/libvulkan/loader.cpp
@@ -454,12 +454,6 @@
 bool AddExtensionToCreateInfo(TCreateInfo& local_create_info,
                               const char* extension_name,
                               const VkAllocationCallbacks* alloc) {
-    for (uint32_t i = 0; i < local_create_info.enabledExtensionCount; ++i) {
-        if (!strcmp(extension_name,
-                    local_create_info.ppEnabledExtensionNames[i])) {
-            return false;
-        }
-    }
     uint32_t extension_count = local_create_info.enabledExtensionCount;
     local_create_info.enabledExtensionCount++;
     void* mem = alloc->pfnAllocation(
@@ -1164,8 +1158,23 @@
     instance_create_info.pNext = local_create_info.pNext;
     local_create_info.pNext = &instance_create_info;
 
+    // Force enable callback extension if required
+    bool enable_callback = false;
+    if (prctl(PR_GET_DUMPABLE, 0, 0, 0, 0)) {
+        enable_callback =
+            property_get_bool("debug.vulkan.enable_callback", false);
+        if (enable_callback) {
+            enable_callback = AddExtensionToCreateInfo(
+                local_create_info, "VK_EXT_debug_report", instance->alloc);
+        }
+    }
+
     result = create_instance(&local_create_info, allocator, &local_instance);
 
+    if (enable_callback) {
+        FreeAllocatedCreateInfo(local_create_info, allocator);
+    }
+
     if (result != VK_SUCCESS) {
         DestroyInstance_Bottom(instance->handle, allocator);
         TeardownInstance(instance->handle, allocator);
@@ -1192,20 +1201,7 @@
     }
     *instance_out = local_instance;
 
-    // Force enable callback extension if required
-    bool enable_callback = false;
-    bool enable_logging = false;
-    if (prctl(PR_GET_DUMPABLE, 0, 0, 0, 0)) {
-        enable_callback =
-            property_get_bool("debug.vulkan.enable_callback", false);
-        enable_logging = enable_callback;
-        if (enable_callback) {
-            enable_callback = AddExtensionToCreateInfo(
-                local_create_info, "VK_EXT_debug_report", instance->alloc);
-        }
-    }
-
-    if (enable_logging) {
+    if (enable_callback) {
         const VkDebugReportCallbackCreateInfoEXT callback_create_info = {
             .sType = VK_STRUCTURE_TYPE_DEBUG_REPORT_CREATE_INFO_EXT,
             .flags =