Merge commit 'origin/master' into gallium-map-range

11 files changed, 11 insertions, 0 deletions

diff --git a/progs/demos/arbfplight.c b/progs/demos/arbfplight.c
index 401bfb49684..7b7a12bf88d 100644
--- a/progs/demos/arbfplight.c
+++ b/progs/demos/arbfplight.c
@@ -92,6 +92,7 @@ static void Redisplay( void )
 	 GLfloat seconds = (t - T0) / 1000.0;
 	 GLfloat fps = Frames / seconds;
 	 printf("%d frames in %6.3f seconds = %6.3f FPS\n", Frames, seconds, fps);
+         fflush(stdout);
 	 T0 = t;
 	 Frames = 0;
       }
diff --git a/progs/demos/arbfslight.c b/progs/demos/arbfslight.c
index a84491d34fe..275c85105ed 100644
--- a/progs/demos/arbfslight.c
+++ b/progs/demos/arbfslight.c
@@ -105,6 +105,7 @@ static void Redisplay (void)
 			GLfloat seconds = (GLfloat) (t - t0) / 1000.0f;
 			GLfloat fps = frames / seconds;
 			printf ("%d frames in %6.3f seconds = %6.3f FPS\n", frames, seconds, fps);
+                        fflush(stdout);
 			t0 = t;
 			frames = 0;
 		}
diff --git a/progs/demos/fslight.c b/progs/demos/fslight.c
index e79b5cc1970..41a13cc9f46 100644
--- a/progs/demos/fslight.c
+++ b/progs/demos/fslight.c
@@ -105,6 +105,7 @@ Redisplay(void)
          GLfloat fps = frames / seconds;
          printf("%d frames in %6.3f seconds = %6.3f FPS\n",
                 frames, seconds, fps);
+         fflush(stdout);
          t0 = t;
          frames = 0;
       }
diff --git a/progs/demos/gearbox.c b/progs/demos/gearbox.c
index 35bde04417b..2dcf32f92ff 100644
--- a/progs/demos/gearbox.c
+++ b/progs/demos/gearbox.c
@@ -314,6 +314,7 @@ draw(void)
          GLfloat seconds = (t - T0) / 1000.0;
          GLfloat fps = Frames / seconds;
          printf("%d frames in %6.3f seconds = %6.3f FPS\n", Frames, seconds, fps);
+         fflush(stdout);
          T0 = t;
          Frames = 0;
       }
diff --git a/progs/demos/gears.c b/progs/demos/gears.c
index 2a9fefefb53..6016162d6f7 100644
--- a/progs/demos/gears.c
+++ b/progs/demos/gears.c
@@ -219,6 +219,7 @@ draw(void)
       GLfloat seconds = (t - T0) / 1000.0;
       GLfloat fps = Frames / seconds;
       printf("%d frames in %6.3f seconds = %6.3f FPS\n", Frames, seconds, fps);
+      fflush(stdout);
       T0 = t;
       Frames = 0;
       if ((t >= 999.0 * autoexit) && (autoexit)) {
diff --git a/progs/demos/geartrain.c b/progs/demos/geartrain.c
index 8363f2abc6d..8fe405e8076 100644
--- a/progs/demos/geartrain.c
+++ b/progs/demos/geartrain.c
@@ -905,6 +905,7 @@ draw (void)
 	    GLfloat seconds = (t - T0) / 1000.0;
 	    GLfloat fps = Frames / seconds;
 	    printf("%d frames in %g seconds = %g FPS\n", Frames, seconds, fps);
+            fflush(stdout);
 	    T0 = t;
 	    Frames = 0;
 	}
diff --git a/progs/demos/gloss.c b/progs/demos/gloss.c
index b2126e32678..69694b23a09 100644
--- a/progs/demos/gloss.c
+++ b/progs/demos/gloss.c
@@ -132,6 +132,7 @@ static void Display( void )
          GLfloat seconds = (t - T0) / 1000.0;
          GLfloat fps = Frames / seconds;
          printf("%d frames in %g seconds = %g FPS\n", Frames, seconds, fps);
+         fflush(stdout);
          T0 = t;
          Frames = 0;
       }
diff --git a/progs/demos/glslnoise.c b/progs/demos/glslnoise.c
index 4ee12928164..e972b62673f 100644
--- a/progs/demos/glslnoise.c
+++ b/progs/demos/glslnoise.c
@@ -65,6 +65,7 @@ static void Redisplay (void)
       GLfloat seconds = (GLfloat) (t - t0) / 1000.0f;
       GLfloat fps = frames / seconds;
       printf ("%d frames in %6.3f seconds = %6.3f FPS\n", frames, seconds, fps);
+      fflush(stdout);
       t0 = t;
       frames = 0;
    }
diff --git a/progs/demos/reflect.c b/progs/demos/reflect.c
index 0bec0663bc2..b72af12885d 100644
--- a/progs/demos/reflect.c
+++ b/progs/demos/reflect.c
@@ -401,6 +401,7 @@ DrawWindow(void)
          GLfloat seconds = (t - t0) / 1000.0;
          GLfloat fps = frames / seconds;
          printf("%d frames in %g seconds = %g FPS\n", frames, seconds, fps);
+         fflush(stdout);
          t0 = t;
          frames = 0;
       }
diff --git a/progs/demos/streaming_rect.c b/progs/demos/streaming_rect.c
index 294f9c30607..f65ac4ce36c 100644
--- a/progs/demos/streaming_rect.c
+++ b/progs/demos/streaming_rect.c
@@ -153,6 +153,7 @@ static void Display( void )
 
       GLfloat fps = Frames / seconds;
       printf("%d frames in %6.3f seconds = %6.3f FPS\n", Frames, seconds, fps);
+      fflush(stdout);
 
       drift_increment = 2.2 * seconds / Frames;
       T0 = t;
diff --git a/progs/demos/texcyl.c b/progs/demos/texcyl.c
index e3b03039759..0e6089bced5 100644
--- a/progs/demos/texcyl.c
+++ b/progs/demos/texcyl.c
@@ -79,6 +79,7 @@ static void Display( void )
          GLfloat seconds = (t - T0) / 1000.0;
          GLfloat fps = Frames / seconds;
          printf("%d frames in %g seconds = %g FPS\n", Frames, seconds, fps);
+         fflush(stdout);
          T0 = t;
          Frames = 0;
       }