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

Patching to fix "glXCreateContextAttribsARB not found" problem per e-mail from John Tsiombikas dated 11/3/2011 7:02 PM

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@943 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
fayjf 2011-11-06 13:54:43 +00:00
parent 747517066a
commit 46c318c429
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
freeglut/freeglut/src/freeglut_window.c
View File

@ -177,7 +177,7 @@ typedef HGLRC (WINAPI * PFNWGLCREATECONTEXTATTRIBSARBPROC) (HDC hDC, HGLRC hShar
static int fghIsLegacyContextVersionRequested( void ) static int fghIsLegacyContextVersionRequested( void )
{ {
return fgState.MajorVersion == 1 && fgState.MinorVersion == 0; return fgState.MajorVersion < 2 || (fgState.MajorVersion == 2 && fgState.MinorVersion <= 1);
} }
static int fghIsLegacyContextRequested( void ) static int fghIsLegacyContextRequested( void )
@ -443,10 +443,17 @@ static GLXContext fghCreateNewContext( SFG_Window* window )
/* new context creation */ /* new context creation */
int attributes[9]; int attributes[9];
CreateContextAttribsProc createContextAttribs; CreateContextAttribsProc createContextAttribs = (CreateContextAttribsProc) fghGetProcAddress( "glXCreateContextAttribsARB" );
/* glXCreateContextAttribsARB not found, yet the user has requested the new context creation */
if ( !createContextAttribs && !fghIsLegacyContextRequested() ) {
fgWarning( "OpenGL >2.1 context requested but glXCreateContextAttribsARB is not available! Falling back to legacy context creation" );
fgState.MajorVersion = 2;
fgState.MinorVersion = 1;
}
/* If nothing fancy has been required, simply use the old context creation GLX API entry */ /* If nothing fancy has been required, simply use the old context creation GLX API entry */
if ( fghIsLegacyContextRequested() ) if ( fghIsLegacyContextRequested() || !createContextAttribs )
{ {
context = glXCreateNewContext( dpy, config, render_type, share_list, direct ); context = glXCreateNewContext( dpy, config, render_type, share_list, direct );
if ( context == NULL ) { if ( context == NULL ) {
@ -462,11 +469,6 @@ static GLXContext fghCreateNewContext( SFG_Window* window )
fghFillContextAttributes( attributes ); fghFillContextAttributes( attributes );
createContextAttribs = (CreateContextAttribsProc) fghGetProcAddress( "glXCreateContextAttribsARB" );
if ( createContextAttribs == NULL ) {
fgError( "glXCreateContextAttribsARB not found" );
}
context = createContextAttribs( dpy, config, share_list, direct, attributes ); context = createContextAttribs( dpy, config, share_list, direct, attributes );
if ( context == NULL ) { if ( context == NULL ) {
fghContextCreationError(); fghContextCreationError();