cleanup and some WGL PIXELFORMAT issues

[mesa.git] / src / glut / glx / glut_init.c

diff --git a/src/glut/glx/glut_init.c b/src/glut/glx/glut_init.c
index dcd423a9417fa303779c027049f90e9b3e48acea..b1a42a328dc4258c738d40fe42a64df85a92a069 100644 (file)
--- a/src/glut/glx/glut_init.c
+++ b/src/glut/glx/glut_init.c
@@ -186,7 +186,7 @@ removeArgs(int *argcp, char **argv, int numToRemove)
   *argcp -= numToRemove;
 }
 
-void APIENTRY 
+void GLUTAPIENTRY 
 glutInit(int *argcp, char **argv)
 {
   char *display = NULL;
@@ -331,10 +331,20 @@ glutInit(int *argcp, char **argv)
     glutInitWindowPosition(__glutInitX, __glutInitY);
   }
   __glutInitTime(&unused);
+
+  /* check if GLUT_FPS env var is set */
+  {
+     const char *fps = getenv("GLUT_FPS");
+     if (fps) {
+        sscanf(fps, "%d", &__glutFPS);
+        if (__glutFPS <= 0)
+           __glutFPS = 5000;  /* 5000 milliseconds */
+     }
+  }
 }
 
 #ifdef _WIN32
-void APIENTRY 
+void GLUTAPIENTRY 
 __glutInitWithExit(int *argcp, char **argv, void (__cdecl *exitfunc)(int))
 {
   __glutExitFunc = exitfunc;
@@ -343,7 +353,7 @@ __glutInitWithExit(int *argcp, char **argv, void (__cdecl *exitfunc)(int))
 #endif
 
 /* CENTRY */
-void APIENTRY 
+void GLUTAPIENTRY 
 glutInitWindowPosition(int x, int y)
 {
   __glutInitX = x;
@@ -357,7 +367,7 @@ glutInitWindowPosition(int x, int y)
   }
 }
 
-void APIENTRY 
+void GLUTAPIENTRY 
 glutInitWindowSize(int width, int height)
 {
   __glutInitWidth = width;
@@ -371,7 +381,7 @@ glutInitWindowSize(int width, int height)
   }
 }
 
-void APIENTRY 
+void GLUTAPIENTRY 
 glutInitDisplayMode(unsigned int mask)
 {
   __glutDisplayMode = mask;