lp:~linaro-graphics-wg/glmark2/scene-terrain

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:glmark2/2011.11 at revision 229

Jesse Barker: Approve on 2012-07-03

Diff: 2381 lines (+2174/-6)

26 files modified

android/jni/Android.mk (+2/-0)
android/jni/Android.ndk.mk (+2/-0)
data/shaders/terrain-blur.frag (+14/-0)
data/shaders/terrain-luminance.frag (+15/-0)
data/shaders/terrain-noise.frag (+124/-0)
data/shaders/terrain-normalmap.frag (+15/-0)
data/shaders/terrain-overlay.frag (+10/-0)
data/shaders/terrain-texture.vert (+18/-0)
data/shaders/terrain.frag (+112/-0)
data/shaders/terrain.vert (+48/-0)
src/android.cpp (+1/-0)
src/main.cpp (+1/-0)
src/scene-terrain.cpp (+355/-0)
src/scene-terrain/base-renderer.cpp (+144/-0)
src/scene-terrain/blur-renderer.cpp (+161/-0)
src/scene-terrain/copy-renderer.cpp (+55/-0)
src/scene-terrain/luminance-renderer.cpp (+57/-0)
src/scene-terrain/normal-from-height-renderer.cpp (+59/-0)
src/scene-terrain/overlay-renderer.cpp (+122/-0)
src/scene-terrain/renderer-chain.cpp (+115/-0)
src/scene-terrain/renderer.h (+347/-0)
src/scene-terrain/simplex-noise-renderer.cpp (+56/-0)
src/scene-terrain/terrain-renderer.cpp (+246/-0)
src/scene-terrain/texture-renderer.cpp (+69/-0)
src/scene.h (+20/-0)
src/wscript_build (+6/-6)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

230. By Alexandros Frantzis on 2012-07-03

SceneTerrain: Ensure implementation supports vertex texture fetch before running.

229. By Alexandros Frantzis on 2012-06-29

SceneTerrain: Add "bloom" and "tilt-shift" scene options.

228. By Alexandros Frantzis on 2012-06-29

SceneTerrain: Add "repeat-overlay" scene option.

227. By Alexandros Frantzis on 2012-06-29

SceneTerrain: Add scene based on WebGL dynamic terrain demo.

226. By Alexandros Frantzis on 2012-06-28

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

225. By Jesse Barker on 2012-06-27

SceneIdeas: Convert all element array handling from unsigned int to unsigned short.
OpenGL ES 2.0 only allows GL_UNSIGNED_BYTE or GL_UNSIGNED_SHORT for the index
type, and the use of GL_UNSIGNED_INT, while legal for OpenGL and permitted by
several OpenGL ES 2.0 implmentations generates an error on stricter ones.

224. By Alexandros Frantzis on 2012-06-21

Build,Doc: Update files for 2012.06 release.

223. By Alexandros Frantzis on 2012-06-15

CanvasX11,Doc: Support running in fullscreen mode (--fullscreen).

222. By Alexandros Frantzis on 2012-06-15

MainLoop,Android: Display average frame time in addition to FPS for each scene.

221. By Alexandros Frantzis on 2012-06-11

Build: Exclude *.pyc files from the distribution tarball.