mesa: Changes to 'master'

[Eric Anholt]

 src/mesa/drivers/dri/i915/intel_context.c         |  118 ++++++++++-
 src/mesa/drivers/dri/i915/intel_context.h         |   16 +
 src/mesa/drivers/dri/i915/intel_ioctl.c           |   12 -
 src/mesa/drivers/dri/i915/intel_ioctl.h           |    4 
 src/mesa/drivers/dri/i915/intel_pixel_copy.c      |    9 
 src/mesa/drivers/dri/i915/intel_pixel_draw.c      |    2 
 src/mesa/drivers/dri/i965/brw_draw.c              |    2 
 src/mesa/drivers/dri/i965/brw_state_pool.c        |    4 
 src/mesa/drivers/dri/i965/brw_wm_state.c          |    2 
 src/mesa/drivers/dri/i965/intel_buffer_objects.c  |    2 
 src/mesa/drivers/dri/i965/intel_context.c         |  128 +++++++++---
 src/mesa/drivers/dri/i965/intel_context.h         |   25 +-
 src/mesa/drivers/dri/i965/intel_ioctl.c           |   26 +-
 src/mesa/drivers/dri/i965/intel_ioctl.h           |    4 
 src/mesa/drivers/dri/i965/intel_regions.c         |  151 +++++++--------
 src/mesa/drivers/dri/i965/intel_regions.h         |    2 
 src/mesa/drivers/dri/i965/intel_screen.c          |  136 -------------
 src/mesa/drivers/dri/i965/intel_screen.h          |   18 -
 src/mesa/drivers/dri/intel/intel_batchbuffer.c    |   10 -
 src/mesa/drivers/dri/intel/intel_blit.c           |    2 
 src/mesa/drivers/dri/intel/intel_buffer_objects.c |    4 
 src/mesa/drivers/dri/intel/intel_bufmgr_ttm.c     |    2 
 src/mesa/drivers/dri/intel/intel_depthstencil.c   |    8 
 src/mesa/drivers/dri/intel/intel_fbo.c            |    2 
 src/mesa/drivers/dri/intel/intel_mipmap_tree.c    |   12 -
 src/mesa/drivers/dri/intel/intel_regions.c        |  220 +++++++++++-----------
 src/mesa/drivers/dri/intel/intel_regions.h        |   47 +---
 src/mesa/drivers/dri/intel/intel_screen.c         |  142 --------------
 src/mesa/drivers/dri/intel/intel_screen.h         |   17 -
 src/mesa/drivers/dri/intel/intel_span.c           |   24 +-
 src/mesa/drivers/dri/intel/intel_tex_image.c      |    6 
 src/mesa/drivers/dri/intel/intel_tex_subimage.c   |    2 
 32 files changed, 504 insertions(+), 655 deletions(-)

commit diffs at http://gitweb.freedesktop.org/?p=mesa/mesa.git;a=summary

New commits:
commit 7c71ef3a3d0cf2620525f468960cdc76a0fb0d33
Author: Eric Anholt <eric at anholt.net>
Date:   Wed Dec 12 10:25:19 2007 -0800

    [intel] Move bufmgr back to context instead of screen, fixing glthreads.
    
    Putting the bufmgr in the screen is not thread-safe since the emit_reloc
    changes.  It also led to a significant performance hit from pthread usage
    for the attempted thread-safety (up to 12% of a cpu spent on refcounting
    protection in single-threaded 965).  The motivation had been to allow
    multi-context bufmgr sharing in classic mode, but it wasn't worth the cost.