From patchwork Thu Jul 21 12:36:35 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: 2979 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 AE46E23F4D for ; Thu, 21 Jul 2011 12:43:39 +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 7D822A18398 for ; Thu, 21 Jul 2011 12:43:39 +0000 (UTC) Received: by qwb8 with SMTP id 8so854415qwb.11 for ; Thu, 21 Jul 2011 05:43:39 -0700 (PDT) Received: by 10.229.25.212 with SMTP id a20mr174981qcc.148.1311252218949; Thu, 21 Jul 2011 05:43: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 hl14cs139549qcb; Thu, 21 Jul 2011 05:43:38 -0700 (PDT) Received: by 10.227.175.1 with SMTP id v1mr149909wbz.114.1311251796916; 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 p2si2376103wbh.108.2011.07.21.05.36.36; 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 1QjsUV-0000Cf-Kk for ; Thu, 21 Jul 2011 12:36:35 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id 9174C2E889C for ; Thu, 21 Jul 2011 12:36:35 +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: 77 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~glmark2-dev/glmark2/trunk] Rev 77: Use the correct GL headers depending on the flavor (desktop vs ES2). Message-Id: <20110721123635.17019.59665.launchpad@loganberry.canonical.com> Date: Thu, 21 Jul 2011 12:36:35 -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: b61758e05b3815565d0b08850addd77f27c520c0 ------------------------------------------------------------ revno: 77 committer: Alexandros Frantzis timestamp: Wed 2011-03-09 01:12:05 +0200 message: Use the correct GL headers depending on the flavor (desktop vs ES2). modified: src/oglsdl.h --- 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/oglsdl.h' --- src/oglsdl.h 2011-01-25 15:06:04 +0000 +++ src/oglsdl.h 2011-03-08 23:12:05 +0000 @@ -26,9 +26,13 @@ #include +#if USE_GL #define GL_GLEXT_PROTOTYPES #include #include - +#elif USE_GLESv2 +#include +#include +#endif #endif