From 2e61d136c27b9c740190643668f1e3509ce609dc Mon Sep 17 00:00:00 2001
From: José Fonseca <jfonseca@vmware.com>
Date: Sat, 24 Jan 2009 16:39:49 +0000
Subject: progs: Port most of the demos to glew.

A couple of test weren't ported due to glew breakage -- it undefines
GLAPIENTRY.
---
 progs/demos/engine.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'progs/demos/engine.c')

diff --git a/progs/demos/engine.c b/progs/demos/engine.c
index 6040a2f103..5b9b5baa7b 100644
--- a/progs/demos/engine.c
+++ b/progs/demos/engine.c
@@ -5,12 +5,11 @@
  * June 2006
  */
 
-#define GL_GLEXT_PROTOTYPES
-
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
+#include <GL/glew.h>
 #include <GL/glut.h>
 #include "readtex.h"
 #include "trackball.h"
@@ -1288,6 +1287,7 @@ main(int argc, char *argv[])
    glutInitWindowSize(WinWidth, WinHeight);
    glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH);
    glutCreateWindow("OpenGL Engine Demo");
+   glewInit();
    glutReshapeFunc(Reshape);
    glutMouseFunc(Mouse);
    glutMotionFunc(Motion);
-- 
cgit v1.2.3


From 906c60d0b7c6ad3e78c142643634e4189c07b57f Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 4 Feb 2009 08:38:28 -0700
Subject: demos: silence uninitialized var warning

---
 progs/demos/engine.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'progs/demos/engine.c')

diff --git a/progs/demos/engine.c b/progs/demos/engine.c
index 6040a2f103..d1c3237ac7 100644
--- a/progs/demos/engine.c
+++ b/progs/demos/engine.c
@@ -555,7 +555,7 @@ SquareWithHole(float squareSize, float holeRadius)
    for (i = 0; i <= 360; i += 5) {
       const float x1 = holeRadius * cos(DEG_TO_RAD(i));
       const float y1 = holeRadius * sin(DEG_TO_RAD(i));
-      float x2, y2;
+      float x2 = 0.0F, y2 = 0.0F;
       if (i > 315 || i <= 45) {
          x2 = squareSize;
          y2 = squareSize * tan(DEG_TO_RAD(i));
-- 
cgit v1.2.3


From 39a1a24b3fed6afa24a4db70ad4e3f128c24c815 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keithw@vmware.com>
Date: Tue, 3 Mar 2009 15:39:51 +0000
Subject: demos/engine: respect display list mode when drawing pistons

---
 progs/demos/engine.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'progs/demos/engine.c')

diff --git a/progs/demos/engine.c b/progs/demos/engine.c
index 14fd1e6862..af437e2f14 100644
--- a/progs/demos/engine.c
+++ b/progs/demos/engine.c
@@ -386,7 +386,10 @@ DrawPositionedPiston(const Engine *eng, float crankAngle)
    glPushMatrix();
       glRotatef(-90, 1, 0, 0);
       glTranslatef(0, 0, pos);
-      DrawPiston(eng);
+      if (eng->PistonList)
+         glCallList(eng->PistonList);
+      else
+         DrawPiston(eng);
    glPopMatrix();
 }
 
-- 
cgit v1.2.3


From b258320dbd0dae943bb817aded392796501a6cde Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keithw@vmware.com>
Date: Fri, 6 Mar 2009 11:05:09 +0000
Subject: engine: also print fps data to stdout

Useful for figuring out how much of a perf impact the glBitmap fps
display has on a given driver.
---
 progs/demos/engine.c | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'progs/demos/engine.c')

diff --git a/progs/demos/engine.c b/progs/demos/engine.c
index af437e2f14..3cf311e778 100644
--- a/progs/demos/engine.c
+++ b/progs/demos/engine.c
@@ -964,6 +964,28 @@ Draw(void)
 	 glEnable(GL_TEXTURE_2D);
    }
 
+   /* also print out a periodic fps to stdout.  useful for trying to
+    * figure out the performance impact of rendering the string above
+    * with glBitmap.
+    */
+   {
+      static GLint T0 = 0;
+      static GLint Frames = 0;
+      GLint t = glutGet(GLUT_ELAPSED_TIME);
+      
+      Frames++;
+         
+      if (t - T0 >= 5000) {
+         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;
+      }
+   }
+
+
    glutSwapBuffers();
 }
 
-- 
cgit v1.2.3