lp://qastaging/~linaro-graphics-wg/glmark2/main-loop-consolidation

Branch merges

Propose for merging

No branches dependent on this one.

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

Jesse Barker: Approve on 2012-02-13

Diff: 655 lines (+403/-156)

6 files modified

src/android.cpp (+24/-44)
src/main-loop.cpp (+236/-0)
src/main-loop.h (+121/-0)
src/main.cpp (+14/-104)
src/scene.cpp (+0/-7)
src/scene.h (+8/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

200. By Alexandros Frantzis on 2012-02-13

Android: Port Android main file to use the MainLoop infrastructure.

199. By Alexandros Frantzis on 2012-02-13

Main: Port X11 main file to use the MainLoop infrastructure.

198. By Alexandros Frantzis on 2012-02-13

MainLoop: Add class implementing main loop functionality.

197. By Alexandros Frantzis on 2012-02-09

Scene: Rename method that gets whether a scene is running, and add method to change it.

196. By Alexandros Frantzis on 2012-02-13

Build: Update and synchronize X11 and Android compilation flags.

Add -Wnon-virtual-dtor, and remove -fms-extensions, as it is not used any more.

195. By Alexandros Frantzis on 2012-02-13

Android,Util: Fix build warnings.

194. By Jim Huang on 2012-02-13

SceneDesktop: Add virtual destructor to class with virtual methods.

193. By Jesse Barker on 2012-01-27

Merge of lp:~glmark2-dev/glmark2/libmatrix-util.

This brings glmark2 up to date with the current libmatrix, including a couple of
new features that resulted from the actual integration. The primary result is
that previously duplicated code is now consolidated in one common place
(lp:libmatrix).

192. By Alexandros Frantzis on 2012-01-19

Build,Doc: Update files for 2012.01 release.

191. By Alexandros Frantzis on 2012-01-19

Main: Implement seamless transition of FPS display when changing scenes.