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/arbocclude.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/arbocclude.c')
| -rw-r--r-- | progs/demos/arbocclude.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/progs/demos/arbocclude.c b/progs/demos/arbocclude.c index ddbb1f1b75..9188ad5a56 100644 --- a/progs/demos/arbocclude.c +++ b/progs/demos/arbocclude.c @@ -29,7 +29,7 @@ #include <stdlib.h> #include <string.h> #include <math.h> -#define GL_GLEXT_PROTOTYPES +#include <GL/glew.h> #include <GL/glut.h> #define TEST_DISPLAY_LISTS 0 @@ -37,7 +37,7 @@ static GLboolean Anim = GL_TRUE; static GLfloat Xpos = 0; static GLuint OccQuery; - +static GLint Win = 0; static void @@ -204,6 +204,7 @@ static void Key( unsigned char key, int x, int y ) (void) y; switch (key) { case 27: + glutDestroyWindow(Win); exit(0); break; case ' ': @@ -271,7 +272,8 @@ int main( int argc, char *argv[] ) glutInitWindowPosition( 0, 0 ); glutInitWindowSize( 400, 400 ); glutInitDisplayMode( GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH ); - glutCreateWindow(argv[0]); + Win = glutCreateWindow(argv[0]); + glewInit(); glutReshapeFunc( Reshape ); glutKeyboardFunc( Key ); glutSpecialFunc( SpecialKey ); |