Fix a problem that caused the new interface code to not actually be

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

diff --git a/src/glut/glx/glut_swap.c b/src/glut/glx/glut_swap.c
index 0864e58d42923681973fa9fb5de659e95e54cd21..4831b8eb35134127acd5da1290d50289f85c5fa9 100644 (file)
--- a/src/glut/glx/glut_swap.c
+++ b/src/glut/glx/glut_swap.c
@@ -5,10 +5,15 @@
    and is provided without guarantee or warrantee expressed or
    implied. This program is -not- in the public domain. */
 
+#include <stdio.h>
 #include "glutint.h"
 
+GLint __glutFPS = 0;
+GLint __glutSwapCount = 0;
+GLint __glutSwapTime = 0;
+
 /* CENTRY */
-void APIENTRY
+void GLUTAPIENTRY
 glutSwapBuffers(void)
 {
   GLUTwindow *window = __glutCurrentWindow;
@@ -43,5 +48,20 @@ glutSwapBuffers(void)
      glutPostRedisplay to trigger redraws.  If
      glutPostRedisplay were used, __glutSetWindow would be
      called and a glFinish to throttle buffering would occur. */
+
+  if (__glutFPS) {
+     GLint t = glutGet(GLUT_ELAPSED_TIME);
+     __glutSwapCount++;
+     if (__glutSwapTime == 0)
+        __glutSwapTime = t;
+     else if (t - __glutSwapTime > __glutFPS) {
+        float time = 0.001 * (t - __glutSwapTime);
+        float fps = (float) __glutSwapCount / time;
+        fprintf(stderr, "GLUT: %d frames in %.2f seconds = %.2f FPS\n",
+                __glutSwapCount, time, fps);
+        __glutSwapTime = t;
+        __glutSwapCount = 0;
+     }
+  }
 }
 /* ENDCENTRY */