commit 840bd53ef66a160f6a777ec3b310312bfeb28c2f
author Charlie Lao <cclao@google.com> Thu Jan 16 17:34:37 2020 -0800
committer Charlie Lao <cclao@google.com> Thu Jan 16 17:39:17 2020 -0800
tree 17f0a83d15684632f4728b19eede03e06affa605
parent 53d23fb81bff7cdc209e3237f0632c94e536a8db

opengl: Revert "opengl: defer GLESV1 library loading until context creation time"

Test: Ensure pixel 4XL boot
Bug: b/147842683

This reverts commit 95c7aeae97185a95079fb64f25f92c07d37847b0.

Change-Id: I3423dbc639e9edc26d0c863fa1f5445610d4de22

opengl/libs/EGL/egl_display.cpp

diff --git a/opengl/libs/EGL/egl_display.cpp b/opengl/libs/EGL/egl_display.cpp
index 3b19b32..67d69b4 100644
--- a/opengl/libs/EGL/egl_display.cpp
+++ b/opengl/libs/EGL/egl_display.cpp
@@ -220,7 +220,7 @@
     if (cnx->dso) {
         EGLDisplay dpy = EGL_NO_DISPLAY;
 
-        if (cnx->loadedDriverType == egl_connection_t::GLES_ANGLE_STANDALONE_DRIVER) {
+        if (cnx->useAngle) {
             EGLint error;
             dpy = getPlatformDisplayAngle(display, cnx, attrib_list, &error);
             if (error != EGL_NONE) {
@@ -464,7 +464,7 @@
         egl_connection_t* const cnx = &gEGLImpl;
         if (cnx->dso && disp.state == egl_display_t::INITIALIZED) {
             // If we're using ANGLE reset any custom DisplayPlatform
-            if (cnx->loadedDriverType == egl_connection_t::GLES_ANGLE_STANDALONE_DRIVER) {
+            if (cnx->useAngle) {
                 angle::resetAnglePlatform(disp.dpy);
             }
             if (cnx->egl.eglTerminate(disp.dpy) == EGL_FALSE) {