mesa: Changes to 'master'

[Eric Anholt]

The branch, master has been updated
        Commits at: http://cgit.freedesktop.org/mesa/mesa/log/?h=master

Summary of changes:
 src/mesa/drivers/dri/i915/Makefile                |    3 +-
 src/mesa/drivers/dri/i915/i830_metaops.c          |    1 -
 src/mesa/drivers/dri/i915/i830_tex.c              |    2 -
 src/mesa/drivers/dri/i915/i830_texblend.c         |    1 -
 src/mesa/drivers/dri/i915/i830_texstate.c         |    1 -
 src/mesa/drivers/dri/i915/i915_metaops.c          |    1 -
 src/mesa/drivers/dri/i915/i915_tex.c              |    2 -
 src/mesa/drivers/dri/i915/i915_texstate.c         |    1 -
 src/mesa/drivers/dri/i915/intel_ioctl.c           |    1 -
 src/mesa/drivers/dri/i915/intel_pixel_read.c      |    1 -
 src/mesa/drivers/dri/i965/Makefile                |    3 +-
 src/mesa/drivers/dri/i965/brw_cc.c                |   12 +-
 src/mesa/drivers/dri/i965/brw_clip_state.c        |   12 +-
 src/mesa/drivers/dri/i965/brw_draw.c              |    1 -
 src/mesa/drivers/dri/i965/brw_draw.h              |    1 -
 src/mesa/drivers/dri/i965/brw_draw_upload.c       |    1 -
 src/mesa/drivers/dri/i965/brw_gs_state.c          |   10 +-
 src/mesa/drivers/dri/i965/brw_sf_state.c          |   20 +-
 src/mesa/drivers/dri/i965/brw_state_upload.c      |    1 -
 src/mesa/drivers/dri/i965/brw_tex.c               |    1 -
 src/mesa/drivers/dri/i965/brw_vs_state.c          |   10 +-
 src/mesa/drivers/dri/i965/brw_wm_sampler_state.c  |   12 +-
 src/mesa/drivers/dri/i965/brw_wm_state.c          |   31 ++--
 src/mesa/drivers/dri/i965/brw_wm_surface_state.c  |   34 ++--
 src/mesa/drivers/dri/i965/intel_ioctl.c           |    1 -
 src/mesa/drivers/dri/intel/intel_batchbuffer.c    |   41 ++----
 src/mesa/drivers/dri/intel/intel_batchbuffer.h    |    5 +-
 src/mesa/drivers/dri/intel/intel_blit.c           |    2 +-
 src/mesa/drivers/dri/intel/intel_blit.h           |    2 -
 src/mesa/drivers/dri/intel/intel_buffer_objects.c |    1 -
 src/mesa/drivers/dri/intel/intel_context.c        |  122 ++------------
 src/mesa/drivers/dri/intel/intel_context.h        |    1 -
 src/mesa/drivers/dri/intel/intel_ioctl.c          |  185 ---------------------
 src/mesa/drivers/dri/intel/intel_ioctl.h          |   46 -----
 src/mesa/drivers/dri/intel/intel_pixel_bitmap.c   |    1 -
 src/mesa/drivers/dri/intel/intel_pixel_copy.c     |    1 -
 src/mesa/drivers/dri/intel/intel_pixel_draw.c     |    1 -
 src/mesa/drivers/dri/intel/intel_regions.c        |    1 -
 src/mesa/drivers/dri/intel/intel_regions.h        |    4 +-
 src/mesa/drivers/dri/intel/intel_screen.c         |   78 ++++++++-
 src/mesa/drivers/dri/intel/intel_screen.h         |    7 +-
 src/mesa/drivers/dri/intel/intel_span.c           |    1 -
 src/mesa/drivers/dri/intel/intel_tex_image.c      |    1 -
 43 files changed, 187 insertions(+), 477 deletions(-)
 delete mode 120000 src/mesa/drivers/dri/i915/intel_ioctl.c
 delete mode 120000 src/mesa/drivers/dri/i965/intel_ioctl.c
 delete mode 100644 src/mesa/drivers/dri/intel/intel_ioctl.c
 delete mode 100644 src/mesa/drivers/dri/intel/intel_ioctl.h

       via  35fd72756a05463568d94862f4fcd234903e1204 (commit)
       via  3628185f566e178a12b493fb89abf52b4b281f99 (commit)
       via  7e0bbdcf033981282978554c2e68ce48b55aa291 (commit)
      from  11d694b1bb0cb384d802d7e0e252cf5119febb98 (commit)


- Commits -----------------------------------------------
commit 35fd72756a05463568d94862f4fcd234903e1204
Author: Eric Anholt <eric at anholt.net>
Date:   Mon Sep 8 08:52:48 2008 -0700

    intel: track move of bo_exec from drivers to bufmgr.

commit 3628185f566e178a12b493fb89abf52b4b281f99
Author: Eric Anholt <eric at anholt.net>
Date:   Sat Sep 6 03:09:43 2008 +0100

    intel: track bufmgr move to libdrm_intel and bufmgr_fake irq emit/wait change.

commit 7e0bbdcf033981282978554c2e68ce48b55aa291
Author: Eric Anholt <eric at anholt.net>
Date:   Thu Sep 4 22:16:31 2008 +0100

    intel: Move the bufmgr back to the screen.
    
    Mesa requires that we be able to share objects between contexts, which means
    that the objects need to be created by the same bufmgr, and the bufmgr
    internally requires pthread protection for thread safety.
    Rely on the bufmgr having appropriate locking.

---------------------------------