Merge branch 'stable' into dev

Change-Id: Icff019d74ae04c628a80f66aa478e4db40fae464

1 files changed, 29 insertions, 11 deletions

diff --git a/src/3rdparty/angle/src/libGLESv2/main.h b/src/3rdparty/angle/src/libGLESv2/main.h
index 504848aa65..9168a2212e 100644
--- a/src/3rdparty/angle/src/libGLESv2/main.h
+++ b/src/3rdparty/angle/src/libGLESv2/main.h
@@ -9,17 +9,19 @@
 #ifndef LIBGLESV2_MAIN_H_
 #define LIBGLESV2_MAIN_H_
 
-#define GL_APICALL
-#include <GLES2/gl2.h>
-#include <GLES2/gl2ext.h>
-
 #include "common/debug.h"
-#include "libEGL/Display.h"
+#include "common/system.h"
 
-#include "libGLESv2/Context.h"
+namespace egl
+{
+class Display;
+class Surface;
+}
 
 namespace gl
 {
+class Context;
+    
 struct Current
 {
     Context *context;
@@ -32,11 +34,6 @@ Context *getContext();
 Context *getNonLostContext();
 egl::Display *getDisplay();
 
-IDirect3DDevice9 *getDevice();
-
-bool checkDeviceLost(HRESULT errorCode);
-}
-
 void error(GLenum errorCode);
 
 template<class T>
@@ -47,4 +44,25 @@ const T &error(GLenum errorCode, const T &returnValue)
     return returnValue;
 }
 
+}
+
+namespace rx
+{
+class Renderer;
+}
+
+extern "C"
+{
+// Exported functions for use by EGL
+gl::Context *glCreateContext(const gl::Context *shareContext, rx::Renderer *renderer, bool notifyResets, bool robustAccess);
+void glDestroyContext(gl::Context *context);
+void glMakeCurrent(gl::Context *context, egl::Display *display, egl::Surface *surface);
+gl::Context *glGetCurrentContext();
+rx::Renderer *glCreateRenderer(egl::Display *display, HDC hDc, bool softwareDevice);
+void glDestroyRenderer(rx::Renderer *renderer);
+
+__eglMustCastToProperFunctionPointerType __stdcall glGetProcAddress(const char *procname);
+bool __stdcall glBindTexImage(egl::Surface *surface);
+}
+
 #endif   // LIBGLESV2_MAIN_H_