diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2008-09-21 12:22:21 -0700 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2008-09-21 12:22:21 -0700 |
| commit | 3a40dee3eb5151a282ce831b67427f3aa625de28 (patch) | |
| tree | a629edbc8a0e5a412faf0172c26013b81e79d462 /progs | |
| parent | 53dd838de6cd455f00f43ef7f733d4e9b420b8d8 (diff) | |
| parent | 8701e5f702a0b15d44395268e2422c196d8f4efd (diff) | |
Merge commit 'origin/gallium-0.1' into gallium-0.2
Diffstat (limited to 'progs')
| -rw-r--r-- | progs/fp/.gitignore | 1 | ||||
| -rw-r--r-- | progs/tests/mipmap_view.c | 5 | ||||
| -rw-r--r-- | progs/vpglsl/.gitignore | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/progs/fp/.gitignore b/progs/fp/.gitignore index b265f1fed7..aa51f76c9b 100644 --- a/progs/fp/.gitignore +++ b/progs/fp/.gitignore @@ -40,3 +40,4 @@ tri-swz tri-swz2 tri-tex tri-xpd +fp-tri diff --git a/progs/tests/mipmap_view.c b/progs/tests/mipmap_view.c index 117e201718..54607b8939 100644 --- a/progs/tests/mipmap_view.c +++ b/progs/tests/mipmap_view.c @@ -21,6 +21,8 @@ static int TexWidth = 256, TexHeight = 256; static int WinWidth = 1044, WinHeight = 900; static GLfloat Bias = 0.0; static GLboolean ScaleQuads = GL_FALSE; +static GLint Win = 0; + static void @@ -145,6 +147,7 @@ Key(unsigned char key, int x, int y) ScaleQuads = !ScaleQuads; break; case 27: + glutDestroyWindow(Win); exit(0); break; } @@ -238,7 +241,7 @@ main(int argc, char *argv[]) glutInitWindowPosition(0, 0); glutInitWindowSize(WinWidth, WinHeight); glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE); - glutCreateWindow(argv[0]); + Win = glutCreateWindow(argv[0]); glutReshapeFunc(Reshape); glutKeyboardFunc(Key); glutDisplayFunc(Display); diff --git a/progs/vpglsl/.gitignore b/progs/vpglsl/.gitignore new file mode 100644 index 0000000000..a5ff993525 --- /dev/null +++ b/progs/vpglsl/.gitignore @@ -0,0 +1 @@ +vp-tris |