From patchwork Thu Sep 22 10:52:16 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: alexandros.frantzis@linaro.org X-Patchwork-Id: 4251 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id CC67F23F98 for ; Thu, 22 Sep 2011 10:52:17 +0000 (UTC) Received: from mail-fx0-f52.google.com (mail-fx0-f52.google.com [209.85.161.52]) by fiordland.canonical.com (Postfix) with ESMTP id C18DEA18642 for ; Thu, 22 Sep 2011 10:52:17 +0000 (UTC) Received: by mail-fx0-f52.google.com with SMTP id 23so3657845fxe.11 for ; Thu, 22 Sep 2011 03:52:17 -0700 (PDT) Received: by 10.223.33.19 with SMTP id f19mr2770225fad.122.1316688737667; Thu, 22 Sep 2011 03:52:17 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.18.198 with SMTP id y6cs163863lad; Thu, 22 Sep 2011 03:52:17 -0700 (PDT) Received: by 10.216.137.232 with SMTP id y82mr3425572wei.104.1316688736659; Thu, 22 Sep 2011 03:52:16 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id l49si6709201weq.35.2011.09.22.03.52.16 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 22 Sep 2011 03:52:16 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) smtp.mail=bounces@canonical.com Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1R6gt6-00013K-4W for ; Thu, 22 Sep 2011 10:52:16 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 1A4B8E1837 for ; Thu, 22 Sep 2011 10:52:16 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: glmark2 X-Launchpad-Branch: ~glmark2-dev/glmark2/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 143 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~glmark2-dev/glmark2/trunk] Rev 143: Options: Update option help text and man page. Message-Id: <20110922105216.18991.97599.launchpad@ackee.canonical.com> Date: Thu, 22 Sep 2011 10:52:16 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="13996"; Instance="initZopeless config overlay" X-Launchpad-Hash: 2acdc095ea0fe394164693e1d184dfec13e0f258 ------------------------------------------------------------ revno: 143 committer: Alexandros Frantzis 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 === 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"