From patchwork Fri Jun 24 15:54:15 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: 2303 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 0DE3823F08 for ; Fri, 24 Jun 2011 15:54:20 +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 B81F4A183F8 for ; Fri, 24 Jun 2011 15:54:19 +0000 (UTC) Received: by qwb8 with SMTP id 8so2157256qwb.11 for ; Fri, 24 Jun 2011 08:54:19 -0700 (PDT) Received: by 10.229.117.95 with SMTP id p31mr2654363qcq.97.1308930857903; Fri, 24 Jun 2011 08:54:17 -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.230.139 with SMTP id jm11cs52217qcb; Fri, 24 Jun 2011 08:54:17 -0700 (PDT) Received: by 10.216.135.133 with SMTP id u5mr2076126wei.61.1308930856513; Fri, 24 Jun 2011 08:54:16 -0700 (PDT) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id k64si6430790weq.9.2011.06.24.08.54.16; Fri, 24 Jun 2011 08:54:16 -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 1Qa8hz-0003ED-OJ for ; Fri, 24 Jun 2011 15:54:15 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id B65E32E8067 for ; Fri, 24 Jun 2011 15:54:15 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: glcompbench X-Launchpad-Branch: ~glcompbench-dev/glcompbench/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 40 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~glcompbench-dev/glcompbench/trunk] Rev 40: Display program information when starting. Message-Id: <20110624155415.32360.51834.launchpad@loganberry.canonical.com> Date: Fri, 24 Jun 2011 15:54:15 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="13265"; Instance="initZopeless config overlay" X-Launchpad-Hash: a417ecfa4442dcef65527a416c751a3e612724cd ------------------------------------------------------------ revno: 40 committer: Alexandros Frantzis branch nick: trunk timestamp: Fri 2011-06-24 18:51:40 +0300 message: Display program information when starting. modified: src/composite-canvas-egl.cc src/composite-canvas-egl.h src/composite-canvas-glx.cc src/composite-canvas-glx.h src/composite-canvas.h src/glcompbench.cc --- lp:glcompbench https://code.launchpad.net/~glcompbench-dev/glcompbench/trunk You are subscribed to branch lp:glcompbench. To unsubscribe from this branch go to https://code.launchpad.net/~glcompbench-dev/glcompbench/trunk/+edit-subscription === modified file 'src/composite-canvas-egl.cc' --- src/composite-canvas-egl.cc 2011-06-23 09:49:07 +0000 +++ src/composite-canvas-egl.cc 2011-06-24 15:51:40 +0000 @@ -22,6 +22,7 @@ */ #include +#include #include "gl-headers.h" @@ -273,3 +274,18 @@ else glFinish(); } + +std::string +CompositeCanvasEGL::info_string() +{ + make_current(); + + std::stringstream ss; + + ss << " OpenGL Information" << std::endl; + ss << " GL_VENDOR: " << glGetString(GL_VENDOR) << std::endl; + ss << " GL_RENDERER: " << glGetString(GL_RENDERER) << std::endl; + ss << " GL_VERSION: " << glGetString(GL_VERSION) << std::endl; + + return ss.str(); +} === modified file 'src/composite-canvas-egl.h' --- src/composite-canvas-egl.h 2011-02-07 19:00:10 +0000 +++ src/composite-canvas-egl.h 2011-06-24 15:51:40 +0000 @@ -36,6 +36,8 @@ egl_context_(0), egl_surface_(0), use_accel_tfp_(false) {} + std::string info_string(); + protected: XVisualInfo *get_canvas_xvisualinfo(); bool make_current(); === modified file 'src/composite-canvas-glx.cc' --- src/composite-canvas-glx.cc 2011-06-24 13:31:15 +0000 +++ src/composite-canvas-glx.cc 2011-06-24 15:51:40 +0000 @@ -22,6 +22,7 @@ */ #include +#include #include #include @@ -218,3 +219,18 @@ else glFinish(); } + +std::string +CompositeCanvasGLX::info_string() +{ + make_current(); + + std::stringstream ss; + + ss << " OpenGL Information" << std::endl; + ss << " GL_VENDOR: " << glGetString(GL_VENDOR) << std::endl; + ss << " GL_RENDERER: " << glGetString(GL_RENDERER) << std::endl; + ss << " GL_VERSION: " << glGetString(GL_VERSION) << std::endl; + + return ss.str(); +} === modified file 'src/composite-canvas-glx.h' --- src/composite-canvas-glx.h 2011-04-26 15:02:03 +0000 +++ src/composite-canvas-glx.h 2011-06-24 15:51:40 +0000 @@ -35,6 +35,8 @@ glx_fbconfig_(0), glx_context_(0), use_accel_tfp_(false) {} + std::string info_string(); + protected: XVisualInfo *get_canvas_xvisualinfo(); bool make_current(); === modified file 'src/composite-canvas.h' --- src/composite-canvas.h 2011-06-23 13:13:26 +0000 +++ src/composite-canvas.h 2011-06-24 15:51:40 +0000 @@ -51,6 +51,7 @@ bool init(); void run_tests(std::list &benchmarks); + virtual std::string info_string() { return std::string(); } protected: virtual XVisualInfo *get_canvas_xvisualinfo() = 0; === modified file 'src/glcompbench.cc' --- src/glcompbench.cc 2011-06-23 13:52:16 +0000 +++ src/glcompbench.cc 2011-06-24 15:51:40 +0000 @@ -126,6 +126,13 @@ add_custom_benchmarks(benchmarks); canvas.init(); + + Log::info("=======================================================\n"); + Log::info(" glcompbench %s\n", GLCOMPBENCH_VERSION); + Log::info("=======================================================\n"); + Log::info("%s", canvas.info_string().c_str()); + Log::info("=======================================================\n"); + canvas.run_tests(benchmarks); return 0;