lp://qastaging/~linaro-graphics-wg/glmark2/android-gui-log

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/glmark2/2011.11 at revision 242

Jesse Barker: Approve on 2012-07-31

Alexandros Frantzis: Pending requested 2012-07-31

Diff: 525 lines (+191/-61)

13 files modified

android/AndroidManifest.xml (+6/-1)
android/res/layout/activity_results.xml (+15/-0)
android/res/menu/main_options_menu.xml (+4/-0)
android/res/values/strings.xml (+6/-0)
android/res/xml/preferences.xml (+8/-0)
android/src/org/linaro/glmark2/Glmark2Native.java (+2/-1)
android/src/org/linaro/glmark2/Glmark2SurfaceView.java (+4/-1)
android/src/org/linaro/glmark2/MainActivity.java (+23/-3)
android/src/org/linaro/glmark2/ResultsActivity.java (+58/-0)
src/android.cpp (+13/-3)
src/libmatrix/log.cc (+45/-50)
src/libmatrix/log.h (+6/-1)
wscript (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

247. By Alexandros Frantzis on 2012-07-31

Android: Add "Show benchmark results" preference.

246. By Alexandros Frantzis on 2012-07-31

Android: Display results after running benchmarks.

245. By Alexandros Frantzis on 2012-07-30

Android: Add option to enable/disable debug message logging.

244. By Alexandros Frantzis on 2012-07-30

Android: Add and implement option menu action to show last results.

243. By Alexandros Frantzis on 2012-07-30

Android: Store the log output to a file.

242. By Alexandros Frantzis on 2012-07-30

Log: Support extra output stream for log messages.

241. By Alexandros Frantzis on 2012-07-27

Android: Add options menu and implement menu actions.

240. By Alexandros Frantzis on 2012-07-27

Include <stdint.h> to ensure proper builds on all architectures and OSes.

239. By Jesse Barker on 2012-07-26

SceneJellyfish: Save and restore custom GL state so other scenes are unaffected
when "reuse-context" is enabled.

238. By Alexandros Frantzis on 2012-07-19

Build,Doc: Update files for 2012.07 release.