diff options
| author | Michel Dänzer <daenzer@vmware.com> | 2009-05-20 17:00:48 +0200 |
|---|---|---|
| committer | Michel Dänzer <daenzer@vmware.com> | 2009-05-20 17:00:48 +0200 |
| commit | b9bd1abf2664a75642ee5e1999697bbe480b9172 (patch) | |
| tree | 06e34f206854badbb1ec5f31abdf661900ab389e /progs/trivial | |
| parent | c696dd0f62c195d71cf7ecbdd04d9b156dd0da0b (diff) | |
| parent | 0c75cb5afe81b0de9d006f9f9b75fdc9a15038d0 (diff) | |
Merge branch 'master' into radeon-rewrite
Conflicts:
src/mesa/drivers/dri/r300/r300_context.c
src/mesa/drivers/dri/r300/r300_texstate.c
Diffstat (limited to 'progs/trivial')
| -rw-r--r-- | progs/trivial/.gitignore | 3 | ||||
| -rw-r--r-- | progs/trivial/tri.c | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/progs/trivial/.gitignore b/progs/trivial/.gitignore index 8dcb20a68f..dce733a70a 100644 --- a/progs/trivial/.gitignore +++ b/progs/trivial/.gitignore @@ -19,6 +19,7 @@ fs-tri line line-clip line-cull +line-flat line-smooth line-stipple-wide line-userclip @@ -130,6 +131,7 @@ tristrip-flat vbo-drawarrays vbo-drawelements vbo-drawrange +vbo-noninterleaved vp-array vp-array-int vp-clip @@ -139,6 +141,7 @@ vp-tri-cb vp-tri-cb-pos vp-tri-cb-tex vp-tri-imm +vp-tri-invariant vp-tri-swap vp-tri-tex vp-unfilled diff --git a/progs/trivial/tri.c b/progs/trivial/tri.c index d44cb6a9fe..cac3fcb7d9 100644 --- a/progs/trivial/tri.c +++ b/progs/trivial/tri.c @@ -60,6 +60,7 @@ static void Key(unsigned char key, int x, int y) { switch (key) { case 27: + glutDestroyWindow(win); exit(0); default: glutPostRedisplay(); |