mesa: Changes to 'master'

[Roland Scheidegger]

 src/mesa/drivers/dri/i915tex/intel_batchbuffer.h |    2 
 src/mesa/drivers/dri/i915tex/intel_fbo.c         |    2 
 src/mesa/drivers/dri/nouveau/nouveau_buffers.c   |    7 +-
 src/mesa/main/attrib.c                           |    4 +
 src/mesa/main/buffers.c                          |   67 +++++++++++++++--------
 src/mesa/main/buffers.h                          |    3 +
 src/mesa/main/context.c                          |    7 +-
 src/mesa/main/dd.h                               |    2 
 src/mesa/main/fbobject.c                         |   27 +++++++--
 src/mesa/main/framebuffer.c                      |   37 ++++++++----
 10 files changed, 112 insertions(+), 46 deletions(-)

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

New commits:
commit a1bc0d0f51c2aa248a349283c3b86ae2c72af4aa
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date:   Wed Jul 18 20:17:14 2007 +0200

    fix mesa's handling of fbo's / window fb (again)
    
    Make sure the relevant fields in window fbs get updated at appropriate time
    (those are NOT the same as fbos!!!), and fix up related code accordingly.
    This is a bit ugly, but there's a reason the issues section in EXT_fbo is
    a couple hundred pages long...
    Hopefully correct now.

commit 6075df53b5435ddada989d776d989132def363a6
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date:   Wed Jul 18 18:07:12 2007 +0200

    more fixes for mesa's fbo handling (fixes tests/fbotest1/2)

commit f9ac01eac511aa9ea0b8b48774022a08d0fc2f3b
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date:   Thu Jul 19 17:58:21 2007 +0200

    fix up mesa's probably bogus framebuffer updates with different read/write fbs
    
    Conflicts:
    
    	src/mesa/main/framebuffer.c

commit dbfb375805d94cb80262b8816c67a8adc778bec5
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date:   Tue Jul 17 17:29:55 2007 +0200

    fix mesa fb binding
    
    Make sure that we bind the right buffer (draw or read) when rebinding
    the window framebuffer (the api doesn't allow binding different draw and
    read buffers at the same time, but the default window framebuffer is basically
    2 fb objects, one for read, one for write, which can be different). Pass both
    of these two down the driver api (no driver uses this right now).

commit b9f2cf9a4e0a5ec89b27371210846942c93cb412
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date:   Tue Jul 17 12:56:30 2007 +0200

    increase MAX_RELOCS so never run out before batch buffer is full (fixes xdemos/shape)