projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add 'shapes' test for GLES1 (Android and Mesa EGL), as an independent CMake sample app
[freeglut]
/
src
/
fg_init.c
diff --git
a/src/fg_init.c
b/src/fg_init.c
index
d564e83
..
68b69ca
100644
(file)
--- a/
src/fg_init.c
+++ b/
src/fg_init.c
@@
-90,6
+90,7
@@
SFG_State fgState = { { -1, -1, GL_FALSE }, /* Position */
0, /* OpenGL context MinorVersion */
0, /* OpenGL ContextFlags */
0, /* OpenGL ContextProfile */
0, /* OpenGL context MinorVersion */
0, /* OpenGL ContextFlags */
0, /* OpenGL ContextProfile */
+ 0, /* HasOpenGL20 */
NULL, /* ErrorFunc */
NULL /* WarningFunc */
};
NULL, /* ErrorFunc */
NULL /* WarningFunc */
};
@@
-101,6
+102,7
@@
extern void fgPlatformInitialize( const char* displayName );
extern void fgPlatformDeinitialiseInputDevices ( void );
extern void fgPlatformCloseDisplay ( void );
extern void fgPlatformDestroyContext ( SFG_PlatformDisplay pDisplay, SFG_WindowContextType MContext );
extern void fgPlatformDeinitialiseInputDevices ( void );
extern void fgPlatformCloseDisplay ( void );
extern void fgPlatformDestroyContext ( SFG_PlatformDisplay pDisplay, SFG_WindowContextType MContext );
+extern void fgInitGL2();
void fghParseCommandLineArguments ( int* pargc, char** argv, char **pDisplayName, char **pGeometry )
void fghParseCommandLineArguments ( int* pargc, char** argv, char **pDisplayName, char **pGeometry )
@@
-380,6
+382,8
@@
void FGAPIENTRY glutInit( int* pargc, char** argv )
if( (mask & (XValue|YValue)) == (XValue|YValue) )
fgState.Position.Use = GL_TRUE;
}
if( (mask & (XValue|YValue)) == (XValue|YValue) )
fgState.Position.Use = GL_TRUE;
}
+
+ fgInitGL2();
}
/*
}
/*