diff options
| author | José Fonseca <jfonseca@vmware.com> | 2010-02-05 13:48:35 +0000 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2010-02-05 13:48:35 +0000 |
| commit | a1af8eec66c5f7ec421e8011b41c1a7c36319f9f (patch) | |
| tree | bc76a431699807cf60cf8ba82ff6b3b1ff34f309 /progs/demos | |
| parent | c036d13d7d2cc905226fe53ebd86a18da808963f (diff) | |
| parent | bee9964b29b2428ee75e2d1efc0e1d2c2518a417 (diff) | |
Merge remote branch 'origin/lp-binning'
Conflicts:
src/gallium/auxiliary/util/u_dl.c
src/gallium/auxiliary/util/u_time.h
src/gallium/drivers/llvmpipe/lp_state_derived.c
src/gallium/drivers/llvmpipe/lp_state_surface.c
src/gallium/drivers/llvmpipe/lp_tex_cache.c
src/gallium/drivers/llvmpipe/lp_tile_cache.c
Diffstat (limited to 'progs/demos')
| -rw-r--r-- | progs/demos/engine.c | 5 | ||||
| -rw-r--r-- | progs/demos/gloss.c | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/progs/demos/engine.c b/progs/demos/engine.c index 7e485111da..a4148357d4 100644 --- a/progs/demos/engine.c +++ b/progs/demos/engine.c @@ -26,6 +26,8 @@ /* Target engine speed: */ const int RPM = 100.0; +static int Win = 0; + /** * Engine description. @@ -1154,6 +1156,7 @@ OptRotate(void) static void OptExit(void) { + glutDestroyWindow(Win); exit(0); } @@ -1323,7 +1326,7 @@ main(int argc, char *argv[]) glutInitWindowSize(WinWidth, WinHeight); glutInit(&argc, argv); glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH); - glutCreateWindow("OpenGL Engine Demo"); + Win = glutCreateWindow("OpenGL Engine Demo"); glewInit(); glutReshapeFunc(Reshape); glutMouseFunc(Mouse); diff --git a/progs/demos/gloss.c b/progs/demos/gloss.c index 578736b4e2..450861e577 100644 --- a/progs/demos/gloss.c +++ b/progs/demos/gloss.c @@ -41,6 +41,7 @@ /* for convolution */ #define FILTER_SIZE 7 +static GLint Win; static GLint WinWidth = 500, WinHeight = 500; static GLuint CylinderObj = 0; static GLuint TeapotObj = 0; @@ -214,7 +215,11 @@ static void Key( unsigned char key, int x, int y ) case ' ': ToggleAnimate(); break; + case 'n': + Idle(); + break; case 27: + glutDestroyWindow(Win); exit(0); break; } @@ -439,7 +444,7 @@ int main( int argc, char *argv[] ) glutInitWindowSize(WinWidth, WinHeight); glutInit( &argc, argv ); glutInitDisplayMode( GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH ); - glutCreateWindow(argv[0] ); + Win = glutCreateWindow(argv[0] ); glewInit(); glutReshapeFunc( Reshape ); glutKeyboardFunc( Key ); |