[PATCH 0/5] hw/xwin fixes and more (v2)

[Jon TURNEY]

On 10/12/2013 15:02, Keith Packard wrote:
> Adam Jackson writes:
>> On Sun, 2013-12-08 at 16:57 +0000, Jon TURNEY wrote:
>>> [3/5] depends on ajax's "Attempt to fix GLX for OSX" series
>>> [4/5] is unneeded if those tokens are added to gltokens.h in glproto instead
>>> [5/5] is another, perhaps better, attempt at updating XWin for the conversion to GL direct dispatch
>>
>> 3 modifies generated code, but I'm fine with that for now, I'll figure
>> out how to get Mesa to generate the right thing up front.
> 
> Thanks, Adam. I'm going to release an updated glproto with the new
> defines and then not include that patch in the X server.

Since glproto has been updated, I've dropped 4/5.  Here is a pull-request for
the remainder.


The following changes since commit e61e19959d9138d5b81b1f25b7aa3e257918170d:

  xquartz/glx: Convert to non-glapi dispatch (2013-12-10 08:04:30 -0800)

are available in the git repository at:

  git://people.freedesktop.org/~jturney/xserver master

for you to fetch changes up to 9a4d7572fe3be16bb5aded5f48d4217fdf725b1d:

  hw/xwin/glx: Rewrite WGL wrappers after Xserver conversion to direct GL
dispatch (2013-12-10 17:00:06 +0000)

----------------------------------------------------------------
Jon TURNEY (4):
      configure.ac: Link XWin with present extension if we are building with
it enabled
      ephyr: Fix compilation when ./configure'd with --enable-debug
      glx: Consistently use ARB-suffixed names for ARB_multitexture functions
      hw/xwin/glx: Rewrite WGL wrappers after Xserver conversion to direct GL
dispatch

 configure.ac                        |  16 ++--
 glx/indirect_dispatch.c             |  26 +++---
 glx/indirect_dispatch_swap.c        |  72 ++++++++---------
 hw/kdrive/ephyr/ephyr.c             |   8 +-
 hw/xwin/Makefile.am                 |   2 +-
 hw/xwin/glx/Makefile.am             |  32 ++++++--
 hw/xwin/glx/gen_gl_wrappers.py      | 766
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------
 hw/xwin/glx/glshim.c                | 124 +++++++++++++++++++++++++++++
 hw/xwin/glx/{glwrap.c => glthunk.c} |  77 +++---------------
 hw/xwin/glx/glwindows.h             |   7 +-
 hw/xwin/glx/indirect.c              |  30 ++++---
 11 files changed, 707 insertions(+), 453 deletions(-)
 create mode 100644 hw/xwin/glx/glshim.c
 rename hw/xwin/glx/{glwrap.c => glthunk.c} (55%)