commit ba319ba31cae2c60a2b14e37c302d2a3a70315ca
author Jamie Madill <jmadill@chromium.org> Sat Dec 29 10:29:33 2018 -0500
committer Commit Bot <commit-bot@chromium.org> Tue Jan 01 18:56:45 2019 +0000
tree 06c35c4769f698b4332c98cbdb7a7d78ee426cbb
parent c3dc5d485771ea74f8aa84e0b560a0415bb2f4c0

Re-land "Load entry points dynamically in tests and samples."

Fixes the Android/ChromeOS/Fuchsia builds by using consistent EGL
headers.

This CL adds a dynamic loader generator based on XML files. It also
refactors the entry point generation script to move the XML parsing
into a helper class.

Additionally this includes a new GLES 1.0 base header. The new
header allows for function pointer types and hiding prototypes.

All tests and samples now load ANGLE dynamically. In the future this
will be extended to load entry points from the driver directly when
possible. This will allow us to perform more accurate A/B testing.

The new build configuration leads to some tests having more warnings
applied. The CL includes fixes for the new warnings.

Bug: angleproject:2995
Change-Id: I5a8772f41a0f89570b3736b785f44b7de1539b57
Reviewed-on: https://chromium-review.googlesource.com/c/1392382
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

util/android/AndroidWindow.cpp

diff --git a/util/android/AndroidWindow.cpp b/util/android/AndroidWindow.cpp
index e759cda..0767e82 100644
--- a/util/android/AndroidWindow.cpp
+++ b/util/android/AndroidWindow.cpp
@@ -6,36 +6,30 @@
 
 // AndroidWindow.cpp: Implementation of OSWindow for Android
 
-#include "android/AndroidWindow.h"
+#include "util/android/AndroidWindow.h"
 
 #include <pthread.h>
 
-#include "android/third_party/android_native_app_glue.h"
 #include "common/debug.h"
+#include "util/android/third_party/android_native_app_glue.h"
 
 namespace
 {
-    struct android_app *sApp = nullptr;
-    pthread_mutex_t sInitWindowMutex;
-    pthread_cond_t sInitWindowCond;
-    bool sInitWindowDone = false;
+struct android_app *sApp = nullptr;
+pthread_mutex_t sInitWindowMutex;
+pthread_cond_t sInitWindowCond;
+bool sInitWindowDone = false;
 }  // namespace
 
-AndroidWindow::AndroidWindow()
-{
-}
+AndroidWindow::AndroidWindow() {}
 
-AndroidWindow::~AndroidWindow()
-{
-}
+AndroidWindow::~AndroidWindow() {}
 
 bool AndroidWindow::initialize(const std::string &name, size_t width, size_t height)
 {
     return resize(width, height);
 }
-void AndroidWindow::destroy()
-{
-}
+void AndroidWindow::destroy() {}
 
 EGLNativeWindowType AndroidWindow::getNativeWindow() const
 {
@@ -68,7 +62,7 @@
 
 bool AndroidWindow::resize(int width, int height)
 {
-    mWidth = width;
+    mWidth  = width;
     mHeight = height;
 
     // sApp->window used below is valid only after Activity Surface is created
@@ -85,9 +79,7 @@
     return err == 0;
 }
 
-void AndroidWindow::setVisible(bool isVisible)
-{
-}
+void AndroidWindow::setVisible(bool isVisible) {}
 
 void AndroidWindow::signalTestEvent()
 {
@@ -114,11 +106,11 @@
             pthread_cond_broadcast(&sInitWindowCond);
             pthread_mutex_unlock(&sInitWindowMutex);
             break;
-        // TODO: process other commands and pass them to AndroidWindow for handling
-        // TODO: figure out how to handle APP_CMD_PAUSE,
-        // which should immediately halt all the rendering,
-        // since Activity Surface is no longer available.
-        // Currently tests crash when paused, for example, due to device changing orientation
+            // TODO: process other commands and pass them to AndroidWindow for handling
+            // TODO: figure out how to handle APP_CMD_PAUSE,
+            // which should immediately halt all the rendering,
+            // since Activity Surface is no longer available.
+            // Currently tests crash when paused, for example, due to device changing orientation
     }
 }
 
@@ -138,7 +130,7 @@
     pthread_cond_init(&sInitWindowCond, nullptr);
 
     // Event handlers, invoked from source->process()
-    app->onAppCmd = onAppCmd;
+    app->onAppCmd     = onAppCmd;
     app->onInputEvent = onInputEvent;
 
     // Message loop, polling for events indefinitely (due to -1 timeout)