commit e98c513569ea2db05013af966f4cccf874f17f88
author Yiwei Zhang <zzyiwei@google.com> Thu May 07 22:08:34 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu May 07 22:08:34 2020 +0000
tree e3a0c5281bb18c1d862f6c9743193ceccf5ab27f
parent 292a1f7c9bec5ab822a98bcf1e81b9319cd31438
parent 4264917141fe1f4a38da5f0698c5cc87f7720f80

Vulkan: remove the fallback path to load Vulkan driver am: 4264917141

Change-Id: I867c0238f8cbf8560e737e70f73ff69e84e27fe4

vulkan/libvulkan/driver.cpp

diff --git a/vulkan/libvulkan/driver.cpp b/vulkan/libvulkan/driver.cpp
index 22122a5..74ef0e7 100644
--- a/vulkan/libvulkan/driver.cpp
+++ b/vulkan/libvulkan/driver.cpp
@@ -252,18 +252,6 @@
     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(