Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18

# Conflicts:
#	browser/app/profile/firefox.js
#	browser/components/preferences/jar.mn

1 files changed, 24 insertions, 4 deletions

diff --git a/gfx/angle/src/libGLESv2/global_state.h b/gfx/angle/src/libGLESv2/global_state.h
index 3e3740c90..db202539c 100755
--- a/gfx/angle/src/libGLESv2/global_state.h
+++ b/gfx/angle/src/libGLESv2/global_state.h
@@ -9,6 +9,8 @@
 #ifndef LIBGLESV2_GLOBALSTATE_H_
 #define LIBGLESV2_GLOBALSTATE_H_
 
+#include <EGL/egl.h>
+
 namespace gl
 {
 class Context;
@@ -16,14 +18,32 @@ class Context;
 Context *GetGlobalContext();
 Context *GetValidGlobalContext();
 
-}  // namespace gl
+}
 
 namespace egl
 {
-class Thread;
+class Error;
+class Display;
+class Surface;
+
+void SetGlobalError(const Error &error);
+EGLint GetGlobalError();
+
+void SetGlobalAPI(EGLenum API);
+EGLenum GetGlobalAPI();
+
+void SetGlobalDisplay(Display *dpy);
+Display *GetGlobalDisplay();
+
+void SetGlobalDrawSurface(Surface *surface);
+Surface *GetGlobalDrawSurface();
+
+void SetGlobalReadSurface(Surface *surface);
+Surface *GetGlobalReadSurface();
 
-Thread *GetCurrentThread();
+void SetGlobalContext(gl::Context *context);
+gl::Context *GetGlobalContext();
 
-}  // namespace egl
+}
 
 #endif // LIBGLESV2_GLOBALSTATE_H_