From patchwork Thu Jul 21 12:36:31 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandros Frantzis X-Patchwork-Id: 2913 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 0018823F4D for ; Thu, 21 Jul 2011 12:36:44 +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 C38B6A185A2 for ; Thu, 21 Jul 2011 12:36:44 +0000 (UTC) Received: by mail-qy0-f173.google.com with SMTP id 10so3959338qyk.11 for ; Thu, 21 Jul 2011 05:36:44 -0700 (PDT) Received: by 10.229.217.3 with SMTP id hk3mr202945qcb.38.1311251804563; Thu, 21 Jul 2011 05:36:44 -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 hl14cs139336qcb; Thu, 21 Jul 2011 05:36:44 -0700 (PDT) Received: by 10.227.11.67 with SMTP id s3mr177134wbs.62.1311251795140; Thu, 21 Jul 2011 05:36:35 -0700 (PDT) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id p6si2386519wbh.74.2011.07.21.05.36.34; Thu, 21 Jul 2011 05:36:35 -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 1QjsUT-0000DH-7V for ; Thu, 21 Jul 2011 12:36:33 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id A7F792EA03B for ; Thu, 21 Jul 2011 12:36:31 +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: 24 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~glmark2-dev/glmark2/trunk] Rev 24: Add more light and material related uniforms to shader. Message-Id: <20110721123631.17019.28850.launchpad@loganberry.canonical.com> Date: Thu, 21 Jul 2011 12:36:31 -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: a6db5c4df9d7674e2b5b27e8e4edc5d5f04cfa70 ------------------------------------------------------------ revno: 24 committer: Alexandros Frantzis timestamp: Fri 2010-07-09 12:43:26 +0300 message: Add more light and material related uniforms to shader. modified: shader.cpp shader.h --- 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 'shader.cpp' --- shader.cpp 2010-07-08 08:27:40 +0000 +++ shader.cpp 2010-07-09 09:43:26 +0000 @@ -79,17 +79,35 @@ "NormalMatrix"); mLocations.LightSourcePosition = glGetUniformLocation(mShaderProgram, "LightSourcePosition"); + mLocations.LightSourceHalfVector = glGetUniformLocation(mShaderProgram, + "LightSourceHalfVector"); + + mLocations.LightSourceAmbient = glGetUniformLocation(mShaderProgram, + "LightSourceAmbient"); mLocations.LightSourceDiffuse = glGetUniformLocation(mShaderProgram, "LightSourceDiffuse"); + mLocations.LightSourceSpecular = glGetUniformLocation(mShaderProgram, + "LightSourceSpecular"); + + mLocations.MaterialAmbient = glGetUniformLocation(mShaderProgram, + "MaterialAmbient"); mLocations.MaterialDiffuse = glGetUniformLocation(mShaderProgram, "MaterialDiffuse"); + mLocations.MaterialSpecular = glGetUniformLocation(mShaderProgram, + "MaterialSpecular"); + #ifdef _DEBUG - printf("Uniform Locations: %d %d %d %d %d\n", + printf("Uniform Locations: %d %d %d %d %d %d %d %d\n", mLocations.ModelViewProjectionMatrix, mLocations.NormalMatrix, mLocations.LightSourcePosition, + mLocations.LightSourceHalfVector, + mLocations.LightSourceAmbient, mLocations.LightSourceDiffuse, - mLocations.MaterialDiffuse); + mLocations.LightSourceSpecular, + mLocations.MaterialAmbient, + mLocations.MaterialDiffuse, + mLocations.MaterialSpecular); #endif } === modified file 'shader.h' --- shader.h 2010-07-08 08:27:40 +0000 +++ shader.h 2010-07-09 09:43:26 +0000 @@ -21,8 +21,13 @@ GLint ModelViewProjectionMatrix; GLint NormalMatrix; GLint LightSourcePosition; + GLint LightSourceHalfVector; + GLint LightSourceAmbient; GLint LightSourceDiffuse; + GLint LightSourceSpecular; + GLint MaterialAmbient; GLint MaterialDiffuse; + GLint MaterialSpecular; } mLocations; enum {