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

Commit 1b3ecaa1 authored by Aurimas Liutikas's avatar Aurimas Liutikas
Browse files

Revert "Vulkan1.1: CreateInstance downgrades apiVersion for 1.0 ICDs" 

This reverts commit d134b226.

This change is causing a native crash when running CtsGraphicsTestCases

Bug: 68779289

Change-Id: I03187a8828d41c0d534cd4238720a277273dc0bd
parent d134b226

vulkan/libvulkan/driver.cpp

+0 −39
Original line number Diff line number Diff line
@@ -94,7 +94,6 @@ class CreateInfoWrapper { 
    ~CreateInfoWrapper();



    VkResult Validate();

    void DowngradeApiVersion();



    const std::bitset<ProcHook::EXTENSION_COUNT>& GetHookExtensions() const;

    const std::bitset<ProcHook::EXTENSION_COUNT>& GetHalExtensions() const;
@@ -132,8 +131,6 @@ class CreateInfoWrapper { 
        VkDeviceCreateInfo dev_info_;

    };



    VkApplicationInfo application_info_;



    ExtensionFilter extension_filter_;



    std::bitset<ProcHook::EXTENSION_COUNT> hook_extensions_;
@@ -540,15 +537,6 @@ void CreateInfoWrapper::FilterExtension(const char* name) { 
    }

}



void CreateInfoWrapper::DowngradeApiVersion() {

    // If pApplicationInfo is NULL, apiVersion is assumed to be 1.0:

    if (instance_info_.pApplicationInfo) {

        application_info_ = *instance_info_.pApplicationInfo;

        instance_info_.pApplicationInfo = &application_info_;

        application_info_.apiVersion = VK_API_VERSION_1_0;

    }

}



VKAPI_ATTR void* DefaultAllocate(void*,

                                 size_t size,

                                 size_t alignment,
@@ -903,33 +891,6 @@ VkResult CreateInstance(const VkInstanceCreateInfo* pCreateInfo, 


    data->hook_extensions |= wrapper.GetHookExtensions();



#pragma clang diagnostic push

#pragma clang diagnostic ignored "-Wold-style-cast"

    uint32_t api_version = ((pCreateInfo->pApplicationInfo)

                                ? pCreateInfo->pApplicationInfo->apiVersion

                                : VK_API_VERSION_1_0);

    uint32_t api_major_version = VK_VERSION_MAJOR(api_version);

    uint32_t api_minor_version = VK_VERSION_MINOR(api_version);

    uint32_t icd_api_version;

    PFN_vkEnumerateInstanceVersion pfn_enumerate_instance_version =

        reinterpret_cast<PFN_vkEnumerateInstanceVersion>(

            Hal::Device().GetInstanceProcAddr(NULL,

                                              "vkEnumerateInstanceVersion"));

    if (!pfn_enumerate_instance_version) {

        icd_api_version = VK_API_VERSION_1_0;

    } else {

        result = (*pfn_enumerate_instance_version)(&icd_api_version);

    }

    uint32_t icd_api_major_version = VK_VERSION_MAJOR(icd_api_version);

    uint32_t icd_api_minor_version = VK_VERSION_MINOR(icd_api_version);



    if ((icd_api_major_version == 1) && (icd_api_minor_version == 0) &&

        ((api_major_version > 1) || (api_minor_version > 0))) {

        api_version = VK_API_VERSION_1_0;

        wrapper.DowngradeApiVersion();

    }

#pragma clang diagnostic pop



    // call into the driver

    VkInstance instance;

    result = Hal::Device().CreateInstance(