X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffg_ext.c;h=6835854890bd082b2de1bdde05412eecc3c11c57;hb=6f3bd48bd40bdc0777208aea2dcfd954c7b3a915;hp=6d50717a9c020a0ad3a0e56c476651f6c6652d54;hpb=e299df837915eaaf97e8e4ccbcb75bf1876661da;p=freeglut diff --git a/src/fg_ext.c b/src/fg_ext.c index 6d50717..6835854 100644 --- 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(glutPositionFunc); 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); -#ifndef EGL_VERSION_1_0 CHECK_NAME(glutWireSphere); CHECK_NAME(glutSolidSphere); CHECK_NAME(glutWireCone); @@ -137,8 +137,10 @@ static GLUTproc fghGetGLUTProcAddress( const char* procName ) CHECK_NAME(glutSolidCylinder); CHECK_NAME(glutWireTeapot); CHECK_NAME(glutSolidTeapot); -#endif -#ifndef GL_ES_VERSION_2_0 + CHECK_NAME(glutWireTeacup); + CHECK_NAME(glutSolidTeacup); + CHECK_NAME(glutWireTeaspoon); + CHECK_NAME(glutSolidTeaspoon); CHECK_NAME(glutWireCube); CHECK_NAME(glutSolidCube); CHECK_NAME(glutWireDodecahedron); @@ -153,7 +155,6 @@ static GLUTproc fghGetGLUTProcAddress( const char* procName ) CHECK_NAME(glutSolidRhombicDodecahedron); CHECK_NAME(glutWireSierpinskiSponge); CHECK_NAME(glutSolidSierpinskiSponge); -#endif CHECK_NAME(glutVideoResizeGet); CHECK_NAME(glutSetupVideoResizing); CHECK_NAME(glutStopVideoResizing); @@ -171,6 +172,7 @@ static GLUTproc fghGetGLUTProcAddress( const char* procName ) CHECK_NAME(glutMenuDestroyFunc); CHECK_NAME(glutFullScreenToggle); CHECK_NAME(glutLeaveFullScreen); + CHECK_NAME(glutSetMenuFont); CHECK_NAME(glutSetOption); CHECK_NAME(glutGetModeValues); CHECK_NAME(glutSetWindowData); @@ -201,6 +203,11 @@ static GLUTproc fghGetGLUTProcAddress( const char* procName ) CHECK_NAME(glutInitContextProfile); CHECK_NAME(glutInitErrorFunc); CHECK_NAME(glutInitWarningFunc); + CHECK_NAME(glutInitContextFunc); + CHECK_NAME(glutAppStatusFunc); + CHECK_NAME(glutSetVertexAttribCoord3); + CHECK_NAME(glutSetVertexAttribNormal); + CHECK_NAME(glutSetVertexAttribTexCoord2); #undef CHECK_NAME return NULL; @@ -217,8 +224,8 @@ glutGetProcAddress( const char *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 );