X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2FCommon%2Ffreeglut_ext.c;h=3c3c127ea6a983251895920def079725005700e3;hb=6f1be614bfcc2312a92104b9d97319b06dbef7e8;hp=598edb69f50e4b632162f452330d6757dfe992d5;hpb=3e5e3f51c272a95dc877b781281880061690b935;p=freeglut

diff --git a/src/Common/freeglut_ext.c b/src/Common/freeglut_ext.c
index 598edb6..3c3c127 100644
--- a/src/Common/freeglut_ext.c
+++ b/src/Common/freeglut_ext.c
@@ -29,8 +29,8 @@
 #include <GL/freeglut.h>
 #include "freeglut_internal.h"
 
-extern SFG_Proc fghGetProcAddress( const char *procName );
-extern GLUTproc fgPlatformGlutGetProcAddress( const char *procName );
+extern SFG_Proc fgPlatformGetProcAddress( const char *procName );
+extern GLUTproc fgPlatformGetGLUTProcAddress( const char *procName );
 
 static GLUTproc fghGetGLUTProcAddress( const char* procName )
 {
@@ -203,42 +203,6 @@ static GLUTproc fghGetGLUTProcAddress( const char* procName )
 }
 
 
-#if TARGET_HOST_POSIX_X11
-static GLUTproc fghGetGLUTProcAddress( const char* procName )
-{
-    /* optimization: quick initial check */
-    if( strncmp( procName, "glut", 4 ) != 0 )
-        return NULL;
-
-#define CHECK_NAME(x) if( strcmp( procName, #x ) == 0) return (GLUTproc)x;
-    CHECK_NAME(glutJoystickFunc);
-    CHECK_NAME(glutForceJoystickFunc);
-    CHECK_NAME(glutGameModeString);
-    CHECK_NAME(glutEnterGameMode);
-    CHECK_NAME(glutLeaveGameMode);
-    CHECK_NAME(glutGameModeGet);
-#undef CHECK_NAME
-
-    return NULL;
-}
-
-
-static GLUTproc fgPlatformGlutGetProcAddress( const char* procName )
-{
-    return NULL;
-}
-
-
-SFG_Proc fghGetProcAddress( const char *procName )
-{
-#if defined( GLX_ARB_get_proc_address )
-    return (SFG_Proc)glXGetProcAddressARB( ( const GLubyte * )procName );
-#else
-    return NULL;
-#endif
-}
-#endif
-
 
 GLUTproc FGAPIENTRY
 glutGetProcAddress( const char *procName )
@@ -251,7 +215,7 @@ glutGetProcAddress( const char *procName )
 
 	/* Some GLUT functions are platform-specific: */
 	if ( !p )
-      p = fgPlatformGlutGetProcAddress( procName );
+      p = fgPlatformGetGLUTProcAddress( procName );
 
-    return ( p != NULL ) ? p : fghGetProcAddress( procName );
+    return ( p != NULL ) ? p : fgPlatformGetProcAddress( procName );
 }