lp:~glmark2-dev/glmark2/cel-shading

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:glmark2/2011.11 at revision 281

Alexandros Frantzis: Approve on 2013-09-04

Diff: 102 lines (+68/-1)

3 files modified

data/shaders/light-cel.frag (+60/-0)
src/default-benchmarks.h (+1/-0)
src/scene-shading.cpp (+7/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

283. By Jesse Barker on 2013-08-13

DefaultBenchmarks: Add an instance of SceneShading using the cel shader to
the default list of scenes.

282. By Jesse Barker on 2013-08-13

SceneShading: Tweak the cel shader to make the effect more visually
interesting (the actual math doesn't change). Green on black makes for
better contrast than blue on black; also tweak the light position to
preserve some of the surface detail a little better.

281. By Jesse Barker on 2013-08-09

SceneShading: Add support for a new shading model, "cel" or "toon" shading,
which yields a cartoon-like appearance.

280. By Jesse Barker on 2013-08-07

Fix for bug 1208996. Merged from lp:~jbkonno/+junk/glmark2/revision/279.

Add stub methods for new Wayland output events.

279. By Jesse Barker on 2013-08-07

Fix for bug 1209259. Make sure to include cstring for 'memcpy' declaration.

278. By Alexandros Frantzis on 2013-06-21

*: Clean up unused includes and functions

277. By Rafal Mielniczuk on 2013-06-21

NativeStateWayland: improve destructor

We must check if objects have been allocated before deleting them. This
prevents crashes when invoking client with eg. --list or --help flags.
This patch also cleanup some unused method declarations from header
file.

276. By Jesse Barker on 2013-06-12

Scene{Shadow,Refract}: When testing on Nexus 10, it was discovered that the
default texture allocation for these scenes can blow out the max texture size
for an implementation (canvas size on that platform is 2560 x 1504, which
makes us try to allocate textures at 5120 x 3008). So, clamp the texture
dimensions while maintaining proper aspect ratio.

275. By Jesse Barker on 2013-06-11

CanvasGeneric: Check buffer object handles before calling delete. While it is
perfectly legal and harmless to delete an object handle of zero, there are
times when we do this before having made a context current, which _should_ be
harmless (because implementations don't like to crash), but it not really cool.

274. By Jesse Barker on 2013-05-27

SceneCollection: Consolidate the scene vector population into an object to
simplify adding scenes across platforms (rather than having to add for Android
separately from others).