From patchwork Thu Jul 21 12:36:32 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandros Frantzis X-Patchwork-Id: 3003 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 CD03623F4D for ; Thu, 21 Jul 2011 12:44:26 +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 9C725A18398 for ; Thu, 21 Jul 2011 12:44:26 +0000 (UTC) Received: by mail-qy0-f180.google.com with SMTP id 30so845420qyk.11 for ; Thu, 21 Jul 2011 05:44:26 -0700 (PDT) Received: by 10.229.68.200 with SMTP id w8mr192341qci.114.1311252266398; Thu, 21 Jul 2011 05:44:26 -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 hl14cs139590qcb; Thu, 21 Jul 2011 05:44:26 -0700 (PDT) Received: by 10.213.17.210 with SMTP id t18mr300019eba.121.1311251796022; 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 f8si2368521wed.136.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 1QjsUT-0000DP-UE 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 CDE0C2E890E for ; Thu, 21 Jul 2011 12:36:32 +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: 40 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~glmark2-dev/glmark2/trunk] Rev 40: Remove references to GL_BGRA and GL_BGR pixel formats that don't exist in OpenGL ES 2.0. Message-Id: <20110721123632.17019.36349.launchpad@loganberry.canonical.com> Date: Thu, 21 Jul 2011 12:36:32 -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: 14155e2e423875718424054e934e8d89341e4d37 ------------------------------------------------------------ revno: 40 committer: Alexandros Frantzis timestamp: Mon 2010-07-12 11:34:57 +0300 message: Remove references to GL_BGRA and GL_BGR pixel formats that don't exist in OpenGL ES 2.0. modified: 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 'texture.cpp' --- texture.cpp 2010-07-09 14:21:56 +0000 +++ texture.cpp 2010-07-12 08:34:57 +0000 @@ -17,15 +17,19 @@ if (nOfColors == 4) { if (surface->format->Rmask == 0x000000ff) texture_format = GL_RGBA; - else - texture_format = GL_BGRA; + else { + fprintf(stderr, "Error: %s: Unsupported pixel format BGRA\n", pFilename); + return 1; + } } else { if (nOfColors == 3) { if (surface->format->Rmask == 0x000000ff) texture_format = GL_RGB; - else - texture_format = GL_BGR; + else { + fprintf(stderr, "Error: %s: Unsupported pixel format BGR\n", pFilename); + return 1; + } } else { printf("warning: the image is not truecolor.. this will probably break\n");