X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_window.c;h=a469866a8c5351c26514c15eaebfd7dea4dba51f;hb=f0fa306fbd7cb7a61d5b9229c808ff66c858331f;hp=5255bb265818728766a05ce6c54a6dfb9e111fdb;hpb=fbf7fe41bd7dd1714c85ba6e70b4147dfb544670;p=freeglut diff --git a/src/freeglut_window.c b/src/freeglut_window.c index 5255bb2..a469866 100644 --- a/src/freeglut_window.c +++ b/src/freeglut_window.c @@ -380,14 +380,14 @@ void fgOpenWindow( SFG_Window* window, const char* title, { fgStructure.MenuContext = (SFG_MenuContext *)malloc( sizeof(SFG_MenuContext) ); - fgStructure.MenuContext->VisualInfo = window->Window.VisualInfo; - fgStructure.MenuContext->Context = glXCreateContext( - fgDisplay.Display, fgStructure.MenuContext->VisualInfo, + fgStructure.MenuContext->MVisualInfo = window->Window.VisualInfo; + fgStructure.MenuContext->MContext = glXCreateContext( + fgDisplay.Display, fgStructure.MenuContext->MVisualInfo, NULL, ( fgState.DirectContext != GLUT_FORCE_INDIRECT_CONTEXT ) ); } - /* window->Window.Context = fgStructure.MenuContext->Context; */ + /* window->Window.Context = fgStructure.MenuContext->MContext; */ window->Window.Context = glXCreateContext( fgDisplay.Display, window->Window.VisualInfo, NULL, ( fgState.DirectContext != GLUT_FORCE_INDIRECT_CONTEXT ) @@ -618,6 +618,7 @@ void fgCloseWindow( SFG_Window* window ) #if TARGET_HOST_UNIX_X11 glXDestroyContext( fgDisplay.Display, window->Window.Context ); + XFree( window->Window.VisualInfo ); XDestroyWindow( fgDisplay.Display, window->Window.Handle ); XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */