Fix eglInitialize check

[freeglut] / src / egl / fg_init_egl.c

diff --git a/src/egl/fg_init_egl.c b/src/egl/fg_init_egl.c
index a58812a..d5bc927 100644 (file)
--- a/src/egl/fg_init_egl.c
+++ b/src/egl/fg_init_egl.c
@@ -1,5 +1,5 @@
 /*
- * freeglut_init_android.c
+ * freeglut_init_egl.c
  *
  * Various freeglut initialization functions.
  *
@@ -27,28 +27,26 @@
 #include <GL/freeglut.h>
 #include "fg_internal.h"
 
-#include <android/native_app_glue/android_native_app_glue.h>
-
 /*
  * A call to this function should initialize all the display stuff...
  */
-void fgPlatformInitialize( const char* displayName )
+void fghPlatformInitializeEGL()
 {
-  fprintf(stderr, "fgPlatformInitialize\n");
-  fgState.Initialised = GL_TRUE;
-
   /* CreateDisplay */
   /* Using EGL_DEFAULT_DISPLAY, or a specific native display */
   EGLNativeDisplayType nativeDisplay = EGL_DEFAULT_DISPLAY;
-  fgDisplay.pDisplay.eglDisplay = eglGetDisplay(nativeDisplay);
+  fgDisplay.pDisplay.egl.Display = eglGetDisplay(nativeDisplay);
 
-  FREEGLUT_INTERNAL_ERROR_EXIT(fgDisplay.pDisplay.eglDisplay != EGL_NO_DISPLAY,
+  FREEGLUT_INTERNAL_ERROR_EXIT(fgDisplay.pDisplay.egl.Display != EGL_NO_DISPLAY,
                               "No display available", "fgPlatformInitialize");
-  if (!eglInitialize(fgDisplay.pDisplay.eglDisplay, NULL, NULL))
+  if (eglInitialize(fgDisplay.pDisplay.egl.Display, NULL, NULL) != EGL_SUCCESS)
     fgError("eglInitialize: error %x\n", eglGetError());
 
-  /* CreateContext */
-  fghCreateContext();
+# ifdef GL_VERSION_1_1  /* or later */
+  eglBindAPI(EGL_OPENGL_API);
+# else
+  eglBindAPI(EGL_OPENGL_ES_API);
+# endif
 
   // fgDisplay.ScreenWidth = ...;
   // fgDisplay.ScreenHeight = ...;
@@ -56,17 +54,11 @@ void fgPlatformInitialize( const char* displayName )
   // fgDisplay.ScreenHeightMM = ...;
 }
 
-void fgPlatformCloseDisplay ( void )
+void fghPlatformCloseDisplayEGL()
 {
-  eglMakeCurrent(fgDisplay.pDisplay.eglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
-  if (fgDisplay.pDisplay.eglContext != EGL_NO_CONTEXT) {
-    eglDestroyContext(fgDisplay.pDisplay.eglDisplay, fgDisplay.pDisplay.eglContext);
-    fgDisplay.pDisplay.eglContext = EGL_NO_CONTEXT;
-  }
-
-  if (fgDisplay.pDisplay.eglDisplay != EGL_NO_DISPLAY) {
-    eglTerminate(fgDisplay.pDisplay.eglDisplay);
-    fgDisplay.pDisplay.eglDisplay = EGL_NO_DISPLAY;
+  if (fgDisplay.pDisplay.egl.Display != EGL_NO_DISPLAY) {
+    eglTerminate(fgDisplay.pDisplay.egl.Display);
+    fgDisplay.pDisplay.egl.Display = EGL_NO_DISPLAY;
   }
 }
 
@@ -76,5 +68,5 @@ void fgPlatformCloseDisplay ( void )
 void fgPlatformDestroyContext ( SFG_PlatformDisplay pDisplay, SFG_WindowContextType MContext )
 {
   if (MContext != EGL_NO_CONTEXT)
-    eglDestroyContext(pDisplay.eglDisplay, MContext);
+    eglDestroyContext(pDisplay.egl.Display, MContext);
 }