From patchwork Thu Jul 21 12:36:32 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandros Frantzis X-Patchwork-Id: 2998 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 79D5E23F52 for ; Thu, 21 Jul 2011 12:44:15 +0000 (UTC) Received: from mail-qy0-f180.google.com (mail-qy0-f180.google.com [209.85.216.180]) by fiordland.canonical.com (Postfix) with ESMTP id 473A1A18287 for ; Thu, 21 Jul 2011 12:44:15 +0000 (UTC) Received: by mail-qy0-f180.google.com with SMTP id 30so845420qyk.11 for ; Thu, 21 Jul 2011 05:44:15 -0700 (PDT) Received: by 10.229.25.212 with SMTP id a20mr175467qcc.148.1311252255022; Thu, 21 Jul 2011 05:44:15 -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 hl14cs139580qcb; Thu, 21 Jul 2011 05:44:14 -0700 (PDT) Received: by 10.227.198.133 with SMTP id eo5mr191969wbb.38.1311251796114; 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 fs8si2397952wbb.29.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 1QjsUT-0000Cj-Sw 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 C068F2EA8E1 for ; Thu, 21 Jul 2011 12:36:32 +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: 39 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~glmark2-dev/glmark2/trunk] Rev 39: Remove OpenGL 1.x compatible Mesh::render_vbo() and Mesh::render_array() methods. Message-Id: <20110721123632.17019.72849.launchpad@loganberry.canonical.com> Date: Thu, 21 Jul 2011 12:36:32 -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: 3c0dcd3f97d24d1bdb7ed288fc4ff9bcb8a2d8bc ------------------------------------------------------------ revno: 39 committer: Alexandros Frantzis timestamp: Mon 2010-07-12 11:28:14 +0300 message: Remove OpenGL 1.x compatible Mesh::render_vbo() and Mesh::render_array() methods. Rename Mesh::render_vbo_attrib() and Mesh::render_array_attrib() to Mesh::render_vbo() and Mesh::render_array(). modified: mesh.cpp mesh.h scenebuild.cpp sceneshading.cpp scenetexture.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 'mesh.cpp' --- mesh.cpp 2010-07-12 08:05:45 +0000 +++ mesh.cpp 2010-07-12 08:28:14 +0000 @@ -87,22 +87,6 @@ void Mesh::render_array() { - glEnableClientState(GL_VERTEX_ARRAY); - glEnableClientState(GL_NORMAL_ARRAY); - glEnableClientState(GL_TEXTURE_COORD_ARRAY); - - glVertexPointer(3, GL_FLOAT, sizeof(Vertex), &mVertex[0].v.x); - glNormalPointer(GL_FLOAT, sizeof(Vertex), &mVertex[0].n.x); - glTexCoordPointer(2, GL_FLOAT, sizeof(Vertex), &mVertex[0].t.u); - glDrawArrays(mMode, 0, mVertexQty); - - glDisableClientState(GL_TEXTURE_COORD_ARRAY); - glDisableClientState(GL_VERTEX_ARRAY); - glDisableClientState(GL_NORMAL_ARRAY); -} - -void Mesh::render_array_attrib() -{ // Enable the attributes glEnableVertexAttribArray(Shader::VertexAttribLocation); glEnableVertexAttribArray(Shader::NormalAttribLocation); @@ -175,28 +159,6 @@ void Mesh::render_vbo() { - glEnableClientState(GL_VERTEX_ARRAY); - glEnableClientState(GL_NORMAL_ARRAY); - glEnableClientState(GL_TEXTURE_COORD_ARRAY); - - glBindBuffer(GL_ARRAY_BUFFER, mVBOVertices); - glVertexPointer(3, GL_FLOAT, 0, 0); - glBindBuffer(GL_ARRAY_BUFFER, mVBONormals); - glNormalPointer(GL_FLOAT, 0, 0); - glBindBuffer(GL_ARRAY_BUFFER, mVBOTexCoords); - glTexCoordPointer(2, GL_FLOAT, 0, 0); - - glDrawArrays(GL_TRIANGLES, 0, mVertexQty); - - glBindBuffer(GL_ARRAY_BUFFER, 0); - - glDisableClientState(GL_TEXTURE_COORD_ARRAY); - glDisableClientState(GL_NORMAL_ARRAY); - glDisableClientState(GL_VERTEX_ARRAY); -} - -void Mesh::render_vbo_attrib() -{ // Enable the attributes glEnableVertexAttribArray(Shader::VertexAttribLocation); glEnableVertexAttribArray(Shader::NormalAttribLocation); === modified file 'mesh.h' --- mesh.h 2010-07-09 10:13:39 +0000 +++ mesh.h 2010-07-12 08:28:14 +0000 @@ -44,10 +44,8 @@ void make_cube(); void make_torus(); void render_array(); - void render_array_attrib(); void build_vbo(); void render_vbo(); - void render_vbo_attrib(); }; #endif === modified file 'scenebuild.cpp' --- scenebuild.cpp 2010-07-09 12:16:42 +0000 +++ scenebuild.cpp 2010-07-12 08:28:14 +0000 @@ -127,10 +127,10 @@ switch(mCurrentPart) { case 0: - mMesh.render_array_attrib(); + mMesh.render_array(); break; case 1: - mMesh.render_vbo_attrib(); + mMesh.render_vbo(); break; } } === modified file 'sceneshading.cpp' --- sceneshading.cpp 2010-07-09 12:16:42 +0000 +++ sceneshading.cpp 2010-07-12 08:28:14 +0000 @@ -156,5 +156,5 @@ glUniformMatrix4fv(mShader[mCurrentPart].mLocations.NormalMatrix, 1, GL_FALSE, model_view.m); - mMesh.render_vbo_attrib(); + mMesh.render_vbo(); } === modified file 'scenetexture.cpp' --- scenetexture.cpp 2010-07-09 14:21:56 +0000 +++ scenetexture.cpp 2010-07-12 08:28:14 +0000 @@ -137,5 +137,5 @@ glActiveTexture(GL_TEXTURE0); glBindTexture(GL_TEXTURE_2D, mTexture[mCurrentPart]); - mCubeMesh.render_vbo_attrib(); + mCubeMesh.render_vbo(); }