From patchwork Thu Jul 21 12:36:30 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandros Frantzis X-Patchwork-Id: 2996 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 3620223F52 for ; Thu, 21 Jul 2011 12:44:13 +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 05D2BA184BF for ; Thu, 21 Jul 2011 12:44:12 +0000 (UTC) Received: by mail-qw0-f52.google.com with SMTP id 8so854415qwb.11 for ; Thu, 21 Jul 2011 05:44:12 -0700 (PDT) Received: by 10.229.217.3 with SMTP id hk3mr210187qcb.38.1311252252795; Thu, 21 Jul 2011 05:44:12 -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 hl14cs139578qcb; Thu, 21 Jul 2011 05:44:12 -0700 (PDT) Received: by 10.227.61.10 with SMTP id r10mr169697wbh.74.1311251794881; Thu, 21 Jul 2011 05:36:34 -0700 (PDT) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id fw18si2387718wbb.68.2011.07.21.05.36.34; Thu, 21 Jul 2011 05:36:34 -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 1QjsUS-0000D2-DT for ; Thu, 21 Jul 2011 12:36:32 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id 46AC22E84FB for ; Thu, 21 Jul 2011 12:36:30 +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: 6 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~glmark2-dev/glmark2/trunk] Rev 6: Remove built-in smooth shading functionality which is not available in OpenGL ES 2.0. Message-Id: <20110721123630.17019.49258.launchpad@loganberry.canonical.com> Date: Thu, 21 Jul 2011 12:36:30 -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: c8361d8858711e6571549f38a8e1297631090572 ------------------------------------------------------------ revno: 6 committer: Alexandros Frantzis timestamp: Wed 2010-07-07 15:42:25 +0300 message: Remove built-in smooth shading functionality which is not available in OpenGL ES 2.0. modified: sceneshading.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 'sceneshading.cpp' --- sceneshading.cpp 2010-07-07 10:32:18 +0000 +++ sceneshading.cpp 2010-07-07 12:42:25 +0000 @@ -71,15 +71,11 @@ { case 0: glDisable(GL_TEXTURE_2D); - glShadeModel(GL_SMOOTH); + mShader[0].use(); break; case 1: glDisable(GL_TEXTURE_2D); - mShader[0].use(); - break; - case 2: - glDisable(GL_TEXTURE_2D); - mShader[1].use(); + mShader[1].use(); break; }; @@ -105,12 +101,9 @@ { case 0: printf("Shading\n"); - printf(" Smooth shader model FPS: %u\n", mAverageFPS[mCurrentPart]); + printf(" GLSL per vertex lighting FPS: %u\n", mAverageFPS[mCurrentPart]); break; case 1: - printf(" GLSL per vertex lighting FPS: %u\n", mAverageFPS[mCurrentPart]); - break; - case 2: printf(" GLSL per pixel lighting FPS: %u\n", mAverageFPS[mCurrentPart]); break; } @@ -135,6 +128,3 @@ mMesh.render_vbo(); } - - -