Hi Keith, Okay this is the squashed merge of the complete API changeset.
I've prepared a few of the drivers in git already, so once you pull this in, I'll get the tinderbox to turn green again. Dave. The following changes since commit 3476eb38063473a7a5fcd78e2095e284118de839: Merge remote-tracking branch 'whot/for-keith' (2012-06-03 20:24:24 -0700) are available in the git repository at: git://people.freedesktop.org/~airlied/xserver for-keithp-squashed for you to fetch changes up to 1f0e8bd5eb1a5539689cfc4f5a6b86b530907ec5: api: rework the X server driver API to avoid global arrays. (2012-06-05 13:22:18 +0100) ---------------------------------------------------------------- Dave Airlie (1): api: rework the X server driver API to avoid global arrays. Xext/panoramiX.c | 4 +- Xext/shm.c | 4 +- Xext/xvdix.h | 2 +- Xext/xvmain.c | 8 +- Xext/xvmc.c | 4 +- composite/compalloc.c | 5 +- composite/compinit.c | 4 +- dix/dispatch.c | 5 +- dix/dixutils.c | 10 +- dix/gc.c | 110 ++++++++------------ dix/main.c | 6 +- dix/pixmap.c | 10 +- doc/Xserver-spec.xml | 35 +++---- exa/exa.c | 16 ++- exa/exa.h | 2 +- exa/exa_offscreen.c | 4 +- exa/exa_priv.h | 2 +- fb/fb.h | 2 +- fb/fboverlay.c | 2 +- fb/fboverlay.h | 2 +- fb/fbscreen.c | 2 +- glx/glxdri.c | 14 ++- glx/glxdri2.c | 14 ++- glx/glxscreens.c | 4 +- glx/glxscreens.h | 2 +- hw/dmx/dmxextension.c | 2 +- hw/dmx/dmxscrinit.c | 26 ++--- hw/dmx/dmxscrinit.h | 4 +- hw/dmx/input/dmxconsole.c | 4 +- hw/kdrive/src/kdrive.c | 6 +- hw/kdrive/src/kdrive.h | 8 +- hw/kdrive/src/kinput.c | 4 +- hw/kdrive/src/kxv.c | 4 +- hw/vfb/InitOutput.c | 10 +- hw/xfree86/common/xf86.h | 10 +- hw/xfree86/common/xf86Bus.c | 7 +- hw/xfree86/common/xf86Cursor.c | 13 ++- hw/xfree86/common/xf86DGA.c | 20 ++-- hw/xfree86/common/xf86DPMS.c | 14 +-- hw/xfree86/common/xf86Events.c | 12 +-- hw/xfree86/common/xf86Helper.c | 23 ++-- hw/xfree86/common/xf86Init.c | 4 +- hw/xfree86/common/xf86Mode.c | 4 +- hw/xfree86/common/xf86Module.h | 2 +- hw/xfree86/common/xf86PM.c | 14 +-- hw/xfree86/common/xf86Priv.h | 2 +- hw/xfree86/common/xf86RandR.c | 8 +- hw/xfree86/common/xf86VGAarbiter.c | 54 +++++----- hw/xfree86/common/xf86VGAarbiterPriv.h | 26 ++--- hw/xfree86/common/xf86VidMode.c | 8 +- hw/xfree86/common/xf86cmap.c | 50 +++++---- hw/xfree86/common/xf86fbman.c | 4 +- hw/xfree86/common/xf86sbusBus.c | 4 +- hw/xfree86/common/xf86str.h | 24 ++--- hw/xfree86/common/xf86xv.c | 35 +++---- hw/xfree86/common/xf86xvmc.c | 4 +- hw/xfree86/common/xf86xvpriv.h | 6 +- hw/xfree86/ddc/ddc.c | 25 ++--- hw/xfree86/ddc/xf86DDC.h | 8 +- hw/xfree86/doc/ddxDesign.xml | 44 ++++---- hw/xfree86/dri/dri.c | 19 ++-- hw/xfree86/dri/dri.h | 10 +- hw/xfree86/exa/examodule.c | 16 +-- hw/xfree86/fbdevhw/fbdevhw.c | 23 ++-- hw/xfree86/fbdevhw/fbdevhw.h | 12 +-- hw/xfree86/fbdevhw/fbdevhwstub.c | 10 +- hw/xfree86/i2c/xf86i2c.c | 1 + hw/xfree86/i2c/xf86i2c.h | 2 + hw/xfree86/int10/generic.c | 13 ++- hw/xfree86/int10/helper_exec.c | 18 ++-- hw/xfree86/int10/helper_mem.c | 8 +- hw/xfree86/int10/xf86int10.c | 42 ++++---- hw/xfree86/int10/xf86int10.h | 4 +- hw/xfree86/modes/xf86Crtc.c | 6 +- hw/xfree86/modes/xf86DiDGA.c | 2 +- hw/xfree86/modes/xf86RandR12.c | 23 ++-- hw/xfree86/modes/xf86Rotate.c | 7 +- hw/xfree86/os-support/linux/int10/linux.c | 29 +++--- .../os-support/linux/int10/vm86/linux_vm86.c | 16 +-- hw/xfree86/ramdac/xf86Cursor.c | 22 ++-- hw/xfree86/ramdac/xf86CursorPriv.h | 2 +- hw/xfree86/shadowfb/shadow.c | 26 +++-- hw/xfree86/vbe/vbe.c | 24 ++--- hw/xfree86/vbe/vbe.h | 2 +- hw/xfree86/xaa/xaaInit.c | 40 ++++--- hw/xfree86/xaa/xaalocal.h | 8 +- hw/xnest/Screen.c | 6 +- hw/xnest/Screen.h | 4 +- hw/xquartz/darwin.c | 6 +- hw/xwin/win.h | 8 +- hw/xwin/winblock.c | 2 +- hw/xwin/winnativegdi.c | 4 +- hw/xwin/winpfbdd.c | 6 +- hw/xwin/winscrinit.c | 14 +-- hw/xwin/winshaddd.c | 6 +- hw/xwin/winshadddnl.c | 6 +- hw/xwin/winshadgdi.c | 6 +- hw/xwin/winwakeup.c | 2 +- include/pixmap.h | 4 +- include/screenint.h | 1 - include/scrnintstr.h | 12 +-- mi/midispcur.c | 6 +- mi/mioverlay.c | 6 +- mi/mipointer.c | 6 +- mi/miscrinit.c | 4 +- mi/misprite.c | 13 ++- miext/cw/cw.c | 6 +- miext/damage/damage.c | 4 +- miext/rootless/rootlessScreen.c | 4 +- miext/shadow/shadow.c | 4 +- miext/sync/misync.c | 4 +- randr/randr.c | 4 +- randr/randrstr.h | 2 +- render/animcur.c | 10 +- render/picture.c | 4 +- render/picturestr.h | 2 +- xfixes/cursor.c | 4 +- 117 files changed, 610 insertions(+), 711 deletions(-) _______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel