commit 68d1035a29036c4efe8ff741b9d943f6dbf2c23d
author Cody Northrop <cnorthrop@google.com> Mon Oct 15 07:22:09 2018 -0600
committer Cody Northrop <cnorthrop@google.com> Mon Oct 15 18:41:37 2018 -0600
tree d161ed601812df226e0fbdd1d086c48e1831a1ab
parent 0ec5d380a9468f194737ac395dd9ca1453e608fe

Revert "Revert "Split platform functions from entrypoints""

This reverts commit d18d55344f9c1133c6b4f41aa6defcde1c32c7f3.

Test: cts-tradefed run singleCommand cts -m CtsGpuToolsHostTestCases
Test: Chromium starts up
Test: deqp - EGL, GLES2, GLES3
Bug: 110883880
Change-Id: Id551cc0cdc9404c7c6a42c64693dedd217b18c7b

opengl/libs/EGL/egldefs.h

diff --git a/opengl/libs/EGL/egldefs.h b/opengl/libs/EGL/egldefs.h
index 449ffc7..d8606d3 100644
--- a/opengl/libs/EGL/egldefs.h
+++ b/opengl/libs/EGL/egldefs.h
@@ -38,12 +38,16 @@
     };
 
     inline egl_connection_t() : dso(nullptr) { }
+
     void *              dso;
     gl_hooks_t *        hooks[2];
     EGLint              major;
     EGLint              minor;
     egl_t               egl;
 
+    // Functions implemented or redirected by platform libraries
+    platform_impl_t     platform;
+
     void*               libEgl;
     void*               libGles1;
     void*               libGles2;
@@ -64,6 +68,7 @@
 extern char const * const gl_names[];
 extern char const * const gl_names_1[];
 extern char const * const egl_names[];
+extern char const * const platform_names[];
 
 extern egl_connection_t gEGLImpl;