From patchwork Tue Oct 18 14:19:09 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: 4728 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 D2E0B23E51 for ; Tue, 18 Oct 2011 14:19:11 +0000 (UTC) Received: from mail-gy0-f180.google.com (mail-gy0-f180.google.com [209.85.160.180]) by fiordland.canonical.com (Postfix) with ESMTP id 94B00A18301 for ; Tue, 18 Oct 2011 14:19:11 +0000 (UTC) Received: by gyf1 with SMTP id 1so885938gyf.11 for ; Tue, 18 Oct 2011 07:19:11 -0700 (PDT) Received: by 10.223.17.11 with SMTP id q11mr4379049faa.13.1318947550666; Tue, 18 Oct 2011 07:19:10 -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.152.1.71 with SMTP id 7cs47060lak; Tue, 18 Oct 2011 07:19:10 -0700 (PDT) Received: by 10.213.7.18 with SMTP id b18mr351314ebb.100.1318947549856; Tue, 18 Oct 2011 07:19:09 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id w3si1604444wec.107.2011.10.18.07.19.09 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 18 Oct 2011 07:19:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) smtp.mail=bounces@canonical.com Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1RGAVZ-00045L-Ay for ; Tue, 18 Oct 2011 14:19:09 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 44E7BE0042 for ; Tue, 18 Oct 2011 14:19:09 +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: 156 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~glmark2-dev/glmark2/trunk] Rev 156: Android: Display glmark2 version in logs. Message-Id: <20111018141909.28464.30460.launchpad@ackee.canonical.com> Date: Tue, 18 Oct 2011 14:19:09 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="14157"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 0ce70f36adf9f720402c5284b033d5f1a646fff2 ------------------------------------------------------------ revno: 156 committer: Alexandros Frantzis branch nick: trunk timestamp: Mon 2011-10-17 13:13:12 +0300 message: Android: Display glmark2 version in logs. modified: android/jni/Android.mk android/jni/Android.ndk.mk src/android.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 'android/jni/Android.mk' --- android/jni/Android.mk 2011-08-16 12:33:21 +0000 +++ android/jni/Android.mk 2011-10-17 10:13:12 +0000 @@ -27,7 +27,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libglmark2-android LOCAL_STATIC_LIBRARIES := libglmark2-matrix libglmark2-png -LOCAL_CFLAGS := -DUSE_GLESv2 -DGLMARK_DATA_PATH="" +LOCAL_CFLAGS := -DUSE_GLESv2 -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2011.09\"" LOCAL_SHARED_LIBRARIES := liblog libz libEGL libGLESv2 libandroid libdl libstlport LOCAL_C_INCLUDES := $(LOCAL_PATH)/src \ $(LOCAL_PATH)/src/libmatrix \ === modified file 'android/jni/Android.ndk.mk' --- android/jni/Android.ndk.mk 2011-08-16 12:22:17 +0000 +++ android/jni/Android.ndk.mk 2011-10-17 10:13:12 +0000 @@ -23,7 +23,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libglmark2-android LOCAL_STATIC_LIBRARIES := libglmark2-matrix libglmark2-png -LOCAL_CFLAGS := -DUSE_GLESv2 -DGLMARK_DATA_PATH="" +LOCAL_CFLAGS := -DUSE_GLESv2 -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2011.09\"" LOCAL_LDLIBS := -landroid -llog -lGLESv2 -lEGL -lz LOCAL_C_INCLUDES := $(LOCAL_PATH)/src \ $(LOCAL_PATH)/src/libmatrix \ === modified file 'src/android.cpp' --- src/android.cpp 2011-10-13 15:59:20 +0000 +++ src/android.cpp 2011-10-17 10:13:12 +0000 @@ -79,7 +79,7 @@ g_canvas = new CanvasAndroid(100, 100); g_canvas->init(); - Log::info("glmark2\n"); + Log::info("glmark2 %s\n", GLMARK_VERSION); g_canvas->print_info(); Benchmark::register_scene(*new SceneDefaultOptions(*g_canvas));