lp://staging/~linaro-graphics-wg/glmark2/android-gui-options-finite-value-set

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/glmark2/2011.11 at revision 234

Jesse Barker: Approve on 2012-07-18

Diff: 171 lines (+54/-10)

3 files modified

android/src/org/linaro/glmark2/EditorActivity.java (+32/-7)
android/src/org/linaro/glmark2/SceneInfo.java (+7/-1)
src/android.cpp (+15/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

235. By Alexandros Frantzis on 2012-07-18

Android: Display a list of acceptable values instead of a text entry for options that have such a list.

234. By Alexandros Frantzis on 2012-07-18

Android: Make acceptable values of options available to the java code.

233. By Alexandros Frantzis on 2012-07-18

Add support for options that have a finite set of acceptable values.

This includes listing the values in --list-scenes, and warning the users if
they use unacceptable values.

232. By Alexandros Frantzis on 2012-07-11

SceneJellyfish: Properly initialize member variables.

231. By Alexandros Frantzis on 2012-07-10

Android: Create a GUI for defining and running benchmarks.

230. By Jesse Barker on 2012-07-09

Merge of lp:~glmark2-dev/glmark2/jellyfish.

Adds new scene (SceneJellyfish) based upon Aleksandar Rodic's WebGL demo.

229. By Alexandros Frantzis on 2012-07-04

SceneTerrain: Add scene based on WebGL dynamic terrain demo.

228. By Alexandros Frantzis on 2012-07-04

SceneIdeas,SceneTexture: Properly initialize member variables.

227. By Jesse Barker on 2012-06-28

Merge of lp:~glmark2-dev/glmark2/texgen

SceneTexture: Add an option to compute the texture coordinates in the shader
rather than supplying them as a vertex attribute. This also includes a new
shader to support this.

226. By Alexandros Frantzis on 2012-06-28

Texture: Refactor image reading infrastructure and add support for JPEG files.