projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
reworked fullscreen code based on implementation of Chromium. can now handle/restore...
[freeglut]
/
src
/
fg_ext.c
diff --git
a/src/fg_ext.c
b/src/fg_ext.c
index
6d50717
..
6e1784b
100644
(file)
--- a/
src/fg_ext.c
+++ b/
src/fg_ext.c
@@
-86,6
+86,7
@@
static GLUTproc fghGetGLUTProcAddress( const char* procName )
CHECK_NAME(glutDetachMenu);
CHECK_NAME(glutDisplayFunc);
CHECK_NAME(glutReshapeFunc);
CHECK_NAME(glutDetachMenu);
CHECK_NAME(glutDisplayFunc);
CHECK_NAME(glutReshapeFunc);
+ CHECK_NAME(glutPositionFunc);
CHECK_NAME(glutKeyboardFunc);
CHECK_NAME(glutMouseFunc);
CHECK_NAME(glutMultiEntryFunc);
CHECK_NAME(glutKeyboardFunc);
CHECK_NAME(glutMouseFunc);
CHECK_NAME(glutMultiEntryFunc);
@@
-126,7
+127,6
@@
static GLUTproc fghGetGLUTProcAddress( const char* procName )
CHECK_NAME(glutStrokeWidth);
CHECK_NAME(glutBitmapLength);
CHECK_NAME(glutStrokeLength);
CHECK_NAME(glutStrokeWidth);
CHECK_NAME(glutBitmapLength);
CHECK_NAME(glutStrokeLength);
-#ifndef EGL_VERSION_1_0
CHECK_NAME(glutWireSphere);
CHECK_NAME(glutSolidSphere);
CHECK_NAME(glutWireCone);
CHECK_NAME(glutWireSphere);
CHECK_NAME(glutSolidSphere);
CHECK_NAME(glutWireCone);
@@
-135,10
+135,10
@@
static GLUTproc fghGetGLUTProcAddress( const char* procName )
CHECK_NAME(glutSolidTorus);
CHECK_NAME(glutWireCylinder);
CHECK_NAME(glutSolidCylinder);
CHECK_NAME(glutSolidTorus);
CHECK_NAME(glutWireCylinder);
CHECK_NAME(glutSolidCylinder);
+#ifndef EGL_VERSION_1_0
CHECK_NAME(glutWireTeapot);
CHECK_NAME(glutSolidTeapot);
#endif
CHECK_NAME(glutWireTeapot);
CHECK_NAME(glutSolidTeapot);
#endif
-#ifndef GL_ES_VERSION_2_0
CHECK_NAME(glutWireCube);
CHECK_NAME(glutSolidCube);
CHECK_NAME(glutWireDodecahedron);
CHECK_NAME(glutWireCube);
CHECK_NAME(glutSolidCube);
CHECK_NAME(glutWireDodecahedron);
@@
-153,7
+153,6
@@
static GLUTproc fghGetGLUTProcAddress( const char* procName )
CHECK_NAME(glutSolidRhombicDodecahedron);
CHECK_NAME(glutWireSierpinskiSponge);
CHECK_NAME(glutSolidSierpinskiSponge);
CHECK_NAME(glutSolidRhombicDodecahedron);
CHECK_NAME(glutWireSierpinskiSponge);
CHECK_NAME(glutSolidSierpinskiSponge);
-#endif
CHECK_NAME(glutVideoResizeGet);
CHECK_NAME(glutSetupVideoResizing);
CHECK_NAME(glutStopVideoResizing);
CHECK_NAME(glutVideoResizeGet);
CHECK_NAME(glutSetupVideoResizing);
CHECK_NAME(glutStopVideoResizing);
@@
-201,6
+200,9
@@
static GLUTproc fghGetGLUTProcAddress( const char* procName )
CHECK_NAME(glutInitContextProfile);
CHECK_NAME(glutInitErrorFunc);
CHECK_NAME(glutInitWarningFunc);
CHECK_NAME(glutInitContextProfile);
CHECK_NAME(glutInitErrorFunc);
CHECK_NAME(glutInitWarningFunc);
+ CHECK_NAME(glutInitContextFunc)
+ CHECK_NAME(glutPauseFunc)
+ CHECK_NAME(glutResumeFunc)
#undef CHECK_NAME
return NULL;
#undef CHECK_NAME
return NULL;
@@
-217,8
+219,8
@@
glutGetProcAddress( const char *procName )
/* Try GLUT functions first, then core GL functions */
p = fghGetGLUTProcAddress( procName );
/* Try GLUT functions first, then core GL functions */
p = fghGetGLUTProcAddress( procName );
- /* Some GLUT functions are platform-specific: */
- if ( !p )
+ /* Some GLUT functions are platform-specific: */
+ if ( !p )
p = fgPlatformGetGLUTProcAddress( procName );
return ( p != NULL ) ? p : fgPlatformGetProcAddress( procName );
p = fgPlatformGetGLUTProcAddress( procName );
return ( p != NULL ) ? p : fgPlatformGetProcAddress( procName );