From patchwork Thu Aug 11 08:59:13 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: 3392 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 2838D23F51 for ; Thu, 11 Aug 2011 08:59:17 +0000 (UTC) Received: from mail-qy0-f173.google.com (mail-qy0-f173.google.com [209.85.216.173]) by fiordland.canonical.com (Postfix) with ESMTP id DCB7FA18825 for ; Thu, 11 Aug 2011 08:59:16 +0000 (UTC) Received: by qyk31 with SMTP id 31so3859162qyk.11 for ; Thu, 11 Aug 2011 01:59:16 -0700 (PDT) Received: by 10.229.42.10 with SMTP id q10mr4367578qce.45.1313053156286; Thu, 11 Aug 2011 01:59:16 -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.190.71 with SMTP id dh7cs106741qcb; Thu, 11 Aug 2011 01:59:15 -0700 (PDT) Received: from mr.google.com ([10.216.155.207]) by 10.216.155.207 with SMTP id j57mr826122wek.10.1313053155648 (num_hops = 1); Thu, 11 Aug 2011 01:59:15 -0700 (PDT) Received: by 10.216.155.207 with SMTP id j57mr608030wek.10.1313053153827; Thu, 11 Aug 2011 01:59:13 -0700 (PDT) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id h5si4959652wee.14.2011.08.11.01.59.13; Thu, 11 Aug 2011 01:59:13 -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 1QrR6f-0008Ds-8v for ; Thu, 11 Aug 2011 08:59:13 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id 4127C2E890D for ; Thu, 11 Aug 2011 08:59:13 +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: 122 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~glmark2-dev/glmark2/trunk] Rev 122: Remove useless statement from SceneGrid::setup(). Message-Id: <20110811085913.22074.27739.launchpad@loganberry.canonical.com> Date: Thu, 11 Aug 2011 08:59:13 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="13644"; Instance="initZopeless config overlay" X-Launchpad-Hash: 957f0cbaa5ecbf9a70566b35f135df13a0c54fe0 ------------------------------------------------------------ revno: 122 committer: Alexandros Frantzis branch nick: trunk timestamp: Thu 2011-08-11 11:57:47 +0300 message: Remove useless statement from SceneGrid::setup(). The mProgram object hasn't been initialized at this point, so there is no point using it to get the index of a vertex attribute. The attrib locations for the mMesh object are set by the ::setup() method in the classes inheriting from SceneGrid. modified: src/scene-grid.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/scene-grid.cpp' --- src/scene-grid.cpp 2011-07-07 13:35:24 +0000 +++ src/scene-grid.cpp 2011-08-11 08:57:47 +0000 @@ -82,10 +82,6 @@ grid_size > 1 ? spacing : 0); mMesh.build_vbo(); - std::vector attrib_locations; - attrib_locations.push_back(mProgram.getAttribIndex("position")); - mMesh.set_attrib_locations(attrib_locations); - mCurrentFrame = 0; mRotation = 0.0f; }