← Back to branch summary

~glmark2-dev/glmark2/trunk

~glmark2-dev/glmark2/trunk

Viewing all changes in revision 206.

Committer: Jesse Barker
Date: 2012-05-10 14:30:47 UTC
mfrom: (204.1.25 ideas)
Revision ID: jesse.barker@linaro.org-20120510143047-sribqm4otlmjcaf8

Merging lp:~glmark2-dev/glmark2/ideas

Adds new SceneIdeas.

files added:
COPYING.SGI

data/shaders/ideas-lamp-lit.frag

data/shaders/ideas-lamp-lit.vert

data/shaders/ideas-lamp-unlit.frag

data/shaders/ideas-lamp-unlit.vert

data/shaders/ideas-logo-flat.frag

data/shaders/ideas-logo-flat.vert

data/shaders/ideas-logo-shadow.frag

data/shaders/ideas-logo-shadow.vert

data/shaders/ideas-logo.frag

data/shaders/ideas-logo.vert

data/shaders/ideas-paper.frag

data/shaders/ideas-paper.vert

data/shaders/ideas-table.frag

data/shaders/ideas-table.vert

data/shaders/ideas-text.frag

data/shaders/ideas-text.vert

data/shaders/ideas-under-table.frag

data/shaders/ideas-under-table.vert

src/scene-ideas

src/scene-ideas.cpp

src/scene-ideas/a.cc

src/scene-ideas/characters.h

src/scene-ideas/d.cc

src/scene-ideas/e.cc

src/scene-ideas/i.cc

src/scene-ideas/lamp.cc

src/scene-ideas/lamp.h

src/scene-ideas/logo.cc

src/scene-ideas/logo.h

src/scene-ideas/m.cc

src/scene-ideas/n.cc

src/scene-ideas/o.cc

src/scene-ideas/s.cc

src/scene-ideas/splines.cc

src/scene-ideas/splines.h

src/scene-ideas/t.cc

src/scene-ideas/table.cc

src/scene-ideas/table.h

files modified:
android/jni/Android.ndk.mk

src/android.cpp

src/default-benchmarks.h

src/libmatrix/program.cc

src/libmatrix/program.h

src/main.cpp

src/scene.h

src/wscript_build

Show diffs side-by-side

added added

removed removed

android/jni/Android.ndk.mk

data/shaders/ideas-lamp-lit.frag

data/shaders/ideas-lamp-lit.vert

data/shaders/ideas-lamp-unlit.frag

data/shaders/ideas-lamp-unlit.vert

data/shaders/ideas-logo-flat.frag

data/shaders/ideas-logo-flat.vert

data/shaders/ideas-logo-shadow.frag

data/shaders/ideas-logo-shadow.vert

data/shaders/ideas-logo.frag

data/shaders/ideas-logo.vert

data/shaders/ideas-paper.frag

data/shaders/ideas-paper.vert

data/shaders/ideas-table.frag

data/shaders/ideas-table.vert

data/shaders/ideas-text.frag

data/shaders/ideas-text.vert

data/shaders/ideas-under-table.frag

data/shaders/ideas-under-table.vert

src/android.cpp

src/default-benchmarks.h

src/libmatrix/program.cc

src/libmatrix/program.h

src/scene-ideas.cpp

src/scene-ideas/

src/scene-ideas/a.cc

src/scene-ideas/characters.h

src/scene-ideas/d.cc

src/scene-ideas/e.cc

src/scene-ideas/i.cc

src/scene-ideas/lamp.cc

src/scene-ideas/lamp.h

src/scene-ideas/logo.cc

src/scene-ideas/logo.h

src/scene-ideas/m.cc

src/scene-ideas/n.cc

src/scene-ideas/o.cc

src/scene-ideas/s.cc

src/scene-ideas/splines.cc

src/scene-ideas/splines.h

src/scene-ideas/t.cc

src/scene-ideas/table.cc

src/scene-ideas/table.h

src/wscript_build

Older »