Implement EGL fgPlatformGlutGetModeValues and partial/reusable fgPlatformGlutGet

[freeglut] / src / android / fg_state_android.c

diff --git a/src/android/fg_state_android.c b/src/android/fg_state_android.c
index e22b86c..aea9b25 100644 (file)
--- a/src/android/fg_state_android.c
+++ b/src/android/fg_state_android.c
@@ -30,38 +30,43 @@
 #include <android/native_window.h>
 #include "fg_internal.h"
 
+int fgPlatformGlutDeviceGet ( GLenum eWhat )
+{
+  fprintf(stderr, "fgPlatformGlutDeviceGet: STUB\n");
+  return -1;
+}
+
 int fgPlatformGlutGet ( GLenum eWhat )
 {
   fprintf(stderr, "fgPlatformGlutGet: STUB\n");
 
   switch (eWhat) {
-    case GLUT_WINDOW_WIDTH:
-    case GLUT_WINDOW_HEIGHT:
-      {
-        if ( fgStructure.CurrentWindow == NULL )
-         return 0;
-       int32_t width = ANativeWindow_getWidth(fgStructure.CurrentWindow->Window.Handle);
-       int32_t height = ANativeWindow_getHeight(fgStructure.CurrentWindow->Window.Handle);
-        switch ( eWhat )
-         {
-         case GLUT_WINDOW_WIDTH:
-           return width;
-         case GLUT_WINDOW_HEIGHT:
-           return height;
-         }
-      }
+  case GLUT_WINDOW_WIDTH:
+  case GLUT_WINDOW_HEIGHT:
+    {
+      if ( fgStructure.CurrentWindow == NULL )
+       return 0;
+      int32_t width = ANativeWindow_getWidth(fgStructure.CurrentWindow->Window.Handle);
+      int32_t height = ANativeWindow_getHeight(fgStructure.CurrentWindow->Window.Handle);
+      switch ( eWhat )
+       {
+       case GLUT_WINDOW_WIDTH:
+         return width;
+       case GLUT_WINDOW_HEIGHT:
+         return height;
+       }
+    }
+    
+  default:
+    return fghPlatformGlutGetEGL(eWhat);
   }
   return -1;
 }
 
-int fgPlatformGlutDeviceGet ( GLenum eWhat )
-{
-  fprintf(stderr, "fgPlatformGlutDeviceGet: STUB\n");
-  return -1;
-}
-
 int fgPlatformGlutLayerGet( GLenum eWhat )
 {
+  fprintf(stderr, "fgPlatformGlutLayerGet: STUB\n");
+
   /*
    * This is easy as layers are not implemented ;-)
    *
@@ -102,12 +107,3 @@ int fgPlatformGlutLayerGet( GLenum eWhat )
   /* And fail. That's good. Programs do love failing. */
   return -1;
 }
-
-
-int *fgPlatformGlutGetModeValues(GLenum eWhat, int *size)
-{
-  fprintf(stderr, "fgPlatformGlutGetModeValues: STUB\n");
-  return NULL;
-}
-
-