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

Fixing the "glutGetProcAddress" snafu -- thank you, Evan Felix, for finding this

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1040 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
fayjf 2012-02-04 13:37:52 +00:00
parent 64953686de
commit 8174572da7
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,8 +29,8 @@
#include <GL/freeglut.h> #include <GL/freeglut.h>
#include "freeglut_internal.h" #include "freeglut_internal.h"
extern SFG_Proc fghGetProcAddress( const char *procName ); extern SFG_Proc fgPlatformGetProcAddress( const char *procName );
extern GLUTproc fgPlatformGlutGetProcAddress( const char *procName ); extern GLUTproc fgPlatformGetGLUTProcAddress( const char *procName );
static GLUTproc fghGetGLUTProcAddress( const char* procName ) static GLUTproc fghGetGLUTProcAddress( const char* procName )
{ {
@ -204,7 +204,7 @@ static GLUTproc fghGetGLUTProcAddress( const char* procName )
#if TARGET_HOST_POSIX_X11 #if TARGET_HOST_POSIX_X11
static GLUTproc fghGetGLUTProcAddress( const char* procName ) static GLUTproc fgPlatformGetGLUTProcAddress( const char* procName )
{ {
/* optimization: quick initial check */ /* optimization: quick initial check */
if( strncmp( procName, "glut", 4 ) != 0 ) if( strncmp( procName, "glut", 4 ) != 0 )
@ -223,13 +223,7 @@ static GLUTproc fghGetGLUTProcAddress( const char* procName )
} }
GLUTproc fgPlatformGlutGetProcAddress( const char* procName ) SFG_Proc fgPlatformGetProcAddress( const char *procName )
{
return NULL;
}
SFG_Proc fghGetProcAddress( const char *procName )
{ {
#if defined( GLX_ARB_get_proc_address ) #if defined( GLX_ARB_get_proc_address )
return (SFG_Proc)glXGetProcAddressARB( ( const GLubyte * )procName ); return (SFG_Proc)glXGetProcAddressARB( ( const GLubyte * )procName );
@ -251,7 +245,7 @@ glutGetProcAddress( const char *procName )
/* Some GLUT functions are platform-specific: */ /* Some GLUT functions are platform-specific: */
if ( !p ) if ( !p )
p = fgPlatformGlutGetProcAddress( procName ); p = fgPlatformGetGLUTProcAddress( procName );
return ( p != NULL ) ? p : fghGetProcAddress( procName ); return ( p != NULL ) ? p : fgPlatformGetProcAddress( procName );
} }

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

@ -28,7 +28,7 @@
#include <GL/freeglut.h> #include <GL/freeglut.h>
#include "../Common/freeglut_internal.h" #include "../Common/freeglut_internal.h"
GLUTproc fgPlatformGlutGetProcAddress( const char* procName ) GLUTproc fgPlatformGetGLUTProcAddress( const char* procName )
{ {
#if !defined(_WIN32_WCE) #if !defined(_WIN32_WCE)
/* optimization: quick initial check */ /* optimization: quick initial check */
@ -50,7 +50,7 @@ GLUTproc fgPlatformGlutGetProcAddress( const char* procName )
SFG_Proc fghGetProcAddress( const char *procName ) SFG_Proc fgPlatformGetProcAddress( const char *procName )
{ {
return (SFG_Proc)wglGetProcAddress( ( LPCSTR )procName ); return (SFG_Proc)wglGetProcAddress( ( LPCSTR )procName );
} }