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

Part one of fixing bug 3058987 -- the 'freeglut_patch_visual_info.diff' changes

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@884 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
fayjf 2011-01-23 18:58:54 +00:00
parent 62dc997e85
commit 707dedd131
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
freeglut/freeglut/src/freeglut_internal.h
View File

@ -825,7 +825,7 @@ void fgDestroyStructure( void );
/* A helper function to check if a display mode is possible to use */ /* A helper function to check if a display mode is possible to use */
#if TARGET_HOST_POSIX_X11 #if TARGET_HOST_POSIX_X11
GLXFBConfig* fgChooseFBConfig( void ); GLXFBConfig* fgChooseFBConfig( int* numcfgs );
#endif #endif
/* The window procedure for Win32 events handling */ /* The window procedure for Win32 events handling */

2
freeglut/freeglut/src/freeglut_state.c
View File

@ -320,7 +320,7 @@ int FGAPIENTRY glutGet( GLenum eWhat )
GLXFBConfig * fbconfig; GLXFBConfig * fbconfig;
int isPossible; int isPossible;
fbconfig = fgChooseFBConfig(); fbconfig = fgChooseFBConfig(NULL);
if (fbconfig == NULL) if (fbconfig == NULL)
{ {

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

@ -220,7 +220,7 @@ static void fghContextCreationError( void )
* Chooses a visual basing on the current display mode settings * Chooses a visual basing on the current display mode settings
*/ */
GLXFBConfig* fgChooseFBConfig( void ) GLXFBConfig* fgChooseFBConfig( int *numcfgs )
{ {
GLboolean wantIndexedMode = GL_FALSE; GLboolean wantIndexedMode = GL_FALSE;
int attributes[ 100 ]; int attributes[ 100 ];
@ -385,6 +385,9 @@ GLXFBConfig* fgChooseFBConfig( void )
fbconfig = NULL; fbconfig = NULL;
} }
if (numcfgs)
*numcfgs = fbconfigArraySize;
return fbconfig; return fbconfig;
} }
} }
@ -904,13 +907,14 @@ void fgOpenWindow( SFG_Window* window, const char* title,
XSizeHints sizeHints; XSizeHints sizeHints;
XWMHints wmHints; XWMHints wmHints;
unsigned long mask; unsigned long mask;
int num_FBConfigs, i;
unsigned int current_DisplayMode = fgState.DisplayMode ; unsigned int current_DisplayMode = fgState.DisplayMode ;
/* Save the display mode if we are creating a menu window */ /* Save the display mode if we are creating a menu window */
if( window->IsMenu && ( ! fgStructure.MenuContext ) ) if( window->IsMenu && ( ! fgStructure.MenuContext ) )
fgState.DisplayMode = GLUT_DOUBLE | GLUT_RGB ; fgState.DisplayMode = GLUT_DOUBLE | GLUT_RGB ;
window->Window.FBConfig = fgChooseFBConfig( ); window->Window.FBConfig = fgChooseFBConfig( &num_FBConfigs );
if( window->IsMenu && ( ! fgStructure.MenuContext ) ) if( window->IsMenu && ( ! fgStructure.MenuContext ) )
fgState.DisplayMode = current_DisplayMode ; fgState.DisplayMode = current_DisplayMode ;
@ -925,14 +929,14 @@ void fgOpenWindow( SFG_Window* window, const char* title,
if( !( fgState.DisplayMode & GLUT_DOUBLE ) ) if( !( fgState.DisplayMode & GLUT_DOUBLE ) )
{ {
fgState.DisplayMode |= GLUT_DOUBLE ; fgState.DisplayMode |= GLUT_DOUBLE ;
window->Window.FBConfig = fgChooseFBConfig( ); window->Window.FBConfig = fgChooseFBConfig( &num_FBConfigs );
fgState.DisplayMode &= ~GLUT_DOUBLE; fgState.DisplayMode &= ~GLUT_DOUBLE;
} }
if( fgState.DisplayMode & GLUT_MULTISAMPLE ) if( fgState.DisplayMode & GLUT_MULTISAMPLE )
{ {
fgState.DisplayMode &= ~GLUT_MULTISAMPLE ; fgState.DisplayMode &= ~GLUT_MULTISAMPLE ;
window->Window.FBConfig = fgChooseFBConfig( ); window->Window.FBConfig = fgChooseFBConfig( &num_FBConfigs );
fgState.DisplayMode |= GLUT_MULTISAMPLE; fgState.DisplayMode |= GLUT_MULTISAMPLE;
} }
} }
@ -941,8 +945,15 @@ void fgOpenWindow( SFG_Window* window, const char* title,
"FBConfig with necessary capabilities not found", "fgOpenWindow" ); "FBConfig with necessary capabilities not found", "fgOpenWindow" );
/* Get the X visual. */ /* Get the X visual. */
for (i = 0; i < num_FBConfigs; i++) {
visualInfo = glXGetVisualFromFBConfig( fgDisplay.Display, visualInfo = glXGetVisualFromFBConfig( fgDisplay.Display,
*(window->Window.FBConfig) ); window->Window.FBConfig[i] );
if (visualInfo)
break;
}
FREEGLUT_INTERNAL_ERROR_EXIT( visualInfo != NULL,
"visualInfo could not be retrieved from FBConfig", "fgOpenWindow" );
/* /*
* XXX HINT: the masks should be updated when adding/removing callbacks. * XXX HINT: the masks should be updated when adding/removing callbacks.