projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mesa_7_5_branch'
[mesa.git]
/
progs
/
demos
/
fslight.c
diff --git
a/progs/demos/fslight.c
b/progs/demos/fslight.c
index e79b5cc1970c1e802c2b42f647c436451113726f..f0d76a4a06fb50de4ec40ba530cf4c3bf179b229 100644
(file)
--- a/
progs/demos/fslight.c
+++ b/
progs/demos/fslight.c
@@
-105,6
+105,7
@@
Redisplay(void)
GLfloat fps = frames / seconds;
printf("%d frames in %6.3f seconds = %6.3f FPS\n",
frames, seconds, fps);
GLfloat fps = frames / seconds;
printf("%d frames in %6.3f seconds = %6.3f FPS\n",
frames, seconds, fps);
+ fflush(stdout);
t0 = t;
frames = 0;
}
t0 = t;
frames = 0;
}
@@
-582,10
+583,14
@@
ParseOptions(int argc, char *argv[])
int i;
for (i = 1; i < argc; i++) {
if (strcmp(argv[i], "-fs") == 0) {
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) {
}
else if (strcmp(argv[i], "-vs") == 0) {
- VertProgFile = argv[i+1];
+ VertProgFile = argv[++i];
+ }
+ else {
+ fprintf(stderr, "unknown option %s\n", argv[i]);
+ break;
}
}
}
}
}
}