[PULL] xserver-next, 2011-03-28

[Adam Jackson]

Contains all the reviewed GLX fixes plus some minor cleanups.

---

The following changes since commit a095a6d4e8f5090907e8d3d66018636216300846:

   Merge remote-tracking branch 'airlied/pwin-cleanup' (2011-03-27 
20:06:29 -0700)

are available in the git repository at:

   ssh://people.freedesktop.org/~ajax/xserver.git xserver-next

Adam Jackson (14):
       glx: Remove noop dispatch table
       glx: Lobotomize _glapi_get_proc_address
       glx: Update some glapi comments
       glx: Flatten -DXFree86Server
       glx: Fix _glapi_add_dispatch
       glx: Reimplement context tags
       glx: Remove ->forceCurrent from the context vtable
       glx: Remove some obfuscatory macros
       glx: dead variable removal
       glx: minor cast cleanup
       dix: Small refactor to resource deletion
       render: warning fixes
       xfree86: warning fix
       xfree86: warning fix

  dix/resource.c                 |   34 +-
  glx/Makefile.am                |    2 -
  glx/glapi.c                    |  434 +---
  glx/glapi.h                    |    6 -
  glx/glapitemp.h                | 6655 
----------------------------------------
  glx/glxcmds.c                  |  112 +-
  glx/glxcontext.h               |    2 -
  glx/glxdri.c                   |   14 -
  glx/glxdri2.c                  |   14 -
  glx/glxdriswrast.c             |   14 -
  glx/glxext.c                   |   48 +-
  glx/glxserver.h                |   17 -
  glx/single2.c                  |    8 +-
  glx/single2swap.c              |    8 +-
  glx/singlepix.c                |    2 +-
  glx/singlepixswap.c            |    2 +-
  hw/dmx/glxProxy/glxserver.h    |    8 -
  hw/xfree86/modes/xf86RandR12.c |    2 +-
  hw/xfree86/parser/Pointer.c    |    2 +-
  hw/xquartz/GL/indirect.c       |   24 -
  hw/xwin/glx/indirect.c         |   10 +-
  render/picture.c               |    3 -
  22 files changed, 99 insertions(+), 7322 deletions(-)
  delete mode 100644 glx/glapitemp.h

- ajax