From patchwork Thu Jul 21 12:36:35 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: alexandros.frantzis@linaro.org X-Patchwork-Id: 2939 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 62C0B23F4D for ; Thu, 21 Jul 2011 12:42:08 +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 3205DA18398 for ; Thu, 21 Jul 2011 12:42:08 +0000 (UTC) Received: by mail-qw0-f52.google.com with SMTP id 8so853237qwb.11 for ; Thu, 21 Jul 2011 05:42:08 -0700 (PDT) Received: by 10.224.96.6 with SMTP id f6mr188104qan.12.1311252127959; Thu, 21 Jul 2011 05:42:07 -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 hl14cs139479qcb; Thu, 21 Jul 2011 05:42:07 -0700 (PDT) Received: by 10.227.198.197 with SMTP id ep5mr196395wbb.33.1311251796628; 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 8si2395142wbx.33.2011.07.21.05.36.36; 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 1QjsUV-0000Cp-BA for ; Thu, 21 Jul 2011 12:36:35 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id 226752E889B for ; Thu, 21 Jul 2011 12:36:35 +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: 72 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~glmark2-dev/glmark2/trunk] Rev 72: Make result reporting more parser-friendly. Message-Id: <20110721123635.17019.69089.launchpad@loganberry.canonical.com> Date: Thu, 21 Jul 2011 12:36:35 -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: 0a0a428314abf37b59bb2da265f00b96e531a0d8 ------------------------------------------------------------ revno: 72 committer: Alexandros Frantzis timestamp: Tue 2011-01-25 16:00:35 +0200 message: Make result reporting more parser-friendly. modified: src/main.cpp src/scenebuild.cpp src/sceneshading.cpp src/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 'src/main.cpp' --- src/main.cpp 2010-12-12 14:11:00 +0000 +++ src/main.cpp 2011-01-25 14:00:35 +0000 @@ -52,11 +52,11 @@ return 1; } - printf("===================================================\n"); + printf("=======================================================\n"); printf(" glmark2 %s\n", GLMARK_VERSION); - printf("===================================================\n"); + printf("=======================================================\n"); screen.print_info(); - printf("===================================================\n"); + printf("=======================================================\n"); // Create the scenes. Scene *scene[] = { @@ -123,9 +123,9 @@ for (unsigned i = 0; i < num_scenes; i++) score += scene[i]->calculate_score(); - printf("===================================================\n"); - printf("Your glmark2 Score is %u ^_^\n", score); - printf("===================================================\n"); + printf("=======================================================\n"); + printf(" glmark2 Score: %u \n", score); + printf("=======================================================\n"); return 0; } === modified file 'src/scenebuild.cpp' --- src/scenebuild.cpp 2010-11-19 13:11:20 +0000 +++ src/scenebuild.cpp 2011-01-25 14:00:35 +0000 @@ -91,6 +91,9 @@ mRunning = true; mStartTime = SDL_GetTicks() / 1000.0; mLastTime = mStartTime; + + if (mCurrentPart == 0) + printf("[Suite] Precompilation\n"); } void SceneBuild::update() @@ -108,11 +111,10 @@ switch(mCurrentPart) { case 0: - printf("Precompilation\n"); - printf(" Vertex array FPS: %u\n", mAverageFPS[mCurrentPart]); + printf(" [Benchmark] Vertex array FPS: %u\n", mAverageFPS[mCurrentPart]); break; case 1: - printf(" Vertex buffer object FPS: %u\n", mAverageFPS[mCurrentPart]); + printf(" [Benchmark] Vertex buffer object FPS: %u\n", mAverageFPS[mCurrentPart]); break; } mCurrentPart++; === modified file 'src/sceneshading.cpp' --- src/sceneshading.cpp 2010-11-19 13:11:20 +0000 +++ src/sceneshading.cpp 2011-01-25 14:00:35 +0000 @@ -113,6 +113,9 @@ mRunning = true; mStartTime = SDL_GetTicks() / 1000.0; mLastTime = mStartTime; + + if (mCurrentPart == 0) + printf("[Suite] Shading\n"); } void SceneShading::update() @@ -129,12 +132,11 @@ switch(mCurrentPart) { case 0: - printf("Shading\n"); - printf(" GLSL per vertex lighting FPS: %u\n", + printf(" [Benchmark] GLSL per vertex lighting FPS: %u\n", mAverageFPS[mCurrentPart]); break; case 1: - printf(" GLSL per pixel lighting FPS: %u\n", + printf(" [Benchmark] GLSL per pixel lighting FPS: %u\n", mAverageFPS[mCurrentPart]); break; } === modified file 'src/scenetexture.cpp' --- src/scenetexture.cpp 2010-11-19 13:11:20 +0000 +++ src/scenetexture.cpp 2011-01-25 14:00:35 +0000 @@ -97,6 +97,9 @@ mRunning = true; mStartTime = SDL_GetTicks() / 1000.0; mLastTime = mStartTime; + + if (mCurrentPart == 0) + printf("[Suite] Texture filtering\n"); } void SceneTexture::update() @@ -113,14 +116,13 @@ switch(mCurrentPart) { case 0: - printf("Texture filtering\n"); - printf(" Nearest FPS: %u\n", mAverageFPS[mCurrentPart]); + printf(" [Benchmark] Nearest FPS: %u\n", mAverageFPS[mCurrentPart]); break; case 1: - printf(" Linear FPS: %u\n", mAverageFPS[mCurrentPart]); + printf(" [Benchmark] Linear FPS: %u\n", mAverageFPS[mCurrentPart]); break; case 2: - printf(" Mipmapped FPS: %u\n", mAverageFPS[mCurrentPart]); + printf(" [Benchmark] Mipmapped FPS: %u\n", mAverageFPS[mCurrentPart]); break; } mCurrentPart++;