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: 2926 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 BF4D123F4D for ; Thu, 21 Jul 2011 12:41:43 +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 8DF5CA1822A for ; Thu, 21 Jul 2011 12:41:43 +0000 (UTC) Received: by mail-qw0-f52.google.com with SMTP id 8so853237qwb.11 for ; Thu, 21 Jul 2011 05:41:43 -0700 (PDT) Received: by 10.229.68.200 with SMTP id w8mr189822qci.114.1311252103358; Thu, 21 Jul 2011 05:41:43 -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 hl14cs139457qcb; Thu, 21 Jul 2011 05:41:43 -0700 (PDT) Received: by 10.216.30.9 with SMTP id j9mr157035wea.82.1311251796408; 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 s44si2383758weq.83.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 1QjsUU-0000DH-9G 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 6CE292E8915 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: 47 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~glmark2-dev/glmark2/trunk] Rev 47: Remove redundant switch statement. Message-Id: <20110721123633.17019.28839.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: 45e4ae6b856acfd4d35dae7f2710d7f0d85e2386 ------------------------------------------------------------ revno: 47 committer: Alexandros Frantzis timestamp: Mon 2010-07-12 18:52:43 +0300 message: Remove redundant switch statement. modified: src/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 'src/sceneshading.cpp' --- src/sceneshading.cpp 2010-07-12 10:06:29 +0000 +++ src/sceneshading.cpp 2010-07-12 15:52:43 +0000 @@ -65,17 +65,7 @@ float materialSpecular[] = {1.0f, 1.0f, 1.0f, 1.0f}; float materialColor[] = {0.0f, 0.0f, 1.0f, 1.0f}; - switch(mCurrentPart) - { - case 0: - glDisable(GL_TEXTURE_2D); - mShader[0].use(); - break; - case 1: - glDisable(GL_TEXTURE_2D); - mShader[1].use(); - break; - } + mShader[mCurrentPart].use(); // Load lighting and material uniforms glUniform4fv(mShader[mCurrentPart].mLocations.LightSourcePosition, 1, lightPosition);