From patchwork Tue Jul 19 13:32:31 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: 2757 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 4FB932405F for ; Tue, 19 Jul 2011 13:32:41 +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 1CE68A183F7 for ; Tue, 19 Jul 2011 13:32:41 +0000 (UTC) Received: by qyk10 with SMTP id 10so2540864qyk.11 for ; Tue, 19 Jul 2011 06:32:40 -0700 (PDT) Received: by 10.229.25.212 with SMTP id a20mr5992284qcc.148.1311082360575; Tue, 19 Jul 2011 06:32:40 -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 hl14cs84661qcb; Tue, 19 Jul 2011 06:32:40 -0700 (PDT) Received: by 10.216.139.37 with SMTP id b37mr718992wej.41.1311082359065; Tue, 19 Jul 2011 06:32:39 -0700 (PDT) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id m17si4646388weq.1.2011.07.19.06.32.38; Tue, 19 Jul 2011 06:32:39 -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 1QjAPc-0007uc-LF for ; Tue, 19 Jul 2011 13:32:36 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id 620082EAB61 for ; Tue, 19 Jul 2011 13:32:31 +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: 110 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~glmark2-dev/glmark2/trunk] Rev 110: Fix validation of SceneShading. Message-Id: <20110719133231.3251.66690.launchpad@loganberry.canonical.com> Date: Tue, 19 Jul 2011 13:32:31 -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: 0cff9939c234b4ec7f20edfbc06e34e8814bc446 ------------------------------------------------------------ revno: 110 committer: Alexandros Frantzis branch nick: trunk timestamp: Tue 2011-07-19 15:00:29 +0300 message: Fix validation of SceneShading. modified: src/scene-shading.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-shading.cpp' --- src/scene-shading.cpp 2011-07-12 17:53:10 +0000 +++ src/scene-shading.cpp 2011-07-19 12:00:29 +0000 @@ -190,8 +190,10 @@ if (filter == "gouraud") ref = Canvas::Pixel(0x00, 0x00, 0x2d, 0xff); + else if (filter == "blinn-phong-inf") + ref = Canvas::Pixel(0x1a, 0x1a, 0x3e, 0xff); else if (filter == "phong") - ref = Canvas::Pixel(0x1a, 0x1a, 0x3e, 0xff); + ref = Canvas::Pixel(0x1a, 0x1a, 0x53, 0xff); else return Scene::ValidationUnknown;