From patchwork Thu Aug 11 08:59:13 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: 3393 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 93A0E23F51 for ; Thu, 11 Aug 2011 08:59:17 +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 6430AA18825 for ; Thu, 11 Aug 2011 08:59:17 +0000 (UTC) Received: by qwb8 with SMTP id 8so1435932qwb.11 for ; Thu, 11 Aug 2011 01:59:16 -0700 (PDT) Received: by 10.229.183.84 with SMTP id cf20mr7140331qcb.121.1313053156875; Thu, 11 Aug 2011 01:59:16 -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.190.71 with SMTP id dh7cs106742qcb; Thu, 11 Aug 2011 01:59:16 -0700 (PDT) Received: from mr.google.com ([10.227.19.213]) by 10.227.19.213 with SMTP id c21mr3314983wbb.5.1313053155672 (num_hops = 1); Thu, 11 Aug 2011 01:59:15 -0700 (PDT) Received: by 10.227.19.213 with SMTP id c21mr2392276wbb.5.1313053153837; Thu, 11 Aug 2011 01:59:13 -0700 (PDT) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id m11si4966007wbh.14.2011.08.11.01.59.13; Thu, 11 Aug 2011 01:59:13 -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 1QrR6f-0008Dn-4j for ; Thu, 11 Aug 2011 08:59:13 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id 21C2D2E890D for ; Thu, 11 Aug 2011 08:59:13 +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: 121 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~glmark2-dev/glmark2/trunk] Rev 121: Make GL_CLAMP_TO_EDGE the default texture wrap mode. Message-Id: <20110811085913.22074.91102.launchpad@loganberry.canonical.com> Date: Thu, 11 Aug 2011 08:59:13 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="13644"; Instance="initZopeless config overlay" X-Launchpad-Hash: 7067b5436f41d5110430a6af6a191f551c8489ae ------------------------------------------------------------ revno: 121 committer: Alexandros Frantzis branch nick: trunk timestamp: Thu 2011-08-11 11:42:00 +0300 message: Make GL_CLAMP_TO_EDGE the default texture wrap mode. GLES2 drivers that don't support GL_OES_texture_npot only allow GL_CLAMP_TO_EDGE as a texture wrap mode. modified: src/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/texture.cpp' --- src/texture.cpp 2011-08-10 13:52:40 +0000 +++ src/texture.cpp 2011-08-11 08:42:00 +0000 @@ -165,6 +165,8 @@ glBindTexture(GL_TEXTURE_2D, *tex); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, min_filter); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, mag_filter); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); glTexImage2D(GL_TEXTURE_2D, 0, format, image.width, image.height, 0, format, GL_UNSIGNED_BYTE, image.pixels);