Mesa (master): nouveau: rewrite winsys in terms of drm_api, support dri2 state tracker

[Ben Skeggs]

Module: Mesa
Branch: master
Commit: e00ae524e236afba1305150cacd634eaa1f5460b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e00ae524e236afba1305150cacd634eaa1f5460b

Author: Ben Skeggs <bskeggs at redhat.com>
Date:   Wed Mar 18 08:22:35 2009 +1000

nouveau: rewrite winsys in terms of drm_api, support dri2 state tracker

drm_api is a set of hooks used by the dri2 state tracker, this wraps our
dri1 code around the same set of hooks.

Currently the dri2 build will produce nouveau_dri2.so which you'll need
to install as nouveau_dri.so if you wish to try it.  The dri2 state
tracker doesn't make it easy for a driver to support both paths in the
same binary.

---

 src/gallium/drivers/nouveau/nouveau_winsys.h       |    2 +-
 src/gallium/winsys/drm/nouveau/Makefile            |    2 +-
 src/gallium/winsys/drm/nouveau/common/Makefile     |   22 --
 .../winsys/drm/nouveau/common/nouveau_context.c    |  206 --------------------
 .../winsys/drm/nouveau/common/nouveau_context.h    |   59 ------
 .../winsys/drm/nouveau/common/nouveau_local.h      |   19 --
 .../winsys/drm/nouveau/common/nouveau_screen.c     |   31 ---
 .../winsys/drm/nouveau/common/nouveau_screen.h     |   27 ---
 .../drm/nouveau/common/nouveau_winsys_pipe.h       |   44 ----
 .../drm/nouveau/common/nouveau_winsys_softpipe.c   |  101 ----------
 src/gallium/winsys/drm/nouveau/dri/Makefile        |    8 +-
 .../{nouveau_context_dri.c => nouveau_context.c}   |   62 +++----
 .../{nouveau_context_dri.h => nouveau_context.h}   |   14 +-
 .../drm/nouveau/{common => dri}/nouveau_dri.h      |    0 
 .../drm/nouveau/{common => dri}/nouveau_lock.c     |    5 +-
 .../dri/{nouveau_screen_dri.c => nouveau_screen.c} |   94 ++++++++--
 .../dri/{nouveau_screen_dri.h => nouveau_screen.h} |    9 +-
 .../winsys/drm/nouveau/dri/nouveau_swapbuffers.c   |   32 ++--
 .../winsys/drm/nouveau/dri/nouveau_swapbuffers.h   |   11 +-
 src/gallium/winsys/drm/nouveau/dri2/Makefile       |   26 +++
 src/gallium/winsys/drm/nouveau/drm/Makefile        |   13 ++
 .../winsys/drm/nouveau/drm/nouveau_drm_api.c       |  194 ++++++++++++++++++
 .../winsys/drm/nouveau/drm/nouveau_drm_api.h       |    5 +
 .../drm/nouveau/{common => drm}/nouveau_winsys.c   |   78 ++------
 .../nouveau/{common => drm}/nouveau_winsys_pipe.c  |  135 ++++---------
 .../winsys/drm/nouveau/drm/nouveau_winsys_pipe.h   |   52 +++++
 26 files changed, 505 insertions(+), 746 deletions(-)

Diff:   http://cgit.freedesktop.org/mesa/mesa/diff/?id=e00ae524e236afba1305150cacd634eaa1f5460b