From patchwork Fri May 17 14:58:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jesse Barker X-Patchwork-Id: 17032 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f69.google.com (mail-wg0-f69.google.com [74.125.82.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 77A9E238F0 for ; Fri, 17 May 2013 14:59:03 +0000 (UTC) Received: by mail-wg0-f69.google.com with SMTP id l18sf3739849wgh.0 for ; Fri, 17 May 2013 07:58:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-beenthere:x-received:received-spf:x-received :x-forwarded-to:x-forwarded-for:delivered-to:x-received:received-spf :mime-version:x-launchpad-project:x-launchpad-branch :x-launchpad-message-rationale:x-launchpad-branch-revision-number :x-launchpad-notification-type:to:from:subject:message-id:date :reply-to:sender:errors-to:precedence:x-generated-by :x-launchpad-hash:x-gm-message-state:x-original-sender :x-original-authentication-results:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe :content-type; bh=uJLVesfLa4oWofdNNxkg67mIsGxtDwNyhCUTGxEZ64o=; b=SLiYQLKb4Q+pWvGt1jtPoBCRBZ8C+x+8RN5JUiCexU8B59AUKBzqqJZ8hoNfAqGZSf Orx/tEiSl7I/pUdU+iEy/hIFfmaI/bOixVMbcxBWfLCwOlcreF5+DmKFGE/CIcNyK4+f VQ0e3SkfSglsdNoT8iBGwgzT2ExysmBjB23k3VIopJgJyM3tko/bzG0TgwCncoinX2nE 5DU+qrYvg7t8Pwnkh9P5ckl6W2lYcCQV2wme4wYjviTqwm3jtDrYfGRRPRBtHnav2Igl CmMDqZ1wk41WqrxDZthHCn5GuJrHOdmtUCuSXte6qTN4/dcj7FqcmOryTWM3uHwbHXJy kG8Q== X-Received: by 10.180.21.226 with SMTP id y2mr5880861wie.5.1368802700876; Fri, 17 May 2013 07:58:20 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.180.100.201 with SMTP id fa9ls171653wib.12.canary; Fri, 17 May 2013 07:58:20 -0700 (PDT) X-Received: by 10.180.105.195 with SMTP id go3mr34933927wib.2.1368802700664; Fri, 17 May 2013 07:58:20 -0700 (PDT) Received: from mail-ve0-x22d.google.com (mail-ve0-x22d.google.com [2607:f8b0:400c:c01::22d]) by mx.google.com with ESMTPS id g6si185736wjw.204.2013.05.17.07.58.20 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 17 May 2013 07:58:20 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c01::22d is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c01::22d; Received: by mail-ve0-f173.google.com with SMTP id cy12so4119491veb.32 for ; Fri, 17 May 2013 07:58:19 -0700 (PDT) X-Received: by 10.52.176.65 with SMTP id cg1mr5232456vdc.1.1368802699223; Fri, 17 May 2013 07:58:19 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.126.138 with SMTP id c10csp113439vcs; Fri, 17 May 2013 07:58:15 -0700 (PDT) X-Received: by 10.181.13.74 with SMTP id ew10mr15835524wid.9.1368802695212; Fri, 17 May 2013 07:58:15 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id x48si17214656eey.126.2013.05.17.07.58.14 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 17 May 2013 07:58:15 -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; Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1UdM6o-0007Ot-9E for ; Fri, 17 May 2013 14:58:14 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 313CCE08BE for ; Fri, 17 May 2013 14:58: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: 271 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~glmark2-dev/glmark2/trunk] Rev 271: Merge of lp:~glmark2-dev/glmark2/scene-clear Message-Id: <20130517145814.19587.88999.launchpad@ackee.canonical.com> Date: Fri, 17 May 2013 14:58:14 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: list X-Generated-By: Launchpad (canonical.com); Revision="16626"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 9849a0cf8463cba6b5054089fdba85d94ccb19a7 X-Gm-Message-State: ALoCoQnLAmdNUpHa7TyMNiv7HM4qyS3tCbvyljOeAMgixke56EFP2twjDH5ufkg8GVMfw1Ix2owS X-Original-Sender: noreply@launchpad.net X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c01::22d is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Merge authors: Jesse Barker (jesse-barker) Related merge proposals: https://code.launchpad.net/~glmark2-dev/glmark2/scene-clear/+merge/164246 proposed by: Jesse Barker (jesse-barker) ------------------------------------------------------------ revno: 271 [merge] committer: Jesse Barker branch nick: trunk timestamp: Fri 2013-05-17 07:57:22 -0700 message: Merge of lp:~glmark2-dev/glmark2/scene-clear added: src/scene-clear.cpp modified: src/android.cpp src/main.cpp src/scene.h --- 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-12-07 19:57:44 +0000 +++ src/android.cpp 2013-05-17 14:54:18 +0000 @@ -277,6 +277,7 @@ scenes.push_back(new SceneJellyfish(canvas)); scenes.push_back(new SceneShadow(canvas)); scenes.push_back(new SceneRefract(canvas)); + scenes.push_back(new SceneClear(canvas)); } === modified file 'src/main.cpp' --- src/main.cpp 2013-04-03 16:53:35 +0000 +++ src/main.cpp 2013-05-16 18:38:54 +0000 @@ -77,6 +77,7 @@ scenes.push_back(new SceneJellyfish(canvas)); scenes.push_back(new SceneShadow(canvas)); scenes.push_back(new SceneRefract(canvas)); + scenes.push_back(new SceneClear(canvas)); for (vector::const_iterator iter = scenes.begin(); iter != scenes.end(); === added file 'src/scene-clear.cpp' --- src/scene-clear.cpp 1970-01-01 00:00:00 +0000 +++ src/scene-clear.cpp 2013-05-16 18:38:54 +0000 @@ -0,0 +1,81 @@ +// +// Copyright Š 2013 Linaro Limited +// +// This file is part of the glmark2 OpenGL (ES) 2.0 benchmark. +// +// glmark2 is free software: you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the Free Software +// Foundation, either version 3 of the License, or (at your option) any later +// version. +// +// glmark2 is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +// FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +// details. +// +// You should have received a copy of the GNU General Public License along with +// glmark2. If not, see . +// +// Authors: +// Jesse Barker +// +#include "scene.h" +#include "util.h" + +SceneClear::SceneClear(Canvas& canvas) : + Scene(canvas, "clear") +{ +} + +bool +SceneClear::load() +{ + running_ = false; + return true; +} + +void +SceneClear::unload() +{ +} + +bool +SceneClear::setup() +{ + if (!Scene::setup()) + return false; + + // Add scene-specific setup code here + + // Set up the frame timing values and + // indicate that the scene is ready to run. + running_ = true; + startTime_ = Util::get_timestamp_us() / 1000000.0; + lastUpdateTime_ = startTime_; + return true; +} + +void +SceneClear::teardown() +{ + // Add scene-specific teardown code here + Scene::teardown(); +} + +void +SceneClear::update() +{ + Scene::update(); + // Add scene-specific update code here +} + +void +SceneClear::draw() +{ +} + +Scene::ValidationResult +SceneClear::validate() +{ + return Scene::ValidationUnknown; +} === modified file 'src/scene.h' --- src/scene.h 2012-12-17 16:08:05 +0000 +++ src/scene.h 2013-05-16 18:38:54 +0000 @@ -589,4 +589,17 @@ ValidationResult validate(); }; +class SceneClear : public Scene +{ +public: + SceneClear(Canvas &pCanvas); + bool load(); + void unload(); + bool setup(); + void teardown(); + void update(); + void draw(); + ValidationResult validate(); +}; + #endif