commit d91a716cf30f327a8b85a5b3e0311379927f332b
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Apr 01 17:32:35 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 01 17:32:35 2019 +0000
tree ea3fa2004a5ca5cdd3872c5b5a5e5ff05ceef408
parent e0d9a16d9ff816287f603844f5c0b557dee0a947
parent 30b9096352de3c0c5aabbb47f5e6ccfff941ad2d

Merge "Don't load EGL driver always"

libs/hwui/renderthread/RenderThread.cpp

diff --git a/libs/hwui/renderthread/RenderThread.cpp b/libs/hwui/renderthread/RenderThread.cpp
index 369eee7..b76e49c 100644
--- a/libs/hwui/renderthread/RenderThread.cpp
+++ b/libs/hwui/renderthread/RenderThread.cpp
@@ -408,12 +408,13 @@
 }
 
 void RenderThread::preload() {
-    std::thread eglInitThread([]() {
-        //TODO: don't load EGL drivers for Vulkan, when HW bitmap uploader is refactored.
-        eglGetDisplay(EGL_DEFAULT_DISPLAY);
-    });
-    eglInitThread.detach();
-    if (Properties::getRenderPipelineType() == RenderPipelineType::SkiaVulkan) {
+    // EGL driver is always preloaded only if HWUI renders with GL.
+    if (Properties::getRenderPipelineType() == RenderPipelineType::SkiaGL) {
+        std::thread eglInitThread([]() {
+            eglGetDisplay(EGL_DEFAULT_DISPLAY);
+        });
+        eglInitThread.detach();
+    } else {
         requireVkContext();
     }
     HardwareBitmapUploader::initialize();