X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffg_ext.c;h=beadca3aefd3edefa621baf8d45b55c82de6e0c6;hb=d9de8ec42b076f875059acf8c02299689c9aa756;hp=6d50717a9c020a0ad3a0e56c476651f6c6652d54;hpb=e299df837915eaaf97e8e4ccbcb75bf1876661da;p=freeglut diff --git a/src/fg_ext.c b/src/fg_ext.c index 6d50717..beadca3 100644 --- a/src/fg_ext.c +++ b/src/fg_ext.c @@ -126,7 +126,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); @@ -135,10 +134,10 @@ static GLUTproc fghGetGLUTProcAddress( const char* procName ) CHECK_NAME(glutSolidTorus); CHECK_NAME(glutWireCylinder); CHECK_NAME(glutSolidCylinder); +#ifndef EGL_VERSION_1_0 CHECK_NAME(glutWireTeapot); CHECK_NAME(glutSolidTeapot); #endif -#ifndef GL_ES_VERSION_2_0 CHECK_NAME(glutWireCube); CHECK_NAME(glutSolidCube); CHECK_NAME(glutWireDodecahedron); @@ -153,7 +152,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); @@ -201,6 +199,9 @@ static GLUTproc fghGetGLUTProcAddress( const char* procName ) CHECK_NAME(glutInitContextProfile); CHECK_NAME(glutInitErrorFunc); CHECK_NAME(glutInitWarningFunc); + CHECK_NAME(glutInitContextFunc) + CHECK_NAME(glutPauseFunc) + CHECK_NAME(glutResumeFunc) #undef CHECK_NAME return NULL; @@ -217,8 +218,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 );