From patchwork Fri Jun 24 15:00:47 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: 2300 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 C13242404C for ; Fri, 24 Jun 2011 15:00:50 +0000 (UTC) Received: from mail-qy0-f180.google.com (mail-qy0-f180.google.com [209.85.216.180]) by fiordland.canonical.com (Postfix) with ESMTP id 8B3AEA182F2 for ; Fri, 24 Jun 2011 15:00:50 +0000 (UTC) Received: by qyk30 with SMTP id 30so2086936qyk.11 for ; Fri, 24 Jun 2011 08:00:50 -0700 (PDT) Received: by 10.229.117.95 with SMTP id p31mr2599656qcq.97.1308927649874; Fri, 24 Jun 2011 08:00:49 -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 jm11cs50839qcb; Fri, 24 Jun 2011 08:00:49 -0700 (PDT) Received: by 10.216.62.3 with SMTP id x3mr732391wec.77.1308927648199; Fri, 24 Jun 2011 08:00:48 -0700 (PDT) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id v30si6288684wer.128.2011.06.24.08.00.47; Fri, 24 Jun 2011 08:00:48 -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 1Qa7sF-0005kz-Io for ; Fri, 24 Jun 2011 15:00:47 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id 8C40A2E808B for ; Fri, 24 Jun 2011 15:00:47 +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: 38 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~glcompbench-dev/glcompbench/trunk] Rev 38: Update glcompbench description and window title. Message-Id: <20110624150047.26723.77313.launchpad@loganberry.canonical.com> Date: Fri, 24 Jun 2011 15:00:47 -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: 9b5554da86e8e33bc78f3e98d28a1fe68d0693cb ------------------------------------------------------------ revno: 38 committer: Alexandros Frantzis branch nick: trunk timestamp: Fri 2011-06-24 16:44:02 +0300 message: Update glcompbench description and window title. modified: src/composite-canvas.cc src/options.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.cc' --- src/composite-canvas.cc 2011-06-23 13:52:16 +0000 +++ src/composite-canvas.cc 2011-06-24 13:44:02 +0000 @@ -26,6 +26,7 @@ #include #include #include +#include #include #include @@ -40,6 +41,8 @@ #include "log.h" #include "profiler.h" +const std::string glcompbench_version_string("glcompbench "GLCOMPBENCH_VERSION); + /******************* * Private methods * *******************/ @@ -537,7 +540,7 @@ /* Create the X window we are going to draw on */ width_ = Options::size; height_ = Options::size; - canvas_ = create_canvas_x_window("EGLImage TFP - Composite", 0, 0, + canvas_ = create_canvas_x_window(glcompbench_version_string.c_str(), 0, 0, width_, height_, vis_info); XFree(vis_info); === modified file 'src/options.cc' --- src/options.cc 2011-06-23 14:18:23 +0000 +++ src/options.cc 2011-06-24 13:44:02 +0000 @@ -77,7 +77,7 @@ void Options::print_help() { - printf("An EGL/GLES2.0 example of using EGL_KHR_image_pixmap with XComposite.\n" + printf("An OpenGL (ES) 2.0 compositing benchmark\n" "\n" "Options:\n" " -i, --ids IDs A comma separated list of window ids to track\n"