X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffg_ext.c;h=344fa51e8c7414aa3c7c508fffa58ee4a723e6a6;hb=8c3eab0efb7f82a94014e0c1342c287e19461041;hp=a9a8a11c2df1400248d2669487728379f7ad2a28;hpb=1b5ee849ba61b667aeba474a7e03406196478bee;p=freeglut diff --git a/src/fg_ext.c b/src/fg_ext.c index a9a8a11..344fa51 100644 --- a/src/fg_ext.c +++ b/src/fg_ext.c @@ -130,20 +130,28 @@ static GLUTproc fghGetGLUTProcAddress( const char* procName ) CHECK_NAME(glutSolidSphere); CHECK_NAME(glutWireCone); CHECK_NAME(glutSolidCone); - CHECK_NAME(glutWireCube); - CHECK_NAME(glutSolidCube); CHECK_NAME(glutWireTorus); CHECK_NAME(glutSolidTorus); - CHECK_NAME(glutWireDodecahedron); - CHECK_NAME(glutSolidDodecahedron); + CHECK_NAME(glutWireCylinder); + CHECK_NAME(glutSolidCylinder); +#ifndef EGL_VERSION_1_0 CHECK_NAME(glutWireTeapot); CHECK_NAME(glutSolidTeapot); +#endif + CHECK_NAME(glutWireCube); + CHECK_NAME(glutSolidCube); + CHECK_NAME(glutWireDodecahedron); + CHECK_NAME(glutSolidDodecahedron); CHECK_NAME(glutWireOctahedron); CHECK_NAME(glutSolidOctahedron); CHECK_NAME(glutWireTetrahedron); CHECK_NAME(glutSolidTetrahedron); CHECK_NAME(glutWireIcosahedron); CHECK_NAME(glutSolidIcosahedron); + CHECK_NAME(glutWireRhombicDodecahedron); + CHECK_NAME(glutSolidRhombicDodecahedron); + CHECK_NAME(glutWireSierpinskiSponge); + CHECK_NAME(glutSolidSierpinskiSponge); CHECK_NAME(glutVideoResizeGet); CHECK_NAME(glutSetupVideoResizing); CHECK_NAME(glutStopVideoResizing); @@ -171,12 +179,6 @@ static GLUTproc fghGetGLUTProcAddress( const char* procName ) CHECK_NAME(glutStrokeHeight); CHECK_NAME(glutBitmapString); CHECK_NAME(glutStrokeString); - CHECK_NAME(glutWireRhombicDodecahedron); - CHECK_NAME(glutSolidRhombicDodecahedron); - CHECK_NAME(glutWireSierpinskiSponge); - CHECK_NAME(glutSolidSierpinskiSponge); - CHECK_NAME(glutWireCylinder); - CHECK_NAME(glutSolidCylinder); CHECK_NAME(glutGetProcAddress); CHECK_NAME(glutMouseWheelFunc); CHECK_NAME(glutJoystickGetNumAxes); @@ -213,8 +215,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 );