From patchwork Fri Jan 13 15:07:14 2012 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: 6183 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 4C09A23E01 for ; Fri, 13 Jan 2012 15:07:18 +0000 (UTC) Received: from mail-bk0-f52.google.com (mail-bk0-f52.google.com [209.85.214.52]) by fiordland.canonical.com (Postfix) with ESMTP id 3B8A1A18814 for ; Fri, 13 Jan 2012 15:07:18 +0000 (UTC) Received: by mail-bk0-f52.google.com with SMTP id zu5so2927826bkb.11 for ; Fri, 13 Jan 2012 07:07:18 -0800 (PST) Received: by 10.205.26.67 with SMTP id rl3mr617536bkb.45.1326467238029; Fri, 13 Jan 2012 07:07:18 -0800 (PST) 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.205.82.144 with SMTP id ac16cs31857bkc; Fri, 13 Jan 2012 07:07:17 -0800 (PST) Received: by 10.216.138.226 with SMTP id a76mr595508wej.51.1326467235047; Fri, 13 Jan 2012 07:07:15 -0800 (PST) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id u2si5204820weq.44.2012.01.13.07.07.14 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 13 Jan 2012 07:07:15 -0800 (PST) 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 1Rliio-0007eQ-Re for ; Fri, 13 Jan 2012 15:07:14 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id C07FEE03C8 for ; Fri, 13 Jan 2012 15:07:14 +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: 181 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~glmark2-dev/glmark2/trunk] Rev 181: Android: Handle the SceneDefaultOptions special scene properly. Message-Id: <20120113150714.16017.94718.launchpad@ackee.canonical.com> Date: Fri, 13 Jan 2012 15:07:14 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="14664"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: b2ca6f92ea89c1d5092ce6ee37126204e1e74c56 ------------------------------------------------------------ revno: 181 committer: Alexandros Frantzis branch nick: trunk timestamp: Fri 2012-01-13 16:05:54 +0200 message: Android: Handle the SceneDefaultOptions special scene properly. The SceneDefaultOptions is distinguishable by its empty name. modified: src/android.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 'src/android.cpp' --- src/android.cpp 2012-01-13 14:03:23 +0000 +++ src/android.cpp 2012-01-13 14:05:54 +0000 @@ -100,10 +100,15 @@ static unsigned int benchmarks_run = 0; if (!scene) { - if (bench_iter != g_benchmarks.end()) { + /* Find the next normal scene */ + while (bench_iter != g_benchmarks.end()) { scene = &(*bench_iter)->setup_scene(); + if (!scene->name().empty()) + break; + bench_iter++; } - else { + + if (bench_iter == g_benchmarks.end()) { if (benchmarks_run) score /= benchmarks_run; Log::info("glmark2 Score: %u\n", score);