mesa: Changes to 'master'

[Eric Anholt]

 src/mesa/drivers/dri/i915/i830_vtbl.c             |    4 -
 src/mesa/drivers/dri/i915/i915_vtbl.c             |    9 ++
 src/mesa/drivers/dri/i915/intel_context.h         |    2 
 src/mesa/drivers/dri/i915/intel_ioctl.c           |   11 ---
 src/mesa/drivers/dri/i915/intel_pixel_bitmap.c    |    1 
 src/mesa/drivers/dri/i915/intel_tris.c            |    4 -
 src/mesa/drivers/dri/i965/brw_context.h           |   11 ++-
 src/mesa/drivers/dri/i965/brw_curbe.c             |    4 -
 src/mesa/drivers/dri/i965/brw_draw.c              |   75 +++++-----------------
 src/mesa/drivers/dri/i965/brw_draw_upload.c       |    5 +
 src/mesa/drivers/dri/i965/brw_misc_state.c        |   69 +++-----------------
 src/mesa/drivers/dri/i965/brw_state.h             |    1 
 src/mesa/drivers/dri/i965/brw_state_upload.c      |    8 --
 src/mesa/drivers/dri/i965/brw_vtbl.c              |   21 +++---
 src/mesa/drivers/dri/i965/intel_context.c         |    2 
 src/mesa/drivers/dri/i965/intel_context.h         |    3 
 src/mesa/drivers/dri/i965/intel_ioctl.c           |    6 -
 src/mesa/drivers/dri/i965/intel_pixel_copy.c      |    1 
 src/mesa/drivers/dri/intel/intel_batchbuffer.c    |   32 +++++----
 src/mesa/drivers/dri/intel/intel_batchbuffer.h    |   36 +++++++---
 src/mesa/drivers/dri/intel/intel_buffer_objects.c |   11 ---
 src/mesa/drivers/dri/intel/intel_buffers.c        |    9 ++
 src/mesa/drivers/dri/intel/intel_pixel_bitmap.c   |    1 
 23 files changed, 126 insertions(+), 200 deletions(-)

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

New commits:
commit 4225876bf03dfe6d4b291eed9c00e37e949f8148
Author: Eric Anholt <eric at anholt.net>
Date:   Wed Jan 9 14:30:09 2008 -0800

    [intel] Re-allocate backing buffer objects on BufferData.
    
    This may allow better concurrency (noop in openarena performance now), but is
    also important for the previous commit -- otherwise, we may end up with
    BufferData, draw_prims, BufferData and the draw_prims would use the new VBO
    data instead of old.  This could still occur with user-supplied VBOs and poor
    use of MapBuffer without BufferData.

commit 7da98d7ebaf4475812f2ce44062d50bee393faf7
Author: Eric Anholt <eric at anholt.net>
Date:   Wed Jan 9 14:21:52 2008 -0800

    [965] Allow more than one draw_prims per batchbuffer.
    
    The comment about (vbo)_exec_api.c appeared to be stale, as the VBO code seems
    to only use non-named VBOs (not actual VBOs) or freshly-allocated VBO data.
    
    This brings a 2x speedup to openarena, because we can submit nearly-full
    batchbuffers instead of many 450-byte ones.

commit dc1608ae9d90a490ce32aa005488e3591a6d8369
Author: Eric Anholt <eric at anholt.net>
Date:   Wed Jan 9 14:08:12 2008 -0800

    [965] Replace the always_update dirty flag with BRW_NEW_BATCH.
    
    This allows us to avoid re-emitting some state when validate_state happens
    multiple times per batchbuffer.  Even though we flush batch per primitive
    currently, that may still happen already if the primitive changed (this should
    probably be fixed as well).

commit 5f86ae057a645c03dc1e0c51c2fb1b2628a50e0a
Author: Eric Anholt <eric at anholt.net>
Date:   Wed Jan 9 13:40:40 2008 -0800

    [intel] Rename lost_hardware vtbl entry to new_batch.
    
    Both drivers have ended up relying on lost_hardware being called after each
    batch buffer, so update the name.  This removes one of the calls on 965 whic
    h was outside of the batchbuffer handling code and just duplicating what had
    already happened through batchbuffer handling.

commit d9edd8e90588417e3d549f25132dab2f21445792
Author: Eric Anholt <eric at anholt.net>
Date:   Wed Jan 9 13:24:29 2008 -0800

    [965] Remove drawing rect upload, which is handled (better) by the kernel.

commit beddf653a914903156712aa472b5deaddb7bbaed
Author: Eric Anholt <eric at anholt.net>
Date:   Wed Jan 9 12:33:39 2008 -0800

    [intel] Clean up cliprect handling in intel drivers.
    
    In particular, batch buffers are no longer flushed when switching from
    CLIPRECTS to NO_CLIPRECTS or vice versa, and 965 just uses DRM cliprect
    handling for primitives instead of trying to sneak in its own to avoid the
    DRM stuff. The disadvantage is that we will re-execute state updates per
    cliprect, but the advantage is that we will be able to accumulate larger
    batch buffers, which were proving to be a major overhead.

commit 7ce12b0863f1cc03bdd7c65c0c0733b2ff903e40
Author: Eric Anholt <eric at anholt.net>
Date:   Wed Jan 9 12:41:14 2008 -0800

    [intel] Remove the dead intel->need_flush member.

commit 5a49e84fcd858a1ad9c0ad839ccbe93504593cd0
Author: Eric Anholt <eric at anholt.net>
Date:   Tue Jan 8 16:20:28 2008 -0800

    [965] Clarify a bit of index buffer upload code.