From patchwork Fri Jun 24 09:57:14 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: 2290 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 70F6423F08 for ; Fri, 24 Jun 2011 09:57:18 +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 40BC2A180E0 for ; Fri, 24 Jun 2011 09:57:18 +0000 (UTC) Received: by qyk10 with SMTP id 10so265966qyk.11 for ; Fri, 24 Jun 2011 02:57:17 -0700 (PDT) Received: by 10.229.117.95 with SMTP id p31mr2355027qcq.97.1308909437525; Fri, 24 Jun 2011 02:57:17 -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.230.139 with SMTP id jm11cs44519qcb; Fri, 24 Jun 2011 02:57:17 -0700 (PDT) Received: by 10.227.9.131 with SMTP id l3mr3013304wbl.54.1308909435227; Fri, 24 Jun 2011 02:57:15 -0700 (PDT) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id fs18si5731280wbb.49.2011.06.24.02.57.14; Fri, 24 Jun 2011 02:57:15 -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 1Qa38U-0008Ib-CZ for ; Fri, 24 Jun 2011 09:57:14 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id 5B2E02E8019 for ; Fri, 24 Jun 2011 09:57:14 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: glmark2 X-Launchpad-Branch: ~afrantzis/glmark2/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 91 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~afrantzis/glmark2/trunk] Rev 91: Use a "safer" pixel for the validation of SceneTexture. Message-Id: <20110624095714.11861.14393.launchpad@loganberry.canonical.com> Date: Fri, 24 Jun 2011 09:57:14 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="13265"; Instance="initZopeless config overlay" X-Launchpad-Hash: deca9800f65a94a1b34fcada031c5230f9b2aa41 ------------------------------------------------------------ revno: 91 committer: Alexandros Frantzis branch nick: trunk timestamp: Fri 2011-06-24 11:04:32 +0300 message: Use a "safer" pixel for the validation of SceneTexture. Some implementations (eg SGX) introduce some small artifacts when texturing, especially when using nearest filtering, that confuse our validation. The artifacts are present along the edges of a grid-like form on the texture, so we can (and do) select a pixel that is not affected by this. modified: src/scene-texture.cpp --- lp:glmark2 https://code.launchpad.net/~afrantzis/glmark2/trunk You are subscribed to branch lp:glmark2. To unsubscribe from this branch go to https://code.launchpad.net/~afrantzis/glmark2/trunk/+edit-subscription === modified file 'src/scene-texture.cpp' --- src/scene-texture.cpp 2011-06-23 12:48:15 +0000 +++ src/scene-texture.cpp 2011-06-24 08:04:32 +0000 @@ -185,17 +185,17 @@ Screen::Pixel ref; - Screen::Pixel pixel = mScreen.read_pixel(mScreen.mWidth / 2, - mScreen.mHeight / 2); + Screen::Pixel pixel = mScreen.read_pixel(mScreen.mWidth / 2 - 3, + mScreen.mHeight / 2 - 3); const std::string &filter = mOptions["texture-filter"].value; if (filter == "nearest") - ref = Screen::Pixel(0x3a, 0x3a, 0x3b, 0xff); + ref = Screen::Pixel(0x2b, 0x2a, 0x28, 0xff); else if (filter == "linear") - ref = Screen::Pixel(0x34, 0x34, 0x35, 0xff); + ref = Screen::Pixel(0x2c, 0x2b, 0x29, 0xff); else if (filter == "mipmap") - ref = Screen::Pixel(0x33, 0x33, 0x35, 0xff); + ref = Screen::Pixel(0x2d, 0x2c, 0x2a, 0xff); else return Scene::ValidationUnknown;