diff options
author | Brian Paul <brian.paul@tungstengraphics.com> | 2008-05-18 16:17:50 -0600 |
---|---|---|
committer | Brian Paul <brian.paul@tungstengraphics.com> | 2008-05-18 16:17:50 -0600 |
commit | 54fbd8bbd4e5a484d59907bae852908e3a8b8f3c (patch) | |
tree | 2e45fac3c2505fe1131ed38e45110e1319f49806 /progs/glsl/texdemo1.c | |
parent | b4219e35e2de783ca03e53c311a8a56f8b633aa1 (diff) | |
parent | a0bfeb0c3ca58a1f4d978f2aaa343ed4009de079 (diff) |
Merge branch 'gallium-0.1' into gallium-tex-surfaces
Diffstat (limited to 'progs/glsl/texdemo1.c')
-rw-r--r-- | progs/glsl/texdemo1.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/progs/glsl/texdemo1.c b/progs/glsl/texdemo1.c index d29ecf452b..3ceae14b96 100644 --- a/progs/glsl/texdemo1.c +++ b/progs/glsl/texdemo1.c @@ -48,6 +48,7 @@ static GLfloat TexXrot = 0, TexYrot = 0; static GLfloat Xrot = 20.0, Yrot = 20.0, Zrot = 0.0; static GLfloat EyeDist = 10; static GLboolean Anim = GL_TRUE; +static int win = 0; struct uniform_info { @@ -177,6 +178,7 @@ key(unsigned char k, int x, int y) EyeDist = 90; break; case 27: + glutDestroyWindow(win); exit(0); } glutPostRedisplay(); @@ -554,7 +556,7 @@ main(int argc, char *argv[]) glutInit(&argc, argv); glutInitWindowSize(500, 400); glutInitDisplayMode(GLUT_RGB | GLUT_DEPTH | GLUT_DOUBLE); - glutCreateWindow(Demo); + win = glutCreateWindow(Demo); glutReshapeFunc(Reshape); glutKeyboardFunc(key); glutSpecialFunc(specialkey); |