Now that 1.10.1 is out the door, I'm willing to pull these changes in. You mentioned you had more to add. Should I merge these in now, or do you want to send me a new request with the additional changes?
On Apr 4, 2011, at 1:02 PM, Adam Jackson wrote: > This is a rather large pull request for a stable series, I admit, but I think > it's worthwhile. I've tested it on Intel GM45 with Gnome 3 and everything > works as before. I've also compared the clutter conformance test runs from > clutter 1.6.12 before and after this series, on the same hardware. Both > before and after all clutter tests pass in direct GLX contexts. However, for > indirect GLX: > > synephrine:~/fedora/clutter/clutter-1.6.12/tests/conform% diff -u > pre-1.10-iglx post-1.10-iglx | grep -- -FAIL > -FAIL: wrappers/test-texture-fbo > -FAIL: wrappers/test-cogl-backface-culling > -FAIL: wrappers/test-cogl-materials > -FAIL: wrappers/test-cogl-readpixels > -FAIL: wrappers/test-cogl-texture-mipmaps > -FAIL: wrappers/test-cogl-sub-texture > -FAIL: wrappers/test-cogl-texture-pixmap-x11 > -FAIL: wrappers/test-cogl-texture-get-set-data > -FAIL: wrappers/test-cogl-atlas-migration > -FAIL: wrappers/test-cogl-viewport > -FAIL: wrappers/test-cogl-offscreen > synephrine:~/fedora/clutter/clutter-1.6.12/tests/conform% diff -u > pre-1.10-iglx post-1.10-iglx | grep -- +FAIL | wc -l > 0 > synephrine:~/fedora/clutter/clutter-1.6.12/tests/conform% grep FAIL > post-1.10-iglx | wc -l > 0 > > So, fixes all existing failures, and introduces no new failures. I've > trimmed off the more trivial changes to glx/ from master, this should just be > the functional bits. > > --- > > The following changes since commit 49afcc76a1c799e18931cc762431975c5c059437: > > XQuartz: Bump bundle version to 2.6.2 (2011-04-04 09:38:35 -0700) > > are available in the git repository at: > ssh://people.freedesktop.org/~ajax/xserver.git server-1.10-iglx > > Adam Jackson (8): > glx: Remove unused _glapi_get_proc_offset and friends > glx: Simplify _glapi_check_multithread > glx: Remove unused _glapi_get_proc_name > glx: Add texbuffer2 support to swrast > glx: Remove noop dispatch table > glx: Lobotomize _glapi_get_proc_address > glx: Fix _glapi_add_dispatch > glx: Reimplement context tags > > glx/Makefile.am | 1 - > glx/glapi.c | 558 +---- > glx/glapi.h | 28 - > glx/glapitemp.h | 6655 ---------------------------------------------- > glx/glxcmds.c | 98 +- > glx/glxdriswrast.c | 8 + > glx/glxext.c | 31 - > glx/glxserver.h | 7 - > hw/xquartz/GL/indirect.c | 9 - > 9 files changed, 65 insertions(+), 7330 deletions(-) > delete mode 100644 glx/glapitemp.h > > - ajax > _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
