lp:~glmark2-dev/glmark2/ideas

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:glmark2/2011.11 at revision 206

Alexandros Frantzis: Approve on 2012-05-10

Diff: 4613 lines (+4301/-3)

46 files modified

COPYING.SGI (+40/-0)
android/jni/Android.ndk.mk (+14/-1)
data/shaders/ideas-lamp-lit.frag (+68/-0)
data/shaders/ideas-lamp-lit.vert (+28/-0)
data/shaders/ideas-lamp-unlit.frag (+6/-0)
data/shaders/ideas-lamp-unlit.vert (+11/-0)
data/shaders/ideas-logo-flat.frag (+6/-0)
data/shaders/ideas-logo-flat.vert (+9/-0)
data/shaders/ideas-logo-shadow.frag (+10/-0)
data/shaders/ideas-logo-shadow.vert (+9/-0)
data/shaders/ideas-logo.frag (+35/-0)
data/shaders/ideas-logo.vert (+28/-0)
data/shaders/ideas-paper.frag (+6/-0)
data/shaders/ideas-paper.vert (+22/-0)
data/shaders/ideas-table.frag (+6/-0)
data/shaders/ideas-table.vert (+22/-0)
data/shaders/ideas-text.frag (+6/-0)
data/shaders/ideas-text.vert (+18/-0)
data/shaders/ideas-under-table.frag (+6/-0)
data/shaders/ideas-under-table.vert (+11/-0)
src/android.cpp (+1/-0)
src/default-benchmarks.h (+1/-0)
src/libmatrix/program.cc (+12/-0)
src/libmatrix/program.h (+1/-0)
src/main.cpp (+1/-0)
src/scene-ideas.cpp (+426/-0)
src/scene-ideas/a.cc (+179/-0)
src/scene-ideas/characters.h (+157/-0)
src/scene-ideas/d.cc (+142/-0)
src/scene-ideas/e.cc (+139/-0)
src/scene-ideas/i.cc (+116/-0)
src/scene-ideas/lamp.cc (+258/-0)
src/scene-ideas/lamp.h (+64/-0)
src/scene-ideas/logo.cc (+789/-0)
src/scene-ideas/logo.h (+126/-0)
src/scene-ideas/m.cc (+210/-0)
src/scene-ideas/n.cc (+146/-0)
src/scene-ideas/o.cc (+139/-0)
src/scene-ideas/s.cc (+130/-0)
src/scene-ideas/splines.cc (+200/-0)
src/scene-ideas/splines.h (+83/-0)
src/scene-ideas/t.cc (+147/-0)
src/scene-ideas/table.cc (+353/-0)
src/scene-ideas/table.h (+94/-0)
src/scene.h (+21/-0)
src/wscript_build (+5/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

229. By Jesse Barker on 2012-05-09

SceneIdeas: Update the comment for clarity.

228. By Jesse Barker on 2012-05-09

SceneIdeas: Use Alexandros' suggestion to reverse time at the end of each 'cycle'
through the fly around.

227. By Jesse Barker on 2012-05-09

Move SceneIdeas to after SceneBuffer in the default initialization of the
benchmark list.

226. By Jesse Barker on 2012-05-09

SceneIdeas: Add to default benchmark list.

225. By Jesse Barker on 2012-05-09

SceneIdeas: Remove extraneous comment.

224. By Jesse Barker on 2012-05-08

Android: Revert change to use gnustl rather than stlport as gnu-specific STL
usage was changed in the source.

223. By Jesse Barker on 2012-05-08

SceneIdeas: Using less gnu-specific accessor method for std::vector data access.

222. By Jesse Barker on 2012-05-08

SceneIdeas: Update benchmark registration for Android to include the new scene.

221. By Jesse Barker on 2012-05-07

SceneIdeas: Update Android build to support the new scene.

220. By Jesse Barker on 2012-05-07

SceneIdeas: Handle the run-forever command line option cleanly, including setup
and teardown, and resetting the frame count so the fps numbers make sense across
iterations. Also, take the opportunity to implement a speed control, which gives
us a nice demo with no overhead (apart from getting the options around duration,
speed, and repeating correct).