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

Refactored GLX context creation into a single function, centralizing things to

Browse Source 
be changed for OpenGL 3.0 context creation and removing some cut-n-paste.


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@748 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
spanne 2008-11-02 20:09:02 +00:00
parent 9e30ae3bc0
commit 17c757011c
1 changed files with 21 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -483,6 +483,23 @@ void fgSetWindow ( SFG_Window *window )
} }
#if TARGET_HOST_POSIX_X11
static GLXContext fghCreateNewContext( SFG_Window* window )
{
int menu = ( window->IsMenu && !fgStructure.MenuContext );
int index_mode = ( fgState.DisplayMode & GLUT_INDEX );
Display *dpy = fgDisplay.Display;
GLXFBConfig config = *(window->Window.FBConfig);
int render_type = ( !menu && index_mode ) ? GLX_COLOR_INDEX_TYPE : GLX_RGBA_TYPE;
GLXContext share_list = NULL;
Bool direct = ( fgState.DirectContext != GLUT_FORCE_INDIRECT_CONTEXT );
return glXCreateNewContext( dpy, config, render_type, share_list, direct );
}
#endif
/* /*
* Opens a window. Requires a SFG_Window object created and attached * Opens a window. Requires a SFG_Window object created and attached
* to the freeglut structure. OpenGL context is created here. * to the freeglut structure. OpenGL context is created here.
@ -499,7 +516,6 @@ void fgOpenWindow( SFG_Window* window, const char* title,
XSizeHints sizeHints; XSizeHints sizeHints;
XWMHints wmHints; XWMHints wmHints;
unsigned long mask; unsigned long mask;
int renderType; /* GLX_RGBA_TYPE or GLX_COLOR_INDEX_TYPE */
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 */
@ -592,21 +608,6 @@ void fgOpenWindow( SFG_Window* window, const char* title,
* or else use the current context if the user has so specified * or else use the current context if the user has so specified
*/ */
/* Set renderType. */
if( window->IsMenu && ( ! fgStructure.MenuContext ) )
{
/* Display mode has been set to GLUT_RGB. */
renderType = GLX_RGBA_TYPE;
}
else if (fgState.DisplayMode & GLUT_INDEX)
{
renderType = GLX_COLOR_INDEX_TYPE;
}
else
{
renderType = GLX_RGBA_TYPE;
}
if( window->IsMenu ) if( window->IsMenu )
{ {
/* /*
@ -617,33 +618,21 @@ void fgOpenWindow( SFG_Window* window, const char* title,
{ {
fgStructure.MenuContext = fgStructure.MenuContext =
(SFG_MenuContext *)malloc( sizeof(SFG_MenuContext) ); (SFG_MenuContext *)malloc( sizeof(SFG_MenuContext) );
fgStructure.MenuContext->MContext = glXCreateNewContext( fgStructure.MenuContext->MContext = fghCreateNewContext( window );
fgDisplay.Display, *(window->Window.FBConfig), renderType,
NULL, ( fgState.DirectContext != GLUT_FORCE_INDIRECT_CONTEXT )
);
} }
/* window->Window.Context = fgStructure.MenuContext->MContext; */ /* window->Window.Context = fgStructure.MenuContext->MContext; */
window->Window.Context = glXCreateNewContext( window->Window.Context = fghCreateNewContext( window );
fgDisplay.Display, *(window->Window.FBConfig), renderType,
NULL, ( fgState.DirectContext != GLUT_FORCE_INDIRECT_CONTEXT )
);
} }
else if( fgState.UseCurrentContext ) else if( fgState.UseCurrentContext )
{ {
window->Window.Context = glXGetCurrentContext( ); window->Window.Context = glXGetCurrentContext( );
if( ! window->Window.Context ) if( ! window->Window.Context )
window->Window.Context = glXCreateNewContext( window->Window.Context = fghCreateNewContext( window );
fgDisplay.Display, *(window->Window.FBConfig), renderType,
NULL, ( fgState.DirectContext != GLUT_FORCE_INDIRECT_CONTEXT )
);
} }
else else
window->Window.Context = glXCreateNewContext( window->Window.Context = fghCreateNewContext( window );
fgDisplay.Display, *(window->Window.FBConfig), renderType,
NULL, ( fgState.DirectContext != GLUT_FORCE_INDIRECT_CONTEXT )
);
#if !defined( __FreeBSD__ ) && !defined( __NetBSD__ ) #if !defined( __FreeBSD__ ) && !defined( __NetBSD__ )
if( !glXIsDirect( fgDisplay.Display, window->Window.Context ) ) if( !glXIsDirect( fgDisplay.Display, window->Window.Context ) )