diff options
author | Brian Paul <[email protected]> | 2009-06-26 17:07:07 -0600 |
---|---|---|
committer | Brian Paul <[email protected]> | 2009-06-26 17:07:07 -0600 |
commit | a18e209edb5348eb167e9d7184597031bbbbe622 (patch) | |
tree | 60fcd288119f335cccdc2f15981c9b315d332e64 /progs | |
parent | 4fdc6ad41b843109febbe9596dde87f676a8b0e9 (diff) | |
parent | 418987ff05f892d3c33ed4ddbe856c496b05ea14 (diff) |
Merge branch 'mesa_7_5_branch'
Conflicts:
Makefile
src/gallium/drivers/softpipe/sp_screen.c
src/mesa/main/version.h
Diffstat (limited to 'progs')
-rw-r--r-- | progs/demos/fslight.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/progs/demos/fslight.c b/progs/demos/fslight.c index 41a13cc9f46..f0d76a4a06f 100644 --- a/progs/demos/fslight.c +++ b/progs/demos/fslight.c @@ -583,10 +583,14 @@ ParseOptions(int argc, char *argv[]) int i; for (i = 1; i < argc; i++) { if (strcmp(argv[i], "-fs") == 0) { - FragProgFile = argv[i+1]; + FragProgFile = argv[++i]; } else if (strcmp(argv[i], "-vs") == 0) { - VertProgFile = argv[i+1]; + VertProgFile = argv[++i]; + } + else { + fprintf(stderr, "unknown option %s\n", argv[i]); + break; } } } |