diff options
author | Ben Skeggs <skeggsb@gmail.com> | 2008-03-25 12:14:49 +1100 |
---|---|---|
committer | Ben Skeggs <skeggsb@gmail.com> | 2008-03-25 12:14:49 +1100 |
commit | 9e1f7b2c57154704d5881362a44da703b7a4a00f (patch) | |
tree | 9cd0ca55f1eb9a0908ae76f65cfda107a7aec0ca /progs | |
parent | 601b018a9a6143c634239d5bb51616724c2e593d (diff) | |
parent | 4654803e2595ea041ea83baf5e13e6c68890e9a7 (diff) |
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'progs')
-rw-r--r-- | progs/demos/texenv.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/progs/demos/texenv.c b/progs/demos/texenv.c index 590867b494..c5a8b13f35 100644 --- a/progs/demos/texenv.c +++ b/progs/demos/texenv.c @@ -76,6 +76,8 @@ int textureWidth = 64; int textureHeight = 64; int winWidth = 580, winHeight = 720; +static int Win; + struct formatInfo { GLenum baseFormat; @@ -288,6 +290,7 @@ static void keyboard( unsigned char c, int x, int y ) displayLevelInfo = !displayLevelInfo; break; case 27: /* Escape key should force exit. */ + glutDestroyWindow(Win); exit(0); break; default: @@ -785,7 +788,7 @@ int main( int argc, char *argv[] ) glutInitWindowSize( winWidth, winHeight ); glutInitWindowPosition( 0, 0 ); - glutCreateWindow( "Texture Environment Test" ); + Win = glutCreateWindow( "Texture Environment Test" ); initialize(); instructions(); |