From patchwork Thu Jul 21 12:36:37 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: 3015 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 48F5423F4D for ; Thu, 21 Jul 2011 12:44:58 +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 1693CA18398 for ; Thu, 21 Jul 2011 12:44:58 +0000 (UTC) Received: by mail-qy0-f173.google.com with SMTP id 10so3962301qyk.11 for ; Thu, 21 Jul 2011 05:44:57 -0700 (PDT) Received: by 10.229.217.3 with SMTP id hk3mr210880qcb.38.1311252297880; Thu, 21 Jul 2011 05:44:57 -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 hl14cs139617qcb; Thu, 21 Jul 2011 05:44:57 -0700 (PDT) Received: by 10.227.135.9 with SMTP id l9mr187385wbt.34.1311251798069; 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 fs8si2368024wbb.140.2011.07.21.05.36.37; 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 1QjsUX-0000s2-Bn for ; Thu, 21 Jul 2011 12:36:37 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id 522AB2E802E for ; Thu, 21 Jul 2011 12:36:37 +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: 99 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~glmark2-dev/glmark2/trunk] Rev 99: Fix typo in Canvas::height() and adjust validation reference values. Message-Id: <20110721123637.17019.4143.launchpad@loganberry.canonical.com> Date: Thu, 21 Jul 2011 12:36:37 -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: b574e2c1f5b59a8aa367a629c61e360bb7655559 ------------------------------------------------------------ revno: 99 committer: Alexandros Frantzis timestamp: Tue 2011-07-05 16:45:41 +0300 message: Fix typo in Canvas::height() and adjust validation reference values. modified: src/canvas.h src/scene-build.cpp src/scene-shading.cpp src/scene-texture.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/canvas.h' --- src/canvas.h 2011-06-30 13:39:21 +0000 +++ src/canvas.h 2011-07-05 13:45:41 +0000 @@ -76,7 +76,7 @@ } int width() { return mWidth; } - int height() { return mWidth; } + int height() { return mHeight; } const LibMatrix::mat4 &projection() { return mProjection; } protected: === modified file 'src/scene-build.cpp' --- src/scene-build.cpp 2011-07-04 10:46:22 +0000 +++ src/scene-build.cpp 2011-07-05 13:45:41 +0000 @@ -182,7 +182,7 @@ if (mRotation != 0) return Scene::ValidationUnknown; - Canvas::Pixel ref(0xcf, 0xcf, 0xcf, 0xff); + Canvas::Pixel ref(0xa7, 0xa7, 0xa7, 0xff); Canvas::Pixel pixel = mCanvas.read_pixel(mCanvas.width() / 2, mCanvas.height() / 2); === modified file 'src/scene-shading.cpp' --- src/scene-shading.cpp 2011-07-04 10:46:22 +0000 +++ src/scene-shading.cpp 2011-07-05 13:45:41 +0000 @@ -198,9 +198,9 @@ const std::string &filter = mOptions["shading"].value; if (filter == "gouraud") - ref = Canvas::Pixel(0x00, 0x00, 0x76, 0xff); + ref = Canvas::Pixel(0x00, 0x00, 0x2d, 0xff); else if (filter == "phong") - ref = Canvas::Pixel(0x1a, 0x1a, 0x79, 0xff); + ref = Canvas::Pixel(0x1a, 0x1a, 0x3e, 0xff); else return Scene::ValidationUnknown; === modified file 'src/scene-texture.cpp' --- src/scene-texture.cpp 2011-07-04 10:46:22 +0000 +++ src/scene-texture.cpp 2011-07-05 13:45:41 +0000 @@ -188,17 +188,17 @@ Canvas::Pixel ref; - Canvas::Pixel pixel = mCanvas.read_pixel(mCanvas.width() / 2 - 3, - mCanvas.height() / 2 - 3); + Canvas::Pixel pixel = mCanvas.read_pixel(mCanvas.width() / 2 + 3, + mCanvas.height() / 2 + 3); const std::string &filter = mOptions["texture-filter"].value; if (filter == "nearest") - ref = Canvas::Pixel(0x24, 0x22, 0x23, 0xff); + ref = Canvas::Pixel(0x3b, 0x3a, 0x39, 0xff); else if (filter == "linear") - ref = Canvas::Pixel(0x29, 0x27, 0x28, 0xff); + ref = Canvas::Pixel(0x36, 0x36, 0x34, 0xff); else if (filter == "mipmap") - ref = Canvas::Pixel(0x2c, 0x2a, 0x2b, 0xff); + ref = Canvas::Pixel(0x35, 0x35, 0x34, 0xff); else return Scene::ValidationUnknown;