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: 2935 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 8119C23F53 for ; Thu, 21 Jul 2011 12:42:05 +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 50932A1822A for ; Thu, 21 Jul 2011 12:42:05 +0000 (UTC) Received: by mail-qy0-f173.google.com with SMTP id 10so3962301qyk.11 for ; Thu, 21 Jul 2011 05:42:05 -0700 (PDT) Received: by 10.224.198.7 with SMTP id em7mr186614qab.112.1311252125107; 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 hl14cs139472qcb; Thu, 21 Jul 2011 05:42:04 -0700 (PDT) Received: by 10.227.174.206 with SMTP id u14mr167428wbz.80.1311251795243; 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 e21si2401119wbh.16.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-0000DF-LF 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 75FA12EA0A5 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: 34 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~glmark2-dev/glmark2/trunk] Rev 34: Get rid of gl functions not available in or relevant to OpenGL ES 2.0. Message-Id: <20110721123632.17019.75835.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: 5aa15e5089bebbd3fe13a91c0141ef4631e7b8aa ------------------------------------------------------------ revno: 34 committer: Alexandros Frantzis timestamp: Fri 2010-07-09 17:14:04 +0300 message: Get rid of gl functions not available in or relevant to OpenGL ES 2.0. modified: 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 'screen.cpp' --- screen.cpp 2010-07-08 12:54:10 +0000 +++ screen.cpp 2010-07-09 14:14:04 +0000 @@ -39,7 +39,7 @@ if(mFullScreen) mFlags = SDL_OPENGL | SDL_FULLSCREEN; - + mInfo = SDL_GetVideoInfo(); SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 5); @@ -53,10 +53,9 @@ fprintf(stderr, "[ Fail ] - Video mode set failed: %s\n", SDL_GetError()); return 0; } - + SDL_WM_SetCaption("GLMark 08", NULL); - - glShadeModel(GL_SMOOTH); + glClearColor(0.0f, 0.0f, 0.0f, 0.5f); glClearDepth(1.0f); glEnable(GL_DEPTH_TEST); @@ -64,14 +63,8 @@ glEnable(GL_CULL_FACE); glCullFace(GL_BACK); - glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST); glViewport(0, 0, mWidth, mHeight); - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - gluPerspective(60.0, mWidth / (float)mHeight, 1.0, 1024.0); - glMatrixMode(GL_MODELVIEW); - clear(); mProjection.perspective(60.0, mWidth / (float)mHeight, 1.0, 1024.0); @@ -88,7 +81,6 @@ void Screen::clear() { glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); - glLoadIdentity(); } void Screen::update() @@ -102,6 +94,5 @@ printf(" GL_VENDOR: %s\n", glGetString(GL_VENDOR)); printf(" GL_RENDERER: %s\n", glGetString(GL_RENDERER)); printf(" GL_VERSION: %s\n", glGetString(GL_VERSION)); -// printf("GL_EXTENSIONS: %s\n", glGetString(GL_EXTENSIONS)); }