From patchwork Mon Jul 18 17:17:16 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Barker X-Patchwork-Id: 2744 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 9977E23F44 for ; Mon, 18 Jul 2011 17:17:19 +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 60E65A186A6 for ; Mon, 18 Jul 2011 17:17:19 +0000 (UTC) Received: by qyk30 with SMTP id 30so2391657qyk.11 for ; Mon, 18 Jul 2011 10:17:18 -0700 (PDT) Received: by 10.224.208.73 with SMTP id gb9mr2881994qab.62.1311009438704; Mon, 18 Jul 2011 10:17:18 -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 hl14cs61525qcb; Mon, 18 Jul 2011 10:17:18 -0700 (PDT) Received: by 10.227.60.140 with SMTP id p12mr4402048wbh.30.1311009437521; Mon, 18 Jul 2011 10:17:17 -0700 (PDT) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id fe2si6551970wbb.81.2011.07.18.10.17.17; Mon, 18 Jul 2011 10:17:17 -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 1QirRU-0000a1-PP for ; Mon, 18 Jul 2011 17:17:16 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id BADA92E8060 for ; Mon, 18 Jul 2011 17:17:16 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: glcompbench X-Launchpad-Branch: ~glcompbench-dev/glcompbench/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 47 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~glcompbench-dev/glcompbench/trunk] Rev 47: Rename shader source files for consistency with glmark2 project. Name scheme Message-Id: <20110718171716.21854.11233.launchpad@loganberry.canonical.com> Date: Mon, 18 Jul 2011 17:17:16 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="13405"; Instance="initZopeless config overlay" X-Launchpad-Hash: 01a1cbcc901cc8521892ac1c884498d4dab9addc ------------------------------------------------------------ revno: 47 committer: Jesse Barker branch nick: trunk timestamp: Mon 2011-07-18 10:14:16 -0700 message: Rename shader source files for consistency with glmark2 project. Name scheme is a little arbitrary, but is based upon consensus among developers of both projects. renamed: data/brick-fragment-shader => data/brick.frag data/brick-vertex-shader => data/brick.vert data/composite-fragment-shader => data/default.frag data/composite-vertex-shader => data/default.vert modified: src/composite-test.h --- lp:glcompbench https://code.launchpad.net/~glcompbench-dev/glcompbench/trunk You are subscribed to branch lp:glcompbench. To unsubscribe from this branch go to https://code.launchpad.net/~glcompbench-dev/glcompbench/trunk/+edit-subscription === renamed file 'data/brick-fragment-shader' => 'data/brick.frag' === renamed file 'data/brick-vertex-shader' => 'data/brick.vert' === renamed file 'data/composite-fragment-shader' => 'data/default.frag' === renamed file 'data/composite-vertex-shader' => 'data/default.vert' === modified file 'src/composite-test.h' --- src/composite-test.h 2011-06-23 13:52:16 +0000 +++ src/composite-test.h 2011-07-18 17:14:16 +0000 @@ -137,8 +137,8 @@ public: CompositeTestSimpleDefault() : CompositeTestSimpleBase("default", - GLCOMPBENCH_DATA_PATH"/composite-vertex-shader", - GLCOMPBENCH_DATA_PATH"/composite-fragment-shader") + GLCOMPBENCH_DATA_PATH"/default.vert", + GLCOMPBENCH_DATA_PATH"/default.frag") {} virtual void draw(std::list &window_list); @@ -149,8 +149,8 @@ public: CompositeTestSimpleBrick() : CompositeTestSimpleBase("brick", - GLCOMPBENCH_DATA_PATH"/brick-vertex-shader", - GLCOMPBENCH_DATA_PATH"/brick-fragment-shader") + GLCOMPBENCH_DATA_PATH"/brick.vert", + GLCOMPBENCH_DATA_PATH"/brick.frag") {} virtual void draw(std::list &window_list);