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: 2938 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 B8F8623F4D for ; Thu, 21 Jul 2011 12:42:07 +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 870B4A1822A for ; Thu, 21 Jul 2011 12:42:07 +0000 (UTC) Received: by qyk10 with SMTP id 10so3962504qyk.11 for ; Thu, 21 Jul 2011 05:42:07 -0700 (PDT) Received: by 10.224.195.193 with SMTP id ed1mr179857qab.162.1311252125966; Thu, 21 Jul 2011 05:42:05 -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 hl14cs139475qcb; Thu, 21 Jul 2011 05:42:05 -0700 (PDT) Received: by 10.227.202.209 with SMTP id ff17mr197933wbb.23.1311251796630; 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 ej18si2399360wbb.23.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-0000DN-Tw 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 42C442E8961 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: 60 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~glmark2-dev/glmark2/trunk] Rev 60: Use correct function get log for shader program linking. Message-Id: <20110721123634.17019.97198.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: 65353317c19a693b255cc66ffe8979895d091376 ------------------------------------------------------------ revno: 60 committer: Alexandros Frantzis timestamp: Fri 2010-11-19 12:05:11 +0200 message: Use correct function get log for shader program linking. 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-13 10:22:05 +0000 +++ src/shader.cpp 2010-11-19 10:05:11 +0000 @@ -91,7 +91,7 @@ glBindAttribLocation(mShaderProgram, TexCoordAttribLocation, "texcoord"); glLinkProgram(mShaderProgram); - glGetShaderInfoLog(mShaderProgram, sizeof msg, NULL, msg); + glGetProgramInfoLog(mShaderProgram, sizeof msg, NULL, msg); if (strlen(msg) > 0) printf("Shader Linking: %s\n", msg);