commit 8ecb10c461d3a20832672796d5c25459f2c59032
author Courtney Goeltzenleuchter <courtneygo@google.com> Wed Apr 29 13:16:23 2020 -0600
committer Courtney Goeltzenleuchter <courtneygo@google.com> Thu Apr 30 14:37:13 2020 -0600
tree c5a99bd05cdab8eedcbc80abf48042cacafa62dd
parent e902245e47eee5da8473c5f7c3c36079ad59ed32

Use ANGLEGetDisplayPlatform for ANGLE determination

ANGLEGetDisplayPlatform is used to initialize various ANGLE related
system features. Use that to determine if loaded library is ANGLE or
not. This function is used elsewhere in the EGL loader. If it changes
it will be easier to catch all the dependencies if we use the same name.

Test: atest CtsAngleIntegrationHostTestCases
Bug: b/154237217
Change-Id: Ibc579604820ff1118f4dc703f0805df36359ba70

opengl/libs/EGL/Loader.cpp

diff --git a/opengl/libs/EGL/Loader.cpp b/opengl/libs/EGL/Loader.cpp
index d664e4d..391a410 100644
--- a/opengl/libs/EGL/Loader.cpp
+++ b/opengl/libs/EGL/Loader.cpp
@@ -276,7 +276,7 @@
         // will set cnx->useAngle appropriately.
         // Do this here so that we use ANGLE path when driver is ANGLE (e.g. loaded as native),
         // not just loading ANGLE as option.
-        init_angle_backend(hnd->dso[0], cnx);
+        init_angle_backend(hnd->dso[2], cnx);
     }
 
     LOG_ALWAYS_FATAL_IF(!hnd,
@@ -557,12 +557,8 @@
 }
 
 void Loader::init_angle_backend(void* dso, egl_connection_t* cnx) {
-    void* eglCreateDeviceANGLE = nullptr;
-
-    ALOGV("dso: %p", dso);
-    eglCreateDeviceANGLE = dlsym(dso, "eglCreateDeviceANGLE");
-    ALOGV("eglCreateDeviceANGLE: %p", eglCreateDeviceANGLE);
-    if (eglCreateDeviceANGLE) {
+    void* pANGLEGetDisplayPlatform = dlsym(dso, "ANGLEGetDisplayPlatform");
+    if (pANGLEGetDisplayPlatform) {
         ALOGV("ANGLE GLES library in use");
         cnx->useAngle = true;
     } else {