Add new demo "fbo_firecube".

[mesa.git] / progs / demos / trispd.c

diff --git a/progs/demos/trispd.c b/progs/demos/trispd.c
index a836c9d80ff5635ce4a6d0c7deec7a3a073231b5..165d088e3d306bb245192288c97ae25ded11fb64 100644 (file)
--- a/progs/demos/trispd.c
+++ b/progs/demos/trispd.c
@@ -1,34 +1,9 @@
-/* $Id: trispd.c,v 1.1 1999/08/19 00:55:40 jtg Exp $ */
 
 /*
  * Simple GLUT program to measure triangle strip rendering speed.
  * Brian Paul  February 15, 1997  This file is in the public domain.
  */
 
-/*
- * $Log: trispd.c,v $
- * Revision 1.1  1999/08/19 00:55:40  jtg
- * Initial revision
- *
- * Revision 3.4  1999/03/28 18:24:37  brianp
- * minor clean-up
- *
- * Revision 3.3  1999/03/18 08:16:52  joukj
- *
- *     cmpstr needs string.h to included to avoid warnings
- *
- * Revision 3.2  1998/07/08 03:02:00  brianp
- * added Marten Stromberg's texture options
- *
- * Revision 3.1  1998/06/29 02:36:58  brianp
- * removed unneeded includes
- *
- * Revision 3.0  1998/02/14 18:42:29  brianp
- * initial rev
- *
- */
-
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
@@ -107,6 +82,7 @@ static void Display( void )
         }
       }
    }
+   glFinish();
    t1 = glutGet(GLUT_ELAPSED_TIME) * 0.001;
    
    if (t1-t0 < MinPeriod) {
@@ -154,7 +130,7 @@ static void LoadTex(int comp, int filter)
 {
    GLubyte *pixels;
    int x, y;
-   pixels = malloc(4*256*256);
+   pixels = (GLubyte *) malloc(4*256*256);
    for (y = 0; y < 256; ++y)
       for (x = 0; x < 256; ++x) {
         pixels[(y*256+x)*4+0] = (int)(128.5 + 127.0 * cos(0.024544 * x));