lp:~linaro-graphics-wg/glmark2/desktop

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:glmark2/2011.11 at revision 130

Jesse Barker: Pending requested 2011-09-12

Diff: 958 lines (+848/-8)

9 files modified

data/shaders/desktop-blur.frag (+17/-0)
data/shaders/desktop.frag (+14/-0)
data/shaders/desktop.vert (+11/-0)
src/android.cpp (+2/-0)
src/canvas-android.cpp (+2/-2)
src/canvas-x11.cpp (+6/-6)
src/main.cpp (+2/-0)
src/scene-desktop.cpp (+775/-0)
src/scene.h (+19/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

140. By Alexandros Frantzis on 2011-09-13

SceneDesktop: Code cleanup.

139. By Alexandros Frantzis on 2011-09-13

SceneDesktop: Set texture and fbo variables to 0 after deleting their resources.

138. By Alexandros Frantzis on 2011-09-12

SceneDesktop: Perform a dummy rendering when creating the windows to draw.

This is done in order to ensure internal shaders are initialized during
setup and not when actually running the benchmark.

137. By Alexandros Frantzis on 2011-09-12

Add an instance of SceneDesktop to the default benchmarks.

136. By Alexandros Frantzis on 2011-09-12

Register the desktop scene in the android main file.

135. By Alexandros Frantzis on 2011-09-12

Update default options for SceneDesktop.

134. By Alexandros Frantzis on 2011-09-12

Use a gaussian blur instead of a box blur for the desktop blur effect.

133. By Alexandros Frantzis on 2011-09-09

Add support for separable convolution for the blur effect.

132. By Alexandros Frantzis on 2011-09-09

Add limited support for blur radius.

At this time we only support radii of 1 (3x3 kernel) and 2 (5x5 kernel).

131. By Alexandros Frantzis on 2011-09-09

Add SceneDesktop and blur effect.