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

Commit 42649171 authored by Yiwei Zhang's avatar Yiwei Zhang
Browse files

Vulkan: remove the fallback path to load Vulkan driver 

This fallback loading path was for backwards compatibility with devices
being upgraded from pre-Oreo (i.e. pre-Treble) to Oreo or later. Those
devices weren't required to follow a lot of the Treble rules, so linker
namespaces (or binaries compatible with them) couldn't be enforced. This
change removes it so that we can discover issues around loading Vulkan
driver from sphal namespace.

Bug: 156021362
Test: build, flash and boot
Change-Id: I505bdbdb40a06e1d837f1d0b75822b0c60de96c9
parent 7e838c23

vulkan/libvulkan/driver.cpp

+0 −12
Original line number Diff line number Diff line
@@ -252,18 +252,6 @@ bool Hal::Open() { 
    result = LoadUpdatedDriver(&module);

    if (result == -ENOENT) {

        result = LoadBuiltinDriver(&module);

        if (result != 0) {

            // -ENOENT means the sphal namespace doesn't exist, not that there

            // is a problem with the driver.

            ALOGW_IF(

                result != -ENOENT,

                "Failed to load Vulkan driver into sphal namespace. This "

                "usually means the driver has forbidden library dependencies."

                "Please fix, this will soon stop working.");

            result =

                hw_get_module(HWVULKAN_HARDWARE_MODULE_ID,

                              reinterpret_cast<const hw_module_t**>(&module));

        }

    }

    if (result != 0) {

        android::GraphicsEnv::getInstance().setDriverLoaded(