redisplay is now also on the work list instead of handled separately

[freeglut] / src / egl / fg_window_egl.c

diff --git a/src/egl/fg_window_egl.c b/src/egl/fg_window_egl.c
index cc048be..48eb748 100644 (file)
--- a/src/egl/fg_window_egl.c
+++ b/src/egl/fg_window_egl.c
@@ -92,6 +92,15 @@ EGLContext fghCreateNewContextEGL( SFG_Window* window ) {
   return context;
 }
 
+void fgPlatformSetWindow ( SFG_Window *window )
+{
+  if (eglMakeCurrent(fgDisplay.pDisplay.egl.Display,
+                    window->Window.pContext.egl.Surface,
+                    window->Window.pContext.egl.Surface,
+                    window->Window.Context) == EGL_FALSE)
+    fgError("eglMakeCurrent: err=%x\n", eglGetError());
+}
+
 /*
  * Really opens a window when handle is available
  */
@@ -103,13 +112,14 @@ 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());
+  window->Window.pContext.egl.Surface = surface;
+
   fgPlatformSetWindow(window);
 
-  //EGLint w, h;
-  //eglQuerySurface(display, surface, EGL_WIDTH, &w);
-  //eglQuerySurface(display, surface, EGL_HEIGHT, &h);
+  /* EGLint w, h; */
+  /* eglQuerySurface(display, surface, EGL_WIDTH, &w); */
+  /* eglQuerySurface(display, surface, EGL_HEIGHT, &h); */
 
-  window->Window.pContext.egl.Surface = surface;
 }
 
 /*
@@ -128,13 +138,3 @@ 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());
-}