summaryrefslogtreecommitdiff
path: root/progs/glsl/texdemo1.c
diff options
context:
space:
mode:
authorZack Rusin <zack@tungstengraphics.com>2008-05-19 12:10:42 -0400
committerZack Rusin <zack@tungstengraphics.com>2008-05-19 12:10:42 -0400
commit09900df42967a0ba61e78038304fd6c54934ad0d (patch)
tree8bf72aa313a23c8554fdda5c9381cc593132722d /progs/glsl/texdemo1.c
parent1c624846a81b0218b4a07328f485e295432c6312 (diff)
parent59007a811de2d76ea00164e8f1cacb4a375d1458 (diff)
Merge commit 'origin/gallium-0.1' into gallium-vertex-linear
Diffstat (limited to 'progs/glsl/texdemo1.c')
-rw-r--r--progs/glsl/texdemo1.c4
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);