diff options
| author | Eric Anholt <eric@anholt.net> | 2007-05-18 14:14:12 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2007-05-18 14:14:12 -0700 |
| commit | 1bdee1853627e08894bd267b8f0ec176a1b5978f (patch) | |
| tree | 78c3b8bb81e866de4544d2621abb633b008095ab /progs/demos/fplight.c | |
| parent | c085e350df593ab2af60f53b86265db4c3eab38a (diff) | |
| parent | 4fca6bfa5d211a093c54b0bbeadaa38081e8c141 (diff) | |
Merge branch 'master' into i915-unification
Conflicts:
src/mesa/drivers/dri/common/dri_bufmgr.c
src/mesa/drivers/dri/common/dri_drmpool.c
src/mesa/drivers/dri/i915tex/intel_batchpool.c
src/mesa/drivers/dri/i915tex/intel_buffer_objects.c
src/mesa/drivers/dri/i915tex/intel_regions.c
src/mesa/drivers/dri/i915tex/intel_screen.c
src/mesa/drivers/dri/i915tex/intel_screen.h
Diffstat (limited to 'progs/demos/fplight.c')
| -rw-r--r-- | progs/demos/fplight.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/progs/demos/fplight.c b/progs/demos/fplight.c index c7a38248d3..fb510cccc8 100644 --- a/progs/demos/fplight.c +++ b/progs/demos/fplight.c @@ -24,7 +24,7 @@ static GLuint VertProg; static GLboolean Anim = GL_TRUE; static GLboolean Wire = GL_FALSE; static GLboolean PixelLight = GL_TRUE; - +static GLint Win; static GLfloat Xrot = 0, Yrot = 0; @@ -136,8 +136,8 @@ static void Key( unsigned char key, int x, int y ) } break; case 27: + glutDestroyWindow(Win); exit(0); - break; } glutPostRedisplay(); } @@ -272,7 +272,7 @@ int main( int argc, char *argv[] ) glutInitWindowPosition( 0, 0 ); glutInitWindowSize( 200, 200 ); glutInitDisplayMode( GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH ); - glutCreateWindow(argv[0]); + Win = glutCreateWindow(argv[0]); glutReshapeFunc( Reshape ); glutKeyboardFunc( Key ); glutSpecialFunc( SpecialKey ); |