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: 2942 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 32FA723F4D for ; Thu, 21 Jul 2011 12:42:23 +0000 (UTC) Received: from mail-qy0-f173.google.com (mail-qy0-f173.google.com [209.85.216.173]) by fiordland.canonical.com (Postfix) with ESMTP id 01112A1822A for ; Thu, 21 Jul 2011 12:42:22 +0000 (UTC) Received: by mail-qy0-f173.google.com with SMTP id 10so3962301qyk.11 for ; Thu, 21 Jul 2011 05:42:22 -0700 (PDT) Received: by 10.229.217.3 with SMTP id hk3mr208499qcb.38.1311252142766; Thu, 21 Jul 2011 05:42:22 -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 hl14cs139493qcb; Thu, 21 Jul 2011 05:42:22 -0700 (PDT) Received: by 10.216.220.220 with SMTP id o70mr731848wep.71.1311251796258; 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 f58si673126wed.112.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-0000DF-BU 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 7969D2E84FB 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: 48 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~glmark2-dev/glmark2/trunk] Rev 48: When setting a uniform for a program make sure that the program is in use. Message-Id: <20110721123633.17019.68681.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: 909a18ea7957494cd347745068898d842c6d69da ------------------------------------------------------------ revno: 48 committer: Alexandros Frantzis timestamp: Mon 2010-07-12 19:14:14 +0300 message: When setting a uniform for a program make sure that the program is in use. modified: src/shader.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/shader.cpp' --- src/shader.cpp 2010-07-12 10:06:29 +0000 +++ src/shader.cpp 2010-07-12 16:14:14 +0000 @@ -99,7 +99,9 @@ "MaterialColor"); mLocations.MaterialTexture0 = glGetUniformLocation(mShaderProgram, "MaterialTexture0"); + glUseProgram(mShaderProgram); glUniform1i(mLocations.MaterialTexture0, 0); + glUseProgram(0); #ifdef _DEBUG printf("Uniform Locations: %d %d %d %d %d %d %d %d %d %d %d %d\n",