Merge master and fix conflicts

[mesa.git] / progs / samples / stretch.c

diff --git a/progs/samples/stretch.c b/progs/samples/stretch.c
index 9efa8e187e3a43c238334961eec0257b3e2fb935..1fd015d794a051e9ee0ce2751d80d8fad5e16951 100644 (file)
--- a/progs/samples/stretch.c
+++ b/progs/samples/stretch.c
@@ -265,6 +265,17 @@ void Mouse(int button, int state, int mouseX, int mouseY)
 
 void Animate(void)
 {
+    static double t0 = -1.;
+    double t, dt;
+    t = glutGet(GLUT_ELAPSED_TIME) / 1000.;
+    if (t0 < 0.)
+       t0 = t;
+    dt = t - t0;
+
+    if (dt < 1./60.)
+        return;
+
+    t0 = t;
 
     switch (op) {
       case OP_STRETCH:
@@ -307,6 +318,10 @@ static GLenum Args(int argc, char **argv)
     return GL_TRUE;
 }
 
+#if !defined(GLUTCALLBACK)
+#define GLUTCALLBACK
+#endif
+
 void GLUTCALLBACK glut_post_redisplay_p(void)
 {
       glutPostRedisplay();