EGL: reuse fgPlatformSetWindow for calling eglMakeCurrent

[freeglut] / src / egl / fg_window_egl.c

diff --git a/src/egl/fg_window_egl.c b/src/egl/fg_window_egl.c
index c2bca96..cc048be 100644 (file)
--- a/src/egl/fg_window_egl.c
+++ b/src/egl/fg_window_egl.c
@@ -26,7 +26,7 @@
 #include <GL/freeglut.h>
 #include "fg_internal.h"
 
-int fghChooseConfigEGL(EGLConfig* config) {
+int fghChooseConfig(EGLConfig* config) {
   const EGLint attribs[] = {
     EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
 #ifdef GL_ES_VERSION_2_0
@@ -50,7 +50,7 @@ int fghChooseConfigEGL(EGLConfig* config) {
   EGLint num_config;
   if (!eglChooseConfig(fgDisplay.pDisplay.egl.Display,
                       attribs, config, 1, &num_config)) {
-    fgWarn("eglChooseConfig: error %x\n", eglGetError());
+    fgWarning("eglChooseConfig: error %x\n", eglGetError());
     return 0;
   }
 
@@ -60,7 +60,7 @@ int fghChooseConfigEGL(EGLConfig* config) {
 /**
  * Initialize an EGL context for the current display.
  */
-void fghCreateNewContextEGL( SFG_Window* window ) {
+EGLContext fghCreateNewContextEGL( SFG_Window* window ) {
   EGLContext context;
 
   EGLDisplay eglDisplay = fgDisplay.pDisplay.egl.Display;
@@ -82,10 +82,14 @@ void fghCreateNewContextEGL( SFG_Window* window ) {
   }
   EGLint ver = -1;
   eglQueryContext(fgDisplay.pDisplay.egl.Display, context, EGL_CONTEXT_CLIENT_VERSION, &ver);
+#ifdef GL_ES_VERSION_2_0
   if (ver != 2)
+#else
+  if (ver != 1)
+#endif
     fgError("Wrong GLES major version: %d\n", ver);
 
-  window->Window.Context = context;
+  return context;
 }
 
 /*
@@ -99,8 +103,7 @@ void fghPlatformOpenWindowEGL( SFG_Window* window )
   EGLSurface surface = eglCreateWindowSurface(display, config, window->Window.Handle, NULL);
   if (surface == EGL_NO_SURFACE)
     fgError("Cannot create EGL window surface, err=%x\n", eglGetError());
-  if (eglMakeCurrent(display, surface, surface, window->Window.Context) == EGL_FALSE)
-    fgError("eglMakeCurrent: err=%x\n", eglGetError());
+  fgPlatformSetWindow(window);
 
   //EGLint w, h;
   //eglQuerySurface(display, surface, EGL_WIDTH, &w);
@@ -125,3 +128,13 @@ void fghPlatformCloseWindowEGL( SFG_Window* window )
     window->Window.pContext.egl.Surface = EGL_NO_SURFACE;
   }
 }
+
+void fgPlatformSetWindow ( SFG_Window *window )
+{
+  if (!eglMakeCurrent(
+                     fgDisplay.pDisplay.egl.Display,
+                     window->Window.pContext.egl.Surface,
+                     window->Window.pContext.egl.Surface,
+                     window->Window.Context))
+    fgError("eglMakeCurrent: err=%x\n", eglGetError());
+}