From patchwork Tue Oct 18 14:19:09 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: 4730 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 EC22A23FBE for ; Tue, 18 Oct 2011 14:19:11 +0000 (UTC) Received: from mail-yx0-f180.google.com (mail-yx0-f180.google.com [209.85.213.180]) by fiordland.canonical.com (Postfix) with ESMTP id BA34DA1867D for ; Tue, 18 Oct 2011 14:19:11 +0000 (UTC) Received: by yxm34 with SMTP id 34so869905yxm.11 for ; Tue, 18 Oct 2011 07:19:11 -0700 (PDT) Received: by 10.223.60.73 with SMTP id o9mr4353016fah.18.1318947550982; Tue, 18 Oct 2011 07:19:10 -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.1.71 with SMTP id 7cs47061lak; Tue, 18 Oct 2011 07:19:10 -0700 (PDT) Received: by 10.216.24.21 with SMTP id w21mr330784wew.57.1318947550005; Tue, 18 Oct 2011 07:19:10 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id b4si1627811wed.4.2011.10.18.07.19.09 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 18 Oct 2011 07:19:09 -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 1RGAVZ-00045V-Hu for ; Tue, 18 Oct 2011 14:19:09 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 79234E0042 for ; Tue, 18 Oct 2011 14:19:09 +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: 158 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~glmark2-dev/glmark2/trunk] Rev 158: SceneBuild: Remove forgotten test code. Message-Id: <20111018141909.28464.27580.launchpad@ackee.canonical.com> Date: Tue, 18 Oct 2011 14:19:09 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="14157"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: c22fb03b5d64d562abb12c81592e3f3d81548763 ------------------------------------------------------------ revno: 158 committer: Alexandros Frantzis branch nick: trunk timestamp: Tue 2011-10-18 16:40:12 +0300 message: SceneBuild: Remove forgotten test code. This code was erroneously commited while testing the buffer update functionality. modified: src/scene-build.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-build.cpp' --- src/scene-build.cpp 2011-10-11 09:46:59 +0000 +++ src/scene-build.cpp 2011-10-18 13:40:12 +0000 @@ -228,16 +228,10 @@ normal_matrix.inverse().transpose(); mProgram["NormalMatrix"] = normal_matrix; - std::vector > ranges; - ranges.push_back(std::pair(2, - 0 * mMesh.vertices().size()/3 + 3)); - if (mUseVbo) { - mMesh.update_vbo(ranges); mMesh.render_vbo(); } else { - mMesh.update_array(ranges); mMesh.render_array(); } }