diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-02-13 01:11:25 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-02-13 01:11:25 +1000 |
| commit | 53116910b10e3b8a05f42970eff311c21808699f (patch) | |
| tree | 6831e50a56a02fed324f8cb119e05d837e00d7cf /progs/demos/engine.c | |
| parent | 7e104f9cde94279a902b408e8d1cf21779b393a8 (diff) | |
| parent | 0ccbc3c905f0594a35d72887a1f115e148aaa596 (diff) | |
Merge remote branch 'origin/master' into radeon-rewrite
Conflicts:
configure.ac
src/mesa/drivers/dri/r200/r200_context.c
src/mesa/drivers/dri/r300/r300_render.c
Diffstat (limited to 'progs/demos/engine.c')
| -rw-r--r-- | progs/demos/engine.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/progs/demos/engine.c b/progs/demos/engine.c index 6040a2f103..14fd1e6862 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" @@ -555,7 +554,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)); @@ -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); |