Created by Alexandros Frantzis on 2011-07-07 and last modified on 2014-03-10
Get this branch:
bzr branch lp:glmark2/2011.11
Members of glmark2 developers can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information

glmark2 developers

Recent revisions

288. By Alexandros Frantzis on 2014-03-10

Build,Doc: Update files for 2014.03 release

287. By Bernhard Rosenkraenzer on 2014-03-10

libpng: Allow compilation in C++11 mode

The "%s"m construct in the internal png.h copy is misinterpreted as a C++11
string literal.

286. By Daniel Kurtz on 2014-03-10

native-state-x11: Don't terminate --fullscreen if EWMH Atom not found

If the Atom "_NET_WM_STATE_FULLSCREEN" is not defined in the X server, it
could mean that the active Window Manager is not EWMH compliant, or that
there is no window manager at all. In this case, the XChangeProperty
will fail and the program will terminate with the message:

X Error of failed request: BadAtom (invalid Atom parameter)
  Major opcode of failed request: 18 (X_ChangeProperty)
  Atom id in failed request: 0x0
  Serial number of failed request: 28
  Current serial number in output stream: 30

Instead, if the Atom doesn't exist, don't call XChangeProperty, just log
a message and keep going. The window will still be fullscreen, it just
may still have decorations.

285. By Alexandros Frantzis on 2013-10-18

NativeStateMir: Update for newest Mir client API

284. By Jesse Barker on 2013-10-17

CanvasGeneric: fix inverted checks for destroying renderbuffers.

283. By Rafal Mielniczuk on 2013-09-04

NativeStateWayland: make wayland window opaque

We need to make window opaque in order to prevent redrawing background
behind it in some of the benchmarks, eg. jellyfish.


282. By Rafal Mielniczuk on 2013-08-28

NativeStateWayland: use wl_display_roundtrip in flip method

As noticed by Axel Davy we need to use wl_display_roundtrip in
NativeStateWayland::flip to prevent blocking when eglSwapInterval(0) is

More info:

281. By Jesse Barker on 2013-09-04

SceneShading: Adds a new 'cel' (or 'toon') shading model.

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

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.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
This branch contains Public information 
Everyone can see this information.