From 3fe7f83d7e5101f5b834a42dfe8c64c2679b3169 Mon Sep 17 00:00:00 2001 From: Sylvain Beucler Date: Tue, 1 May 2012 13:13:14 +0000 Subject: [PATCH] Initialize OpenGL 2.0 after OpenGL context is created (otherwise initialization fails under mswin) git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1275 7f0cb862-5218-0410-a997-914c9d46530a --- src/fg_init.c | 3 --- src/fg_window.c | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/fg_init.c b/src/fg_init.c index 1e71931..a553b9b 100644 --- a/src/fg_init.c +++ b/src/fg_init.c @@ -28,7 +28,6 @@ #define FREEGLUT_BUILDING_LIB #include #include "fg_internal.h" -#include "fg_gl2.h" /* * TODO BEFORE THE STABLE RELEASE: @@ -381,8 +380,6 @@ void FGAPIENTRY glutInit( int* pargc, char** argv ) if( (mask & (XValue|YValue)) == (XValue|YValue) ) fgState.Position.Use = GL_TRUE; } - - fgInitGL2(); } /* diff --git a/src/fg_window.c b/src/fg_window.c index 9a980f8..5c431ea 100644 --- a/src/fg_window.c +++ b/src/fg_window.c @@ -28,6 +28,7 @@ #define FREEGLUT_BUILDING_LIB #include #include "fg_internal.h" +#include "fg_gl2.h" /* * TODO BEFORE THE STABLE RELEASE: @@ -147,6 +148,8 @@ void fgOpenWindow( SFG_Window* window, const char* title, #endif window->Window.attribute_v_coord = -1; window->Window.attribute_v_normal = -1; + + fgInitGL2(); } /* -- 1.7.10.4