mesa: Changes to 'master'

[Eric Anholt]

 src/mesa/drivers/dri/i915/i830_vtbl.c            |   22 ++------
 src/mesa/drivers/dri/i915/i915_vtbl.c            |   10 ++--
 src/mesa/drivers/dri/i915/intel_context.c        |    8 ++-
 src/mesa/drivers/dri/i915/intel_render.c         |    2 
 src/mesa/drivers/dri/i915/intel_tris.c           |   12 ++--
 src/mesa/drivers/dri/i965/brw_context.h          |    1 
 src/mesa/drivers/dri/i965/brw_curbe.c            |    4 -
 src/mesa/drivers/dri/i965/brw_draw.c             |    4 +
 src/mesa/drivers/dri/i965/brw_draw_upload.c      |    4 -
 src/mesa/drivers/dri/i965/brw_misc_state.c       |   10 ++--
 src/mesa/drivers/dri/i965/brw_state.h            |    2 
 src/mesa/drivers/dri/i965/brw_state_batch.c      |    4 -
 src/mesa/drivers/dri/i965/brw_tex.c              |   19 +++++++
 src/mesa/drivers/dri/i965/brw_wm_surface_state.c |    4 -
 src/mesa/drivers/dri/i965/intel_context.c        |    6 ++
 src/mesa/drivers/dri/intel/intel_batchbuffer.c   |   14 ++---
 src/mesa/drivers/dri/intel/intel_batchbuffer.h   |   57 +++++++++++++++--------
 src/mesa/drivers/dri/intel/intel_blit.c          |   18 +++----
 src/mesa/drivers/dri/intel/intel_buffers.c       |    7 --
 src/mesa/drivers/dri/intel/intel_buffers.h       |    3 -
 20 files changed, 126 insertions(+), 85 deletions(-)

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

New commits:
commit a04b632350e5d0e9994fc667afc59407a39da0ba
Author: Eric Anholt <eric at anholt.net>
Date:   Thu Jan 10 10:48:05 2008 -0800

    [intel] Add more cliprect modes to cover other meanings for batch emits.
    
    The previous change gave us only two modes, one which looped over the batch
    per cliprect (3d drawing) and one that didn't (state updeast).
    However, we really want 4:
    
    - Batch doesn't care about cliprects (state updates)
    - Batch needs DRAWING_RECTANGLE looping per cliprect (3d drawing)
    - Batch needs to be executed just once (region fills, copies, etc.)
    - Batch already includes cliprect handling, and must be flushed by unlock time
      (copybuffers, clears).
    
    All callers should now be fixed to use one of these states for any batchbuffer
    emits.  Thanks to Keith Whitwell for pointing out the failure.