From patchwork Thu Jul 21 12:36:34 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: 2925 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 EFCD723F4D for ; Thu, 21 Jul 2011 12:41:42 +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 BDA6CA18287 for ; Thu, 21 Jul 2011 12:41:42 +0000 (UTC) Received: by qwb8 with SMTP id 8so853237qwb.11 for ; Thu, 21 Jul 2011 05:41:42 -0700 (PDT) Received: by 10.229.217.3 with SMTP id hk3mr207796qcb.38.1311252102256; Thu, 21 Jul 2011 05:41:42 -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 hl14cs139456qcb; Thu, 21 Jul 2011 05:41:42 -0700 (PDT) Received: by 10.227.39.66 with SMTP id f2mr207051wbe.2.1311251796461; 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 ff20si2400688wbb.15.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-0000DA-1M 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 A02A22E889C for ; Thu, 21 Jul 2011 12:36:34 +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: 66 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~glmark2-dev/glmark2/trunk] Rev 66: Use the correct GL call (glDeleteProgram) to delete a shader program. Message-Id: <20110721123634.17019.41171.launchpad@loganberry.canonical.com> Date: Thu, 21 Jul 2011 12:36:34 -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: 73da8084c1ca2f0aba3d4ee7880539ed74dd898a ------------------------------------------------------------ revno: 66 committer: Alexandros Frantzis timestamp: Sun 2010-12-12 15:49:10 +0200 message: Use the correct GL call (glDeleteProgram) to delete a shader program. 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-12-12 13:35:07 +0000 +++ src/shader.cpp 2010-12-12 13:49:10 +0000 @@ -160,7 +160,7 @@ glDeleteShader(mVertexShader); glDeleteShader(mFragmentShader); - glDeleteShader(mShaderProgram); + glDeleteProgram(mShaderProgram); mVertexShader = 0; mFragmentShader = 0;