projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Splitting the X11-specific "freeglut_ext.c" code into its own file
[freeglut]
/
src
/
Common
/
freeglut_ext.c
diff --git
a/src/Common/freeglut_ext.c
b/src/Common/freeglut_ext.c
index
ef73481
..
3c3c127
100644
(file)
--- a/
src/Common/freeglut_ext.c
+++ b/
src/Common/freeglut_ext.c
@@
-29,7
+29,8
@@
#include <GL/freeglut.h>
\r
#include "freeglut_internal.h"
\r
\r
#include <GL/freeglut.h>
\r
#include "freeglut_internal.h"
\r
\r
-extern SFG_Proc fghGetProcAddress( const char *procName );
\r
+extern SFG_Proc fgPlatformGetProcAddress( const char *procName );
\r
+extern GLUTproc fgPlatformGetGLUTProcAddress( const char *procName );
\r
\r
static GLUTproc fghGetGLUTProcAddress( const char* procName )
\r
{
\r
\r
static GLUTproc fghGetGLUTProcAddress( const char* procName )
\r
{
\r
@@
-111,9
+112,6
@@
static GLUTproc fghGetGLUTProcAddress( const char* procName )
CHECK_NAME(glutWindowStatusFunc);
\r
CHECK_NAME(glutKeyboardUpFunc);
\r
CHECK_NAME(glutSpecialUpFunc);
\r
CHECK_NAME(glutWindowStatusFunc);
\r
CHECK_NAME(glutKeyboardUpFunc);
\r
CHECK_NAME(glutSpecialUpFunc);
\r
-#if !defined(_WIN32_WCE)
\r
- CHECK_NAME(glutJoystickFunc);
\r
-#endif /* !defined(_WIN32_WCE) */
\r
CHECK_NAME(glutSetColor);
\r
CHECK_NAME(glutGetColor);
\r
CHECK_NAME(glutCopyColormap);
\r
CHECK_NAME(glutSetColor);
\r
CHECK_NAME(glutGetColor);
\r
CHECK_NAME(glutCopyColormap);
\r
@@
-154,13
+152,7
@@
static GLUTproc fghGetGLUTProcAddress( const char* procName )
CHECK_NAME(glutReportErrors);
\r
CHECK_NAME(glutIgnoreKeyRepeat);
\r
CHECK_NAME(glutSetKeyRepeat);
\r
CHECK_NAME(glutReportErrors);
\r
CHECK_NAME(glutIgnoreKeyRepeat);
\r
CHECK_NAME(glutSetKeyRepeat);
\r
-#if !defined(_WIN32_WCE)
\r
- CHECK_NAME(glutForceJoystickFunc);
\r
- CHECK_NAME(glutGameModeString);
\r
- CHECK_NAME(glutEnterGameMode);
\r
- CHECK_NAME(glutLeaveGameMode);
\r
- CHECK_NAME(glutGameModeGet);
\r
-#endif /* !defined(_WIN32_WCE) */
\r
+
\r
/* freeglut extensions */
\r
CHECK_NAME(glutMainLoopEvent);
\r
CHECK_NAME(glutLeaveMainLoop);
\r
/* freeglut extensions */
\r
CHECK_NAME(glutMainLoopEvent);
\r
CHECK_NAME(glutLeaveMainLoop);
\r
@@
-211,17
+203,6
@@
static GLUTproc fghGetGLUTProcAddress( const char* procName )
}
\r
\r
\r
}
\r
\r
\r
-#if TARGET_HOST_POSIX_X11
\r
-SFG_Proc fghGetProcAddress( const char *procName )
\r
-{
\r
-#if defined( GLX_ARB_get_proc_address )
\r
- return (SFG_Proc)glXGetProcAddressARB( ( const GLubyte * )procName );
\r
-#else
\r
- return NULL;
\r
-#endif
\r
-}
\r
-#endif
\r
-
\r
\r
GLUTproc FGAPIENTRY
\r
glutGetProcAddress( const char *procName )
\r
\r
GLUTproc FGAPIENTRY
\r
glutGetProcAddress( const char *procName )
\r
@@
-231,5
+212,10
@@
glutGetProcAddress( const char *procName )
\r
/* Try GLUT functions first, then core GL functions */
\r
p = fghGetGLUTProcAddress( procName );
\r
\r
/* Try GLUT functions first, then core GL functions */
\r
p = fghGetGLUTProcAddress( procName );
\r
- return ( p != NULL ) ? p : fghGetProcAddress( procName );
\r
+
\r
+ /* Some GLUT functions are platform-specific: */
\r
+ if ( !p )
\r
+ p = fgPlatformGetGLUTProcAddress( procName );
\r
+
\r
+ return ( p != NULL ) ? p : fgPlatformGetProcAddress( procName );
\r
}
\r
}
\r