projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
docs and cosmetics in fg_geometry, should be a finished product now,
[freeglut]
/
src
/
fg_internal.h
diff --git
a/src/fg_internal.h
b/src/fg_internal.h
index
c7dd53b
..
dbae676
100644
(file)
--- a/
src/fg_internal.h
+++ b/
src/fg_internal.h
@@
-42,7
+42,7
@@
|| ( defined(__CYGWIN__) && defined(X_DISPLAY_MISSING) )
# define TARGET_HOST_MS_WINDOWS 1
|| ( defined(__CYGWIN__) && defined(X_DISPLAY_MISSING) )
# define TARGET_HOST_MS_WINDOWS 1
-#elif defined (ANDROID)
+#elif defined (__ANDROID__)
# define TARGET_HOST_ANDROID 1
#elif defined(__posix__) || defined(__unix__) || defined(__linux__) || defined(__sun)
# define TARGET_HOST_ANDROID 1
#elif defined(__posix__) || defined(__unix__) || defined(__linux__) || defined(__sun)
@@
-166,7
+166,13
@@
typedef unsigned long fg_time_t;
#endif
typedef unsigned long fg_time_t;
#endif
-
+#ifndef __fg_unused
+# ifdef __GNUC__
+# define __fg_unused __attribute__((unused))
+# else
+# define __fg_unused
+# endif
+#endif
/* Platform-specific includes */
#if TARGET_HOST_POSIX_X11
/* Platform-specific includes */
#if TARGET_HOST_POSIX_X11
@@
-213,6
+219,10
@@
typedef void (* FGCBMultiButton )( int, int, int, int, int );
typedef void (* FGCBMultiMotion )( int, int, int );
typedef void (* FGCBMultiPassive )( int, int, int );
typedef void (* FGCBMultiMotion )( int, int, int );
typedef void (* FGCBMultiPassive )( int, int, int );
+typedef void (* FGCBFixMyNameInitContext)();
+typedef void (* FGCBFixMyNamePause)();
+typedef void (* FGCBFixMyNameResume)();
+
/* The global callbacks type definitions */
typedef void (* FGCBIdle )( void );
typedef void (* FGCBTimer )( int );
/* The global callbacks type definitions */
typedef void (* FGCBIdle )( void );
typedef void (* FGCBTimer )( int );
@@
-319,8
+329,8
@@
struct tagSFG_State
int MajorVersion; /* Major OpenGL context version */
int MinorVersion; /* Minor OpenGL context version */
int ContextFlags; /* OpenGL context flags */
int MajorVersion; /* Major OpenGL context version */
int MinorVersion; /* Minor OpenGL context version */
int ContextFlags; /* OpenGL context flags */
- int HasOpenGL20; /* fgInitGL2 could find all OpenGL 2.0 functions */
int ContextProfile; /* OpenGL context profile */
int ContextProfile; /* OpenGL context profile */
+ int HasOpenGL20; /* fgInitGL2 could find all OpenGL 2.0 functions */
FGError ErrorFunc; /* User defined error handler */
FGWarning WarningFunc; /* User defined warning handler */
};
FGError ErrorFunc; /* User defined error handler */
FGWarning WarningFunc; /* User defined warning handler */
};
@@
-361,6
+371,8
@@
struct tagSFG_Context
SFG_PlatformContext pContext; /* The window's FBConfig (X11) or device context (Windows) */
int DoubleBuffered; /* Treat the window as double-buffered */
SFG_PlatformContext pContext; /* The window's FBConfig (X11) or device context (Windows) */
int DoubleBuffered; /* Treat the window as double-buffered */
+ GLint attribute_v_coord;
+ GLint attribute_v_normal;
};
};
@@
-389,6
+401,8
@@
struct tagSFG_WindowState
GLboolean NeedToResize; /* Do we need to resize the window? */
GLboolean IsFullscreen; /* is the window fullscreen? */
GLboolean NeedToResize; /* Do we need to resize the window? */
GLboolean IsFullscreen; /* is the window fullscreen? */
+
+ GLboolean NeedToFixMyNameInitContext; /* are OpenGL context/resources loaded? */
};
};
@@
-520,6
+534,11
@@
enum
CB_MultiMotion,
CB_MultiPassive,
CB_MultiMotion,
CB_MultiPassive,
+ /* Mobile platforms LifeCycle */
+ CB_FixMyNameInitContext,
+ CB_FixMyNamePause,
+ CB_FixMyNameResume,
+
/* Presently ignored */
CB_Select,
CB_OverlayDisplay,
/* Presently ignored */
CB_Select,
CB_OverlayDisplay,