X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fegl%2Ffg_init_egl.c;h=361c73ce0b7bcd7aa4f70cf46b2a0e5530f441ee;hb=6636a18df676a102cee0bcf31ce81b67dc7b7ac2;hp=c6ceb637ee270494ec5ae18c0f8ce5718af4107c;hpb=44856885ba35db9526d24d140b84ce492f4871d2;p=freeglut

diff --git a/src/egl/fg_init_egl.c b/src/egl/fg_init_egl.c
index c6ceb63..361c73c 100644
--- a/src/egl/fg_init_egl.c
+++ b/src/egl/fg_init_egl.c
@@ -1,5 +1,5 @@
 /*
- * freeglut_init_android.c
+ * fg_init_egl.c
  *
  * Various freeglut initialization functions.
  *
@@ -27,16 +27,11 @@
 #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;
@@ -44,7 +39,7 @@ void fgPlatformInitialize( const char* displayName )
 
   FREEGLUT_INTERNAL_ERROR_EXIT(fgDisplay.pDisplay.egl.Display != EGL_NO_DISPLAY,
 			       "No display available", "fgPlatformInitialize");
-  if (!eglInitialize(fgDisplay.pDisplay.egl.Display, NULL, NULL))
+  if (eglInitialize(fgDisplay.pDisplay.egl.Display, NULL, NULL) != EGL_TRUE)
     fgError("eglInitialize: error %x\n", eglGetError());
 
 # ifdef GL_VERSION_1_1  /* or later */
@@ -53,13 +48,13 @@ void fgPlatformInitialize( const char* displayName )
   eglBindAPI(EGL_OPENGL_ES_API);
 # endif
 
-  // fgDisplay.ScreenWidth = ...;
-  // fgDisplay.ScreenHeight = ...;
-  // fgDisplay.ScreenWidthMM = ...;
-  // fgDisplay.ScreenHeightMM = ...;
+  /* fgDisplay.ScreenWidth = ...; */
+  /* fgDisplay.ScreenHeight = ...; */
+  /* fgDisplay.ScreenWidthMM = ...; */
+  /* fgDisplay.ScreenHeightMM = ...; */
 }
 
-void fgPlatformCloseDisplay ( void )
+void fghPlatformCloseDisplayEGL()
 {
   if (fgDisplay.pDisplay.egl.Display != EGL_NO_DISPLAY) {
     eglTerminate(fgDisplay.pDisplay.egl.Display);