From patchwork Thu Jul 21 12:36:30 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandros Frantzis X-Patchwork-Id: 2909 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 ACC4E23F4D for ; Thu, 21 Jul 2011 12:36:41 +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 7BF0DA18287 for ; Thu, 21 Jul 2011 12:36:41 +0000 (UTC) Received: by qwb8 with SMTP id 8so850361qwb.11 for ; Thu, 21 Jul 2011 05:36:41 -0700 (PDT) Received: by 10.229.68.200 with SMTP id w8mr185000qci.114.1311251800991; Thu, 21 Jul 2011 05:36:40 -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 hl14cs139331qcb; Thu, 21 Jul 2011 05:36:39 -0700 (PDT) Received: by 10.217.5.5 with SMTP id v5mr151198wes.95.1311251794473; Thu, 21 Jul 2011 05:36:34 -0700 (PDT) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id r54si2393590weq.47.2011.07.21.05.36.34; Thu, 21 Jul 2011 05:36:34 -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 1QjsUS-0000Cu-98 for ; Thu, 21 Jul 2011 12:36:32 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id 1C9482E8915 for ; Thu, 21 Jul 2011 12:36:30 +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: 4 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~glmark2-dev/glmark2/trunk] Rev 4: Remove dependency on GLEW. Message-Id: <20110721123630.17019.9324.launchpad@loganberry.canonical.com> Date: Thu, 21 Jul 2011 12:36:30 -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: 845d6b50fffc04c4a2fe5cf2a9ee9a43dbfea727 ------------------------------------------------------------ revno: 4 committer: Alexandros Frantzis timestamp: Wed 2010-07-07 15:33:49 +0300 message: Remove dependency on GLEW. modified: makefile oglsdl.h screen.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 'makefile' --- makefile 2010-07-07 10:32:18 +0000 +++ makefile 2010-07-07 12:33:49 +0000 @@ -1,2 +1,2 @@ all: - g++ *.cpp -o glmark -Wall -lSDL -lGL -lGLU -lGLEW + g++ *.cpp -o glmark -Wall -lSDL -lGL -lGLU === modified file 'oglsdl.h' --- oglsdl.h 2010-07-07 10:32:18 +0000 +++ oglsdl.h 2010-07-07 12:33:49 +0000 @@ -2,6 +2,11 @@ #define _OGLSDL_H #include -#include + +#define GL_GLEXT_PROTOTYPES +#include +#include +#include + #endif === modified file 'screen.cpp' --- screen.cpp 2010-07-07 10:32:18 +0000 +++ screen.cpp 2010-07-07 12:33:49 +0000 @@ -56,19 +56,6 @@ SDL_WM_SetCaption("GLMark 08", NULL); - GLenum err = glewInit(); - if(GLEW_OK != err) - { - fprintf(stderr, "[ Fail ] - Error: %s\n", glewGetErrorString(err)); - return 0; - } - - if(!GLEW_ARB_vertex_buffer_object) - { - fprintf(stderr, "[ Fail ] - VBO objects are not supported\n"); - return 0; - } - glShadeModel(GL_SMOOTH); glClearColor(0.0f, 0.0f, 0.0f, 0.5f); glClearDepth(1.0f);