FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moving more Windows-specific code from "freeglut_ext.c" to the windows-specific file

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@985 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
fayjf 2012-01-20 03:44:03 +00:00
parent a625fdf807
commit c28372cd99
2 changed files with 46 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
freeglut/freeglut/src/Common/freeglut_ext.c
View File

@ -30,6 +30,7 @@
#include "freeglut_internal.h" #include "freeglut_internal.h"
extern SFG_Proc fghGetProcAddress( const char *procName ); extern SFG_Proc fghGetProcAddress( const char *procName );
extern GLUTproc fghGetPlatformSpecificGLUTProcAddress( const char *procName );
static GLUTproc fghGetGLUTProcAddress( const char* procName ) static GLUTproc fghGetGLUTProcAddress( const char* procName )
{ {
@ -111,9 +112,6 @@ static GLUTproc fghGetGLUTProcAddress( const char* procName )
CHECK_NAME(glutWindowStatusFunc); CHECK_NAME(glutWindowStatusFunc);
CHECK_NAME(glutKeyboardUpFunc); CHECK_NAME(glutKeyboardUpFunc);
CHECK_NAME(glutSpecialUpFunc); CHECK_NAME(glutSpecialUpFunc);
#if !defined(_WIN32_WCE)
CHECK_NAME(glutJoystickFunc);
#endif /* !defined(_WIN32_WCE) */
CHECK_NAME(glutSetColor); CHECK_NAME(glutSetColor);
CHECK_NAME(glutGetColor); CHECK_NAME(glutGetColor);
CHECK_NAME(glutCopyColormap); CHECK_NAME(glutCopyColormap);
@ -154,13 +152,7 @@ static GLUTproc fghGetGLUTProcAddress( const char* procName )
CHECK_NAME(glutReportErrors); CHECK_NAME(glutReportErrors);
CHECK_NAME(glutIgnoreKeyRepeat); CHECK_NAME(glutIgnoreKeyRepeat);
CHECK_NAME(glutSetKeyRepeat); CHECK_NAME(glutSetKeyRepeat);
#if !defined(_WIN32_WCE)
CHECK_NAME(glutForceJoystickFunc);
CHECK_NAME(glutGameModeString);
CHECK_NAME(glutEnterGameMode);
CHECK_NAME(glutLeaveGameMode);
CHECK_NAME(glutGameModeGet);
#endif /* !defined(_WIN32_WCE) */
/* freeglut extensions */ /* freeglut extensions */
CHECK_NAME(glutMainLoopEvent); CHECK_NAME(glutMainLoopEvent);
CHECK_NAME(glutLeaveMainLoop); CHECK_NAME(glutLeaveMainLoop);
@ -212,6 +204,25 @@ static GLUTproc fghGetGLUTProcAddress( const char* procName )
#if TARGET_HOST_POSIX_X11 #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;
}
SFG_Proc fghGetProcAddress( const char *procName ) SFG_Proc fghGetProcAddress( const char *procName )
{ {
#if defined( GLX_ARB_get_proc_address ) #if defined( GLX_ARB_get_proc_address )
@ -231,5 +242,10 @@ glutGetProcAddress( const char *procName )
/* Try GLUT functions first, then core GL functions */ /* Try GLUT functions first, then core GL functions */
p = fghGetGLUTProcAddress( procName ); p = fghGetGLUTProcAddress( procName );
/* Some GLUT functions are platform-specific: */
if ( !p )
p = fghGetPlatformSpecificGLUTProcAddress( procName );
return ( p != NULL ) ? p : fghGetProcAddress( procName ); return ( p != NULL ) ? p : fghGetProcAddress( procName );
} }

20
freeglut/freeglut/src/mswin/freeglut_ext_mswin.c
View File

@ -28,6 +28,26 @@
#include <GL/freeglut.h> #include <GL/freeglut.h>
#include "freeglut_internal_mswin.h" #include "freeglut_internal_mswin.h"
GLUTproc fghGetPlatformSpecificGLUTProcAddress( const char* procName )
{
#if !defined(_WIN32_WCE)
/* 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
#endif /* !defined(_WIN32_WCE) */
return NULL;
}
SFG_Proc fghGetProcAddress( const char *procName ) SFG_Proc fghGetProcAddress( const char *procName )