X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffg_init.c;h=1e7193146ab778bc2fb18b88c7adedfcb64166f2;hb=8c3eab0efb7f82a94014e0c1342c287e19461041;hp=816fc669fed96af6d053139d18081ba7a4b9a7ec;hpb=1b5ee849ba61b667aeba474a7e03406196478bee;p=freeglut

diff --git a/src/fg_init.c b/src/fg_init.c
index 816fc66..1e71931 100644
--- a/src/fg_init.c
+++ b/src/fg_init.c
@@ -28,6 +28,7 @@
 #define FREEGLUT_BUILDING_LIB
 #include <GL/freeglut.h>
 #include "fg_internal.h"
+#include "fg_gl2.h"
 
 /*
  * TODO BEFORE THE STABLE RELEASE:
@@ -85,10 +86,12 @@ SFG_State fgState = { { -1, -1, GL_FALSE },  /* Position */
                       0,                      /* MouseWheelTicks */
                       1,                      /* AuxiliaryBufferNumber */
                       4,                      /* SampleNumber */
-                      1,                      /* MajorVersion */
-                      0,                      /* MinorVersion */
-                      0,                      /* ContextFlags */
-                      0,                      /* ContextProfile */
+                      GL_FALSE,               /* SkipStaleMotion */
+                      1,                      /* OpenGL context MajorVersion */
+                      0,                      /* OpenGL context MinorVersion */
+                      0,                      /* OpenGL ContextFlags */
+                      0,                      /* OpenGL ContextProfile */
+                      0,                      /* HasOpenGL20 */
                       NULL,                   /* ErrorFunc */
                       NULL                    /* WarningFunc */
 };
@@ -101,7 +104,6 @@ extern void fgPlatformDeinitialiseInputDevices ( void );
 extern void fgPlatformCloseDisplay ( void );
 extern void fgPlatformDestroyContext ( SFG_PlatformDisplay pDisplay, SFG_WindowContextType MContext );
 
-
 void fghParseCommandLineArguments ( int* pargc, char** argv, char **pDisplayName, char **pGeometry )
 {
 #ifndef _WIN32_WCE
@@ -315,7 +317,7 @@ void fgDeinitialize( void )
 
 
 /* -- INTERFACE FUNCTIONS -------------------------------------------------- */
-#if !TARGET_HOST_POSIX_X11
+#if defined(NEED_XPARSEGEOMETRY_IMPL)
 #   include "util/xparsegeometry_repl.h"
 #endif
 
@@ -379,6 +381,8 @@ void FGAPIENTRY glutInit( int* pargc, char** argv )
         if( (mask & (XValue|YValue)) == (XValue|YValue) )
             fgState.Position.Use = GL_TRUE;
     }
+
+    fgInitGL2();
 }
 
 /*
@@ -682,4 +686,4 @@ void FGAPIENTRY glutInitWarningFunc( void (* vfgWarning) ( const char *fmt, va_l
     fgState.WarningFunc = vfgWarning;
 }
 
-/*** END OF FILE ***/
\ No newline at end of file
+/*** END OF FILE ***/