From patchwork Thu Sep 22 10:52:16 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: 4252 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 6822A23EF5 for ; Thu, 22 Sep 2011 10:52:20 +0000 (UTC) Received: from mail-fx0-f52.google.com (mail-fx0-f52.google.com [209.85.161.52]) by fiordland.canonical.com (Postfix) with ESMTP id 5D478A18642 for ; Thu, 22 Sep 2011 10:52:20 +0000 (UTC) Received: by mail-fx0-f52.google.com with SMTP id 23so3657845fxe.11 for ; Thu, 22 Sep 2011 03:52:20 -0700 (PDT) Received: by 10.223.94.134 with SMTP id z6mr2867527fam.8.1316688740143; Thu, 22 Sep 2011 03:52:20 -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.18.198 with SMTP id y6cs163864lad; Thu, 22 Sep 2011 03:52:19 -0700 (PDT) Received: by 10.227.165.202 with SMTP id j10mr2074805wby.18.1316688736680; Thu, 22 Sep 2011 03:52:16 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id el1si6686919wbb.101.2011.09.22.03.52.16 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 22 Sep 2011 03:52:16 -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 1R6gt6-00013L-6X for ; Thu, 22 Sep 2011 10:52:16 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 28932E1838 for ; Thu, 22 Sep 2011 10:52:16 +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: 144 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~glmark2-dev/glmark2/trunk] Rev 144: SceneShading: Fix validation check for phong shading. Message-Id: <20110922105216.18991.49394.launchpad@ackee.canonical.com> Date: Thu, 22 Sep 2011 10:52: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="13996"; Instance="initZopeless config overlay" X-Launchpad-Hash: c4279e34edd64aa1271ea402608bcbb4f8baacb7 ------------------------------------------------------------ revno: 144 committer: Alexandros Frantzis branch nick: trunk timestamp: Wed 2011-09-21 17:29:29 +0300 message: SceneShading: Fix validation check for phong shading. 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-09-14 08:39:16 +0000 +++ src/scene-shading.cpp 2011-09-21 14:29:29 +0000 @@ -275,8 +275,8 @@ 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, 0x53, 0xff); + else if (filter == "phong" && mOptions["num-lights"].value == "1") + ref = Canvas::Pixel(0x05, 0x05, 0xad, 0xff); else return Scene::ValidationUnknown;