diff mbox

[Branch,~glcompbench-dev/glcompbench/trunk] Rev 38: Update glcompbench description and window title.

Message ID 20110624150047.26723.77313.launchpad@loganberry.canonical.com
State Accepted
Headers show

Commit Message

alexandros.frantzis@linaro.org June 24, 2011, 3 p.m. UTC 
------------------------------------------------------------
revno: 38
committer: Alexandros Frantzis <alexandros.frantzis@linaro.org>
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
diff mbox

Patch

=== 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 <inttypes.h>
 #include <sys/time.h>
 #include <sstream>
+#include <string>
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
@@ -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"