Make Android work again - adapt to recent changes and fix use of GL-nonES function

[freeglut] / src / android / fg_main_android.c

diff --git a/src/android/fg_main_android.c b/src/android/fg_main_android.c
index 77e43b3..41a1d3f 100644 (file)
--- a/src/android/fg_main_android.c
+++ b/src/android/fg_main_android.c
@@ -330,7 +330,6 @@ void handle_cmd(struct android_app* app, int32_t cmd) {
     /* The window is being shown, get it ready. */\r
     LOGI("handle_cmd: APP_CMD_INIT_WINDOW %p", app->window);\r
     fgDisplay.pDisplay.single_native_window = app->window;\r
-    window->State.WorkMask |= GLUT_INIT_WORK;\r
     /* start|resume: glPlatformOpenWindow was waiting for Handle to be\r
        defined and will now continue processing */\r
     break;\r
@@ -415,7 +414,7 @@ void fgPlatformProcessSingleEvent ( void )
   if (window != NULL && window->Window.Handle != NULL) {\r
     int32_t width = ANativeWindow_getWidth(window->Window.Handle);\r
     int32_t height = ANativeWindow_getHeight(window->Window.Handle);\r
-    fghOnReshapeNotify(width,height);\r
+    fghOnReshapeNotify(window,width,height,GL_FALSE);\r
   }\r
 \r
   /* Read pending event. */\r
@@ -465,7 +464,7 @@ void fgPlatformProcessSingleEvent ( void )
        * be not possible to ensure InitContext CB gets called before\r
        * Resume CB like that.. so maybe just force calling initContext CB\r
        * here is best. Or we could force work on the window in question..\r
-       * 1) save old work mask, 2) set mask to init only, 3) call fgPlatformProcessWork directly\r
+       * 1) save old work mask, 2) set mask to init only, 3) call fgProcessWork directly\r
        * 4) set work mask back to the one saved in step 1.\r
        */\r
       if (!FETCH_WCB(*window, InitContext))\r