Avoid resetting the EGL error code on client context retrieval.

src/OpenGL/libEGL/libEGL.def

@@ -33,4 +33,8 @@ EXPORTS
 	eglTerminate                    @4
 	eglWaitClient                   @16
 	eglWaitGL                       @30
-	eglWaitNative                   @31
\ No newline at end of file
+	eglWaitNative                   @31
+
+	; Functions that don't change the error code, for use by client APIs
+	clientGetCurrentContext
+	clientGetCurrentDisplay
\ No newline at end of file

src/OpenGL/libEGL/main.cpp

@@ -255,7 +255,7 @@ void setCurrentContext(EGLContext ctx)
     current->context = ctx;
 }
 
-EGLDisplay getCurrentContext()
+EGLContext getCurrentContext()
 {
     Current *current = eglGetCurrent();
 
@@ -318,6 +318,19 @@ void error(EGLint errorCode)
 	}
 }
 
+extern "C"
+{
+EGLContext clientGetCurrentContext()
+{
+    return egl::getCurrentContext();
+}
+
+EGLContext clientGetCurrentDisplay()
+{
+    return egl::getCurrentDisplay();
+}
+}
+
 namespace es1
 {
 	egl::Context *(*createContext)(const egl::Config *config, const egl::Context *shareContext) = 0;

src/OpenGL/libGLES_CM/main.cpp

@@ -50,8 +50,8 @@ CONSTRUCTOR static bool glAttachProcess()
 	#endif
 
 	libEGL = loadLibrary(libEGL_lib);
-	egl::getCurrentContext = (egl::Context *(*)())getProcAddress(libEGL, "eglGetCurrentContext");
-	egl::getCurrentDisplay = (egl::Display *(*)())getProcAddress(libEGL, "eglGetCurrentDisplay");
+	egl::getCurrentContext = (egl::Context *(*)())getProcAddress(libEGL, "clientGetCurrentContext");
+	egl::getCurrentDisplay = (egl::Display *(*)())getProcAddress(libEGL, "clientGetCurrentDisplay");
 
     return libEGL != 0;
 }

src/OpenGL/libGLESv2/main.cpp

@@ -50,8 +50,8 @@ CONSTRUCTOR static bool glAttachProcess()
 	#endif
 
 	libEGL = loadLibrary(libEGL_lib);
-	egl::getCurrentContext = (egl::Context *(*)())getProcAddress(libEGL, "eglGetCurrentContext");
-	egl::getCurrentDisplay = (egl::Display *(*)())getProcAddress(libEGL, "eglGetCurrentDisplay");
+	egl::getCurrentContext = (egl::Context *(*)())getProcAddress(libEGL, "clientGetCurrentContext");
+	egl::getCurrentDisplay = (egl::Display *(*)())getProcAddress(libEGL, "clientGetCurrentDisplay");
 
 	#if defined(_WIN32)
 	const char *libGLES_CM_lib[] = {"libGLES_CM.dll", "libGLES_CM_translator.dll"};

src/Radiance/libEGL/libEGL.def

@@ -33,4 +33,8 @@ EXPORTS
 	eglTerminate                    @4
 	eglWaitClient                   @16
 	eglWaitGL                       @30
-	eglWaitNative                   @31
\ No newline at end of file
+	eglWaitNative                   @31
+
+	; Functions that don't change the error code, for use by client APIs
+	clientGetCurrentContext
+	clientGetCurrentDisplay
\ No newline at end of file

src/Radiance/libEGL/main.cpp

@@ -237,7 +237,7 @@ void setCurrentContext(EGLContext ctx)
     current->context = ctx;
 }
 
-EGLDisplay getCurrentContext()
+EGLContext getCurrentContext()
 {
     Current *current = eglGetCurrent();
 
@@ -300,6 +300,19 @@ void error(EGLint errorCode)
 	}
 }
 
+extern "C"
+{
+EGLContext clientGetCurrentContext()
+{
+    return egl::getCurrentContext();
+}
+
+EGLContext clientGetCurrentDisplay()
+{
+    return egl::getCurrentDisplay();
+}
+}
+
 namespace rad
 {
 	egl::Context *(*createContext)(const egl::Config *config, const egl::Context *shareContext) = 0;

src/Radiance/libRAD/main.cpp

@@ -50,8 +50,8 @@ CONSTRUCTOR static bool glAttachProcess()
 	#endif
 
 	libEGL = loadLibrary(libEGL_lib);
-	egl::getCurrentContext = (egl::Context *(*)())getProcAddress(libEGL, "eglGetCurrentContext");
-	egl::getCurrentDisplay = (egl::Display *(*)())getProcAddress(libEGL, "eglGetCurrentDisplay");
+	egl::getCurrentContext = (egl::Context *(*)())getProcAddress(libEGL, "clientGetCurrentContext");
+	egl::getCurrentDisplay = (egl::Display *(*)())getProcAddress(libEGL, "clientGetCurrentDisplay");
 
     return libEGL != 0;
 }