diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-03-20 10:52:17 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-03-20 10:52:17 +1000 |
| commit | 407e8ae5b167b0193e1e5b1266a5d61ed836dfb5 (patch) | |
| tree | 2d9d05a5c3122f41a13aa8bd9ae921c1176e6b0d /progs/demos/streaming_rect.c | |
| parent | bdaa0341caffc353fd26bbd91865c2d86eed11c1 (diff) | |
| parent | 114bb54324f22cb53bcd14607234d0acd74d37bd (diff) | |
| download | external_mesa3d-407e8ae5b167b0193e1e5b1266a5d61ed836dfb5.zip external_mesa3d-407e8ae5b167b0193e1e5b1266a5d61ed836dfb5.tar.gz external_mesa3d-407e8ae5b167b0193e1e5b1266a5d61ed836dfb5.tar.bz2 | |
Merge remote branch 'main/master' into radeon-rewrite
Conflicts:
src/mesa/drivers/dri/r300/r300_cmdbuf.c
src/mesa/drivers/dri/r300/r300_state.c
src/mesa/drivers/dri/r300/r300_swtcl.c
src/mesa/drivers/dri/r300/radeon_ioctl.c
src/mesa/drivers/dri/radeon/radeon_screen.c
Diffstat (limited to 'progs/demos/streaming_rect.c')
| -rw-r--r-- | progs/demos/streaming_rect.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/progs/demos/streaming_rect.c b/progs/demos/streaming_rect.c index 4d4656e..f65ac4c 100644 --- a/progs/demos/streaming_rect.c +++ b/progs/demos/streaming_rect.c @@ -47,7 +47,10 @@ static void Idle( void ) } /*static int max( int a, int b ) { return a > b ? a : b; }*/ + +#ifndef min static int min( int a, int b ) { return a < b ? a : b; } +#endif static void DrawObject() { @@ -150,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; |