X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fandroid%2Ffg_window_android.c;h=4c5d9d2550a4b873eed90fdb8254de8b24f83cad;hb=4b1d80d34568230510aafef6b9d505e1215c8d38;hp=6b51091f2cf0fc9773b1baf7f3304e2ec0085170;hpb=44856885ba35db9526d24d140b84ce492f4871d2;p=freeglut

diff --git a/src/android/fg_window_android.c b/src/android/fg_window_android.c
index 6b51091..4c5d9d2 100644
--- a/src/android/fg_window_android.c
+++ b/src/android/fg_window_android.c
@@ -1,5 +1,5 @@
 /*
- * freeglut_window_android.c
+ * fg_window_android.c
  *
  * Window management methods for Android
  *
@@ -30,6 +30,7 @@
 #include <GL/freeglut.h>
 #include "fg_internal.h"
 #include "egl/fg_window_egl.h"
+#include "android/fg_main_android.h"
 
 /*
  * Opens a window. Requires a SFG_Window object created and attached
@@ -40,20 +41,17 @@ void fgPlatformOpenWindow( SFG_Window* window, const char* title,
                            GLboolean sizeUse, int w, int h,
                            GLboolean gameMode, GLboolean isSubWindow )
 {
-  printf("fgPlatformOpenWindow %p ID=%d\n", (void*)window, window->ID);
-
   /* TODO: only one full-screen window possible? */
   static int nb_windows = 0;
   if (nb_windows == 0) {
     nb_windows++;
     fgDisplay.pDisplay.single_window = window;
-    printf("=> %p ID=%d\n", (void*)fgDisplay.pDisplay.single_window, fgDisplay.pDisplay.single_window->ID);
   } else {
     return;
   }
 
-  fghChooseConfigEGL(&window->Window.pContext.egl.Config);
-  fghCreateNewContextEGL(window);
+  fghChooseConfig(&window->Window.pContext.egl.Config);
+  window->Window.Context = fghCreateNewContextEGL(window);
 
   /* Wait until window is available and OpenGL context is created */
   /* Normally events are processed through glutMainLoop(), but the
@@ -76,8 +74,8 @@ void fgPlatformOpenWindow( SFG_Window* window, const char* title,
   EGLint vid;
   eglGetConfigAttrib(display, window->Window.pContext.egl.Config,
 		     EGL_NATIVE_VISUAL_ID, &vid);
-
   ANativeWindow_setBuffersGeometry(window->Window.Handle, 0, 0, vid);
+
   fghPlatformOpenWindowEGL(window);
 
   window->State.Visible = GL_TRUE;
@@ -92,11 +90,6 @@ void fgPlatformCloseWindow( SFG_Window* window )
   /* Window pre-created by Android, no way to delete it */
 }
 
-void fgPlatformSetWindow ( SFG_Window *window )
-{
-  /* TODO: only a single window possible? */
-}
-
 /*
  * This function makes the current window visible
  */