diff mbox

[Branch,~glmark2-dev/glmark2/trunk] Rev 143: Options: Update option help text and man page.

Message ID 20110922105216.18991.97599.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

alexandros.frantzis@linaro.org Sept. 22, 2011, 10:52 a.m. UTC 
------------------------------------------------------------
revno: 143
committer: Alexandros Frantzis <alexandros.frantzis@linaro.org>
branch nick: trunk
timestamp: Wed 2011-09-21 17:10:37 +0300
message:
  Options: Update option help text and man page.
modified:
  doc/glmark2.1.in
  src/options.cpp


--
lp:glmark2
https://code.launchpad.net/~glmark2-dev/glmark2/trunk

You are subscribed to branch lp:glmark2.
To unsubscribe from this branch go to https://code.launchpad.net/~glmark2-dev/glmark2/trunk/+edit-subscription
diff mbox

Patch

=== modified file 'doc/glmark2.1.in'
--- doc/glmark2.1.in	2011-06-24 12:17:59 +0000
+++ doc/glmark2.1.in	2011-09-21 14:10:37 +0000
@@ -1,4 +1,4 @@ 
-.TH @APPNAME@ "1" "June 2011" "@appname@ @appversion@"
+.TH @APPNAME@ "1" "September 2011" "@appname@ @appversion@"
 .SH NAME
 @appname@ \- OpenGL (ES) 2.0 benchmark suite
 .SH SYNOPSIS
@@ -12,6 +12,11 @@ 
 A benchmark to run: 'scene(:opt1=val1)*'
 (the option can be used multiple times)
 .TP
+\fB\-f\fR, \fB\-\-benchmark-file\fR FILE
+Load benchmarks to run from a file containing a
+list of benchmark descriptions (one per line)
+(the option can be used multiple times)
+.TP
 \fB\-\-validate\fR
 Run a quick output validation test instead of
 running the benchmarks
@@ -20,10 +25,17 @@ 
 Don't update the screen by swapping the front and
 back buffer, use glFinish() instead
 .TP
+\fB\-s\fR, \fB\-\-size WxH\fR
+Size of the output window (default: 800x600)
+.TP
 \fB\-l\fR, \fB\-\-list\-scenes\fR
 Display information about the available scenes
 and their options
 .TP
+\fB\-\-show-all-options\fR
+Show all scene option values used for benchmarks
+(only explicitly set options are shown by default)
+.TP
 \fB\-d\fR, \fB\-\-debug\fR
 Display debug messages
 .TP

=== modified file 'src/options.cpp'
--- src/options.cpp	2011-09-20 12:52:21 +0000
+++ src/options.cpp	2011-09-21 14:10:37 +0000
@@ -91,12 +91,13 @@ 
            "  -b, --benchmark BENCH  A benchmark to run: 'scene(:opt1=val1)*'\n"
            "                         (the option can be used multiple times)\n"
            "  -f, --benchmark-file F Load benchmarks to run from a file containing a\n"
-           "                         list of benchmark descriptions (one per line)"
+           "                         list of benchmark descriptions (one per line)\n"
+           "                         (the option can be used multiple times)\n"
            "      --validate         Run a quick output validation test instead of \n"
            "                         running the benchmarks\n"
            "      --no-swap-buffers  Don't update the canvas by swapping the front and\n"
            "                         back buffer, use glFinish() instead\n"
-           "  -s, --size WxH         Size of the display (default: 800x600)\n"
+           "  -s, --size WxH         Size of the output window (default: 800x600)\n"
            "  -l, --list-scenes      Display information about the available scenes\n"
            "                         and their options\n"
            "      --show-all-options Show all scene option values used for benchmarks\n"