lp:~glmark2-dev/glmark2/egl-state
- Get this branch:
- bzr branch lp:~glmark2-dev/glmark2/egl-state
Branch merges
- Alexandros Frantzis: Approve
- Jesse Barker: Needs Resubmitting
-
Diff: 1100 lines (+700/-264)8 files modifiedsrc/canvas-x11-egl.cpp (+21/-243)
src/canvas-x11-egl.h (+6/-19)
src/canvas-x11-glx.h (+1/-0)
src/canvas-x11.cpp (+3/-0)
src/canvas-x11.h (+9/-0)
src/egl-state.cpp (+527/-0)
src/egl-state.h (+130/-0)
src/wscript_build (+3/-2)
Branch information
Recent revisions
- 253. By Jesse Barker
-
EGLState: A few bits of clean up based upon review comments.
- Remove X11-specific native visual type info as it breaks Android build
(and is not likely to be of interest anyway).
- Remove 'info' level EGL info around extensions, vendor, etc. We don't do it
for GLX apart from minimum version requirements (which we don't have for EGL).
- Tweak config initialization to match more closely what was originally in
CanvasX11EGL, in particular, define the config attribs according to the
GLVisualConfig we were given and don't override it. - 252. By Jesse Barker
-
EGLState: Clean up config handling and output so that it builds properly and
works well for both an X11-based and a DRM-based canvas. - 251. By Jesse Barker
-
CanvasX11{EGL,GLX}: Integrate new EGLState object. This requires a small bit
of new plumbing so that there is an explicit acknowledgement of the window
system integration layer (::init_gl_winsys( )). Additional canvas objects that
do not integrate through X11 will not need this as there won't be the
added legacy of GLX. - 250. By Jesse Barker
-
EGLState: Consolidate all EGL interactions into a separate object. This cleans
up the canvas implementation and paves the way for additional window system
integrations (raw KMS device, Wayland, etc.). - 249. By Jesse Barker
-
CanvasX11GLX: Updates to handle the API change for GLX_EXT_
swap_control
(The spec always had a void return value for glXSwapIntervalEXT, however, the
original example and protocol had a return value of int. To make matters worse,
the header files in mesa were updated a year after the spec.). Also, make the
GLX_MESA_swap_control initialization match the new logic for GLX_EXT_ swap_control. - 247. By Alexandros Frantzis
-
MainLoop,Android: Exclude from score calculations benchmarks that weren't set up correctly.
- 245. By Alexandros Frantzis
-
Android: Properly handle spaces in extra intent options.
Surround the benchmark text definitions in quotes to ensure spaces are
properly handled. This leverages the recently introduced (rev 244)
Util::split() support for bash-like quoting rules. - 244. By Alexandros Frantzis
-
libmatrix: Sync with lp:libmatrix revision 41.
Update Util::split() invocations in glmark2 to use the new interface.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:glmark2/2011.11