From 624693e28e3ce1b69d8fd3fb0f72e99cd7012dbc Mon Sep 17 00:00:00 2001 From: fayjf Date: Tue, 25 Sep 2007 03:54:56 +0000 Subject: [PATCH] More changes for Jocelyn Frechot's multisampling changes. The library builds now. It still needs some testing with sample cases under X11. git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@728 7f0cb862-5218-0410-a997-914c9d46530a --- freeglut/freeglut/src/freeglut_window.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/freeglut/freeglut/src/freeglut_window.c b/freeglut/freeglut/src/freeglut_window.c index 3c7bfb6..c12075e 100644 --- a/freeglut/freeglut/src/freeglut_window.c +++ b/freeglut/freeglut/src/freeglut_window.c @@ -612,15 +612,15 @@ void fgOpenWindow( SFG_Window* window, const char* title, { fgStructure.MenuContext = (SFG_MenuContext *)malloc( sizeof(SFG_MenuContext) ); - fgStructure.MenuContext->Context = glXCreateNewContext( + fgStructure.MenuContext->MContext = glXCreateNewContext( fgDisplay.Display, *(window->Window.FBConfig), renderType, NULL, ( fgState.DirectContext != GLUT_FORCE_INDIRECT_CONTEXT ) ); } /* window->Window.Context = fgStructure.MenuContext->MContext; */ - window->Window.Context = glXCreateContext( - fgDisplay.Display, window->Window.FBConfig, renderType, + window->Window.Context = glXCreateNewContext( + fgDisplay.Display, *(window->Window.FBConfig), renderType, NULL, ( fgState.DirectContext != GLUT_FORCE_INDIRECT_CONTEXT ) ); } @@ -630,13 +630,13 @@ void fgOpenWindow( SFG_Window* window, const char* title, if( ! window->Window.Context ) window->Window.Context = glXCreateNewContext( - fgDisplay.Display, window->Window.FBConfig, renderType, + fgDisplay.Display, *(window->Window.FBConfig), renderType, NULL, ( fgState.DirectContext != GLUT_FORCE_INDIRECT_CONTEXT ) ); } else window->Window.Context = glXCreateNewContext( - fgDisplay.Display, window->Window.FBConfig, renderType, + fgDisplay.Display, *(window->Window.FBConfig), renderType, NULL, ( fgState.DirectContext != GLUT_FORCE_INDIRECT_CONTEXT ) ); @@ -858,8 +858,8 @@ void fgOpenWindow( SFG_Window* window, const char* title, SetWindowLong ( window->Window.Handle, GWL_STYLE, WindowStyle & ~(WS_BORDER | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX)); } -//SetWindowPos(window->Window.Handle, NULL, 0, 0, 0, 0, -// SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_FRAMECHANGED); +/* SetWindowPos(window->Window.Handle, NULL, 0, 0, 0, 0, + SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_FRAMECHANGED); */ #if defined(_WIN32_WCE)