From patchwork Thu Jul 21 12:36:38 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: 2972 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 6B02623F4D for ; Thu, 21 Jul 2011 12:43:26 +0000 (UTC) Received: from mail-qw0-f52.google.com (mail-qw0-f52.google.com [209.85.216.52]) by fiordland.canonical.com (Postfix) with ESMTP id 3A40BA18287 for ; Thu, 21 Jul 2011 12:43:26 +0000 (UTC) Received: by mail-qw0-f52.google.com with SMTP id 8so853237qwb.11 for ; Thu, 21 Jul 2011 05:43:26 -0700 (PDT) Received: by 10.229.68.200 with SMTP id w8mr191409qci.114.1311252205998; Thu, 21 Jul 2011 05:43:25 -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 hl14cs139539qcb; Thu, 21 Jul 2011 05:43:25 -0700 (PDT) Received: by 10.216.61.145 with SMTP id w17mr761048wec.59.1311251798815; Thu, 21 Jul 2011 05:36:38 -0700 (PDT) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id 15si2402799wel.16.2011.07.21.05.36.38; Thu, 21 Jul 2011 05:36:38 -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 1QjsUY-0000Cf-4O for ; Thu, 21 Jul 2011 12:36:38 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id 1F7042E802E for ; Thu, 21 Jul 2011 12:36:38 +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: <20110721123638.17019.7044.launchpad@loganberry.canonical.com> Date: Thu, 21 Jul 2011 12:36:38 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="13475"; Instance="initZopeless config overlay" X-Launchpad-Hash: e492a89f3733e68f7de637c84793a84eeeec68b4 ------------------------------------------------------------ revno: 110 committer: Alexandros Frantzis 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;