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: 3004 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 74A9823F4D for ; Thu, 21 Jul 2011 12:44:31 +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 43A02A18398 for ; Thu, 21 Jul 2011 12:44:31 +0000 (UTC) Received: by mail-qw0-f52.google.com with SMTP id 8so853237qwb.11 for ; Thu, 21 Jul 2011 05:44:31 -0700 (PDT) Received: by 10.229.217.3 with SMTP id hk3mr210447qcb.38.1311252270335; Thu, 21 Jul 2011 05:44:30 -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 hl14cs139593qcb; Thu, 21 Jul 2011 05:44:30 -0700 (PDT) Received: by 10.216.62.203 with SMTP id y53mr147667wec.108.1311251795924; 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 p24si2406297weq.4.2011.07.21.05.36.35; 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-0000Co-PX 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 A30352EA58B 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: 37 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~glmark2-dev/glmark2/trunk] Rev 37: Remove Mesh::make_cube implementation as it depends on GL_QUADS that doesn't exist in OpenGL ES 2.0 Message-Id: <20110721123632.17019.19242.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: e3cb1c348d4d0fc1545313c185423a31a459ce8b ------------------------------------------------------------ revno: 37 committer: Alexandros Frantzis timestamp: Mon 2010-07-12 10:57:21 +0300 message: Remove Mesh::make_cube implementation as it depends on GL_QUADS that doesn't exist in OpenGL ES 2.0 modified: mesh.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-09 10:13:39 +0000 +++ mesh.cpp 2010-07-12 07:57:21 +0000 @@ -15,7 +15,7 @@ { mPolygonQty = 0; mVertexQty = 0; - mMode = GL_QUADS; + mMode = GL_TRIANGLES; mVertex = 0; } @@ -27,52 +27,7 @@ void Mesh::make_cube() { - mPolygonQty = 6; - mVertexQty = 4 * mPolygonQty; - mMode = GL_QUADS; - mVertex = new Vertex[mVertexQty]; - - mVertex[0].v = Vector3f( 1.0f, 1.0f,-1.0f); - mVertex[1].v = Vector3f(-1.0f, 1.0f,-1.0f); - mVertex[2].v = Vector3f(-1.0f, 1.0f, 1.0f); - mVertex[3].v = Vector3f( 1.0f, 1.0f, 1.0f); - - mVertex[4].v = Vector3f( 1.0f,-1.0f, 1.0f); - mVertex[5].v = Vector3f(-1.0f,-1.0f, 1.0f); - mVertex[6].v = Vector3f(-1.0f,-1.0f,-1.0f); - mVertex[7].v = Vector3f( 1.0f,-1.0f,-1.0f); - - mVertex[8].v = Vector3f( 1.0f, 1.0f, 1.0f); - mVertex[9].v = Vector3f(-1.0f, 1.0f, 1.0f); - mVertex[10].v = Vector3f(-1.0f,-1.0f, 1.0f); - mVertex[11].v = Vector3f( 1.0f,-1.0f, 1.0f); - - mVertex[12].v = Vector3f( 1.0f,-1.0f,-1.0f); - mVertex[13].v = Vector3f(-1.0f,-1.0f,-1.0f); - mVertex[14].v = Vector3f(-1.0f, 1.0f,-1.0f); - mVertex[15].v = Vector3f( 1.0f, 1.0f,-1.0f); - - mVertex[16].v = Vector3f(-1.0f, 1.0f, 1.0f); - mVertex[17].v = Vector3f(-1.0f, 1.0f,-1.0f); - mVertex[18].v = Vector3f(-1.0f,-1.0f,-1.0f); - mVertex[19].v = Vector3f(-1.0f,-1.0f, 1.0f); - - mVertex[20].v = Vector3f(-1.0f, 1.0f, 1.0f); - mVertex[21].v = Vector3f(-1.0f, 1.0f,-1.0f); - mVertex[22].v = Vector3f(-1.0f,-1.0f,-1.0f); - mVertex[23].v = Vector3f(-1.0f,-1.0f, 1.0f); - - for(unsigned i = 0; i < mVertexQty / 4; i += 4) - { - Vector3f n; - n = normal(mVertex[i].v, mVertex[i + 1].v, mVertex[i + 2].v); - for(unsigned j = 0; j < 4; j++) - mVertex[i + j].n = n; - mVertex[i + 0].t = Texel(0.0f, 0.0f); - mVertex[i + 1].t = Texel(1.0f, 0.0f); - mVertex[i + 2].t = Texel(1.0f, 1.0f); - mVertex[i + 3].t = Texel(0.0f, 1.0f); - } + fprintf(stderr, "Warning: %s: Not implemented\n", __FUNCTION__); } void Mesh::make_torus()