mesa: Changes to 'softpipe_0_1_branch'

[Brian Paul]

 src/mesa/drivers/dri/intel_winsys/Makefile             |    3 
 src/mesa/drivers/dri/intel_winsys/intel_blit.c         |   24 
 src/mesa/drivers/dri/intel_winsys/intel_buffers.c      |   54 -
 src/mesa/drivers/dri/intel_winsys/intel_buffers.h      |   37 -
 src/mesa/drivers/dri/intel_winsys/intel_context.c      |   84 +-
 src/mesa/drivers/dri/intel_winsys/intel_depthstencil.c |  282 -------
 src/mesa/drivers/dri/intel_winsys/intel_depthstencil.h |   14 
 src/mesa/drivers/dri/intel_winsys/intel_fbo.c          |  629 -----------------
 src/mesa/drivers/dri/intel_winsys/intel_fbo.h          |  127 ---
 src/mesa/drivers/dri/intel_winsys/intel_screen.c       |   32 
 src/mesa/drivers/dri/intel_winsys/intel_surface.c      |  126 ++-
 src/mesa/drivers/dri/intel_winsys/intel_surface.h      |   41 +
 src/mesa/main/mtypes.h                                 |    2 
 src/mesa/main/renderbuffer.c                           |   14 
 src/mesa/pipe/i915simple/i915_context.c                |    2 
 src/mesa/pipe/p_state.h                                |    2 
 src/mesa/state_tracker/st_atom_framebuffer.c           |   27 
 src/mesa/state_tracker/st_cb_clear.c                   |   35 
 src/mesa/state_tracker/st_cb_fbo.c                     |   98 ++
 src/mesa/state_tracker/st_cb_fbo.h                     |   23 
 src/mesa/state_tracker/st_context.c                    |    2 
 21 files changed, 437 insertions(+), 1221 deletions(-)

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

New commits:
commit fb8caffea8ac9a8f8e2ee63959264abe8eb36c59
Author: Brian <brian at i915.localnet.net>
Date:   Thu Aug 9 15:42:12 2007 -0600

    fix merge conflicts

commit 0c4c86cf2ce65d1284819dd14c649ac4c33cae33
Author: Brian <brian at i915.localnet.net>
Date:   Thu Aug 9 15:41:08 2007 -0600

    don't use intel_read_draw_buffer.c anymore

commit 3c07bbb1982da5629685f569285529f02b35e48c
Author: Brian <brian at i915.localnet.net>
Date:   Thu Aug 9 15:39:54 2007 -0600

    assertions

commit 807ecbd344853288f4cadff95445d5677b28c93c
Author: Brian <brian at i915.localnet.net>
Date:   Thu Aug 9 15:39:31 2007 -0600

    *numFormats = 3

commit 3e930c3f1fe1deebd0cb976070155f5c55d55b6f
Author: Brian <brian at i915.localnet.net>
Date:   Thu Aug 9 13:17:49 2007 -0600

    minor clean-ups

commit a4517215ca98066c70155432ebfc578e6412d6de
Author: Brian <brian at i915.localnet.net>
Date:   Thu Aug 9 13:09:58 2007 -0600

    remove intel_depthstencil.c and intel_fbo.c

commit a47c387793bf99ad533a36082c262aadab7e322a
Author: Brian <brian at i915.localnet.net>
Date:   Thu Aug 9 13:09:27 2007 -0600

    Obsolete files

commit 3a035d0d23d2ee7edd48be144c6619d56fbd5469
Author: Brian <brian at i915.localnet.net>
Date:   Thu Aug 9 13:08:43 2007 -0600

    don't include intel_depthstencil.h

commit 74b5cb0e6fd0cdb6306fa7dd32e5be1aa4e3fb69
Author: Brian <brian at i915.localnet.net>
Date:   Thu Aug 9 13:04:53 2007 -0600

    remove some includes

commit f5713c7d2e7ba8e1170fd9b1dd95379662ab6117
Author: Brian <brian at i915.localnet.net>
Date:   Thu Aug 9 12:59:11 2007 -0600

    Checkpoint intel_renderbuffer removal.
    
    Remove surface ptr from gl_renderbuffer.
    Use st_renderbuffer in most places.
    More clean-up.

commit 36fc648ddd937962e659d6215ed6cfb864fb9f05
Author: Brian <brian at i915.localnet.net>
Date:   Thu Aug 9 12:36:47 2007 -0600

    remove dead code, remove intel_fbo.h includes

commit 01ee12cc5faa447d5542d00970e8bc3867bd5c60
Author: Brian <brian at i915.localnet.net>
Date:   Thu Aug 9 12:36:19 2007 -0600

    surface-related prototypes

commit 64da7515009f3551796c90acc74eb0a2ffdb68a0
Author: Brian <brian at i915.localnet.net>
Date:   Thu Aug 9 12:27:44 2007 -0600

    checkpoint: no longer using intel_fbo.c

commit b6e4efb451061a4e124f6bf575e528cbbff551c2
Author: Brian <brian at i915.localnet.net>
Date:   Thu Aug 9 11:30:40 2007 -0600

    remove color_rb[] and lots of dead code

commit 0481f22fdbed715dea9e36dad871606d5fd285bb
Author: Brian <brian at i915.localnet.net>
Date:   Thu Aug 9 11:16:13 2007 -0600

    disable intel_get_rb_region()

commit 334d3650a95786a7f4e8212eb84fe9cf70206d8f
Author: Brian <brian at i915.localnet.net>
Date:   Thu Aug 9 11:11:11 2007 -0600

    checkpoint: more intel_renderbuffer removal

commit d177a00e5bcf6bffb3fc0810b720d8534995c752
Author: Brian <brian at i915.localnet.net>
Date:   Thu Aug 9 10:52:03 2007 -0600

    checkpoint: intel_renderbuffer removal (intel_renderbuffer now == gl_renderbuffer

commit 4ab52c412d738bd26164236e69935c2f82035b1f
Author: Brian <brian at i915.localnet.net>
Date:   Thu Aug 9 10:39:19 2007 -0600

    checkpoint: intel_renderbuffer removal (move vbl_pending field into intel_framebuffer

commit 3614a9a8ae2badceca40f626c4a80f386c5d0177
Author: Brian <brian at i915.localnet.net>
Date:   Thu Aug 9 10:33:18 2007 -0600

    checkpoint: intel_renderbuffer removal