diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-05-25 14:19:18 +1000 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-05-25 14:19:18 +1000 |
| commit | 92120851947ad4a47d2150a7cf3f8dc5fdde396c (patch) | |
| tree | 21a04cf25570028ee0266558a1350577751722ab /progs/glsl/texdemo1.c | |
| parent | 9a01ee4424718e0c3015c1f0477cae63ee63d96b (diff) | |
| parent | 7fbb61eedd4b07f07007a172cea227d5c363b908 (diff) | |
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
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); |