Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1208622f authored by Courtney Goeltzenleuchter's avatar Courtney Goeltzenleuchter
Browse files

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
parent c2a77092

vulkan/libvulkan/loader.cpp

+16 −20
Original line number Diff line number Diff line
@@ -454,12 +454,6 @@ template <class TCreateInfo> 
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 @@ VkResult CreateInstance_Top(const VkInstanceCreateInfo* create_info, 
    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 @@ VkResult CreateInstance_Top(const VkInstanceCreateInfo* create_info, 
    }

    *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) {

        const VkDebugReportCallbackCreateInfoEXT callback_create_info = {

            .sType = VK_STRUCTURE_TYPE_DEBUG_REPORT_CREATE_INFO_EXT,

            .flags =