From patchwork Thu Jul 21 12:36:34 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: 2924 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 6AE8223F4D for ; Thu, 21 Jul 2011 12:41:40 +0000 (UTC) Received: from mail-qy0-f180.google.com (mail-qy0-f180.google.com [209.85.216.180]) by fiordland.canonical.com (Postfix) with ESMTP id 3A7EEA18326 for ; Thu, 21 Jul 2011 12:41:40 +0000 (UTC) Received: by mail-qy0-f180.google.com with SMTP id 30so845420qyk.11 for ; Thu, 21 Jul 2011 05:41:40 -0700 (PDT) Received: by 10.224.96.6 with SMTP id f6mr187710qan.12.1311252099962; Thu, 21 Jul 2011 05:41:39 -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.229.217.78 with SMTP id hl14cs139455qcb; Thu, 21 Jul 2011 05:41:39 -0700 (PDT) Received: by 10.227.166.206 with SMTP id n14mr159187wby.103.1311251796630; Thu, 21 Jul 2011 05:36:36 -0700 (PDT) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id fm12si2370075wbb.124.2011.07.21.05.36.36; Thu, 21 Jul 2011 05:36:36 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.139 as permitted sender) client-ip=91.189.90.139; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.139 as permitted sender) smtp.mail=bounces@canonical.com Received: from loganberry.canonical.com ([91.189.90.37]) by adelie.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1QjsUV-0000D0-4a for ; Thu, 21 Jul 2011 12:36:35 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id AD1482EA03B for ; Thu, 21 Jul 2011 12:36:34 +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: 67 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~glmark2-dev/glmark2/trunk] Rev 67: Draw the current scene only if it is still running. Message-Id: <20110721123634.17019.71512.launchpad@loganberry.canonical.com> Date: Thu, 21 Jul 2011 12:36:34 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="13475"; Instance="initZopeless config overlay" X-Launchpad-Hash: a1059256b088f8c0d7ac120738488d5a91ce1ef1 ------------------------------------------------------------ revno: 67 committer: Alexandros Frantzis timestamp: Sun 2010-12-12 16:11:00 +0200 message: Draw the current scene only if it is still running. modified: src/main.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/main.cpp' --- src/main.cpp 2010-07-15 09:05:21 +0000 +++ src/main.cpp 2010-12-12 14:11:00 +0000 @@ -90,13 +90,16 @@ screen.clear(); - // Draw the next state of the current scene + // Update the state of the current scene scene[current_scene]->update(); - scene[current_scene]->draw(); - // If the scene has finished, move to the next one - if (!scene[current_scene]->is_running()) { - // Unload this scene + // If the current scene is still running then draw it, + // otherwise move to the next scene + if (scene[current_scene]->is_running()) { + scene[current_scene]->draw(); + } + else { + // Unload the current scene scene[current_scene]->unload(); current_scene++;