lp:~glmark2-dev/glmark2/canvas-reset

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:glmark2/2011.11 at revision 189

Alexandros Frantzis: Pending requested 2012-01-17

Diff: 399 lines (+132/-24)

12 files modified

doc/glmark2.1.in (+4/-0)
src/canvas-x11-egl.cpp (+46/-10)
src/canvas-x11-egl.h (+2/-0)
src/canvas-x11-glx.cpp (+9/-0)
src/canvas-x11-glx.h (+1/-0)
src/canvas-x11.cpp (+17/-9)
src/canvas-x11.h (+10/-0)
src/canvas.h (+10/-0)
src/main.cpp (+6/-0)
src/options.cpp (+6/-0)
src/options.h (+1/-0)
src/scene-desktop.cpp (+20/-5)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

183. By Alexandros Frantzis on 2012-01-18

SceneDesktop: Allow RenderObjects to be safely reused after a GL context change.

When setting the size of a RenderObject, "clear" the texture contents if
they were invalidated, even if the texture size didn't change.

182. By Jesse Barker on 2012-01-17

SceneDesktop: Fix asymmetry discovered when we started using a fresh context for
each scene. The release of RenderObject and derived classes was not being handled
properly. Make sure to perform one (and only one :-) release for each init.
Best not to handle this from the destructor as double-taps are to easy to encounter.

181. By Jesse Barker on 2012-01-17

Update the man page to reflect the new option to reuse the context, as well as
describe the default behavior.

180. By Jesse Barker on 2012-01-04

Add an option to allow all scenes to use the same context (--reuse-context).
Default state is to create a fresh context for each scene.

179. By Jesse Barker on 2012-01-04

CanvasX11EGL: Make sure to check whether we have already created our context in
the ensure_egl_context member.

178. By Jesse Barker on 2012-01-04

CanvasX11*: Add a reset method to the main CanvasX11 object, and add a reset_context
method to the GLX and EGL derivatives. This allows us to destroy and recreate
the context between test scenarios giving them a clean slate, and preventing
resource leaks.

177. By Alexandros Frantzis on 2011-12-15

Build,Doc: Update files for 2011.12 release.

176. By Alexandros Frantzis on 2011-12-12

ShaderSource: Always try to guess the shader type before emitting the shader string.

Previously, the shader type inference only took place if the precision hadn't
been explicitly set for a ShaderSource object. This change ensures that the
inference is always attempted.

175. By Alexandros Frantzis on 2011-12-08

Scene: Calculate the average fps value on demand.

174. By Alexandros Frantzis on 2011-12-08

Scene*: Eliminate duplication of scene update code.