diff options
| author | Zack Rusin <zackr@vmware.com> | 2009-12-07 18:13:57 -0500 |
|---|---|---|
| committer | Zack Rusin <zackr@vmware.com> | 2009-12-07 18:13:57 -0500 |
| commit | 45412c2343a3ed1de388aca6a5ae25c49918c9bc (patch) | |
| tree | 44303c67e10949cad86ed1bf1fe818c397288e7b /progs/vp/vp-tris.c | |
| parent | 9b5f260756356a73984d60c907c525b8a2f8cf94 (diff) | |
| parent | cad14c2542698de144bb5434cefa02d7a00aaa74 (diff) | |
Merge remote branch 'origin/master' into arb_geometry_shader4arb_geometry_shader4
Conflicts:
src/gallium/auxiliary/tgsi/tgsi_exec.c
src/mesa/glapi/glapitemp.h
src/mesa/glapi/glprocs.h
src/mesa/main/enums.c
src/mesa/main/remap_helper.h
src/mesa/state_tracker/st_atom_shader.c
src/mesa/state_tracker/st_program.c
src/mesa/state_tracker/st_program.h
Diffstat (limited to 'progs/vp/vp-tris.c')
| -rw-r--r-- | progs/vp/vp-tris.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/progs/vp/vp-tris.c b/progs/vp/vp-tris.c index 1356242d97..29cd027b00 100644 --- a/progs/vp/vp-tris.c +++ b/progs/vp/vp-tris.c @@ -99,9 +99,11 @@ static void Init( void ) sz = (GLuint) fread(buf, 1, sizeof(buf), f); if (!feof(f)) { fprintf(stderr, "file too long\n"); + fclose(f); exit(1); } + fclose(f); fprintf(stderr, "%.*s\n", sz, buf); if (strncmp( buf, "!!VP", 4 ) == 0) { |