From patchwork Thu Jul 21 12:36:33 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandros Frantzis X-Patchwork-Id: 2923 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 C33E823F4D for ; Thu, 21 Jul 2011 12:41:39 +0000 (UTC) Received: from mail-qy0-f180.google.com (mail-qy0-f180.google.com [209.85.216.180]) by fiordland.canonical.com (Postfix) with ESMTP id 92DC4A18326 for ; Thu, 21 Jul 2011 12:41:39 +0000 (UTC) Received: by qyk30 with SMTP id 30so845420qyk.11 for ; Thu, 21 Jul 2011 05:41:39 -0700 (PDT) Received: by 10.229.25.212 with SMTP id a20mr173264qcc.148.1311252098431; Thu, 21 Jul 2011 05:41:38 -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 hl14cs139453qcb; Thu, 21 Jul 2011 05:41:38 -0700 (PDT) Received: by 10.227.32.138 with SMTP id c10mr169465wbd.79.1311251796218; Thu, 21 Jul 2011 05:36:36 -0700 (PDT) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id 8si2395122wbx.33.2011.07.21.05.36.35; Thu, 21 Jul 2011 05:36:36 -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 1QjsUU-0000D0-7Z for ; Thu, 21 Jul 2011 12:36:34 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id 5DA582E8953 for ; Thu, 21 Jul 2011 12:36:33 +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: 46 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~glmark2-dev/glmark2/trunk] Rev 46: Use only values allowed by OpenGL ES 2.0 for the internalFormat in glTexImage2D(). Message-Id: <20110721123633.17019.19210.launchpad@loganberry.canonical.com> Date: Thu, 21 Jul 2011 12:36:33 -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: da5a6dc3785060eff6d25632860cd4856c7df7e2 ------------------------------------------------------------ revno: 46 committer: Alexandros Frantzis timestamp: Mon 2010-07-12 18:48:05 +0300 message: Use only values allowed by OpenGL ES 2.0 for the internalFormat in glTexImage2D(). Don't try to use GL_LINEAR_MIPMAP_LINEAR for the MAG filter (it use only for the MIN filter). 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 2010-07-12 15:34:44 +0000 +++ src/texture.cpp 2010-07-12 15:48:05 +0000 @@ -62,21 +62,21 @@ glBindTexture(GL_TEXTURE_2D, pTexture[0]); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - glTexImage2D(GL_TEXTURE_2D, 0, nOfColors, surface->w, surface->h, 0, + glTexImage2D(GL_TEXTURE_2D, 0, texture_format, surface->w, surface->h, 0, texture_format, GL_UNSIGNED_BYTE, surface->pixels); // Create Linear Filtered Texture glBindTexture(GL_TEXTURE_2D, pTexture[1]); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexImage2D(GL_TEXTURE_2D, 0, nOfColors, surface->w, surface->h, 0, + glTexImage2D(GL_TEXTURE_2D, 0, texture_format, surface->w, surface->h, 0, texture_format, GL_UNSIGNED_BYTE, surface->pixels); // Create trilinear filtered mipmapped texture glBindTexture(GL_TEXTURE_2D, pTexture[2]); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR_MIPMAP_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexImage2D(GL_TEXTURE_2D, 0, nOfColors, surface->w, surface->h, 0, + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR); + glTexImage2D(GL_TEXTURE_2D, 0, texture_format, surface->w, surface->h, 0, texture_format, GL_UNSIGNED_BYTE, surface->pixels); glGenerateMipmap(GL_TEXTURE_2D); }