mesa: Changes to 'master'

[Oliver McFadden]

 src/mesa/drivers/dri/r300/.gitignore         |    1 
 src/mesa/drivers/dri/r300/Makefile           |    5 
 src/mesa/drivers/dri/r300/r300_context.c     |    6 
 src/mesa/drivers/dri/r300/r300_context.h     |    4 
 src/mesa/drivers/dri/r300/r300_ioctl.c       |   13 
 src/mesa/drivers/dri/r300/r300_maos.c        |    6 
 src/mesa/drivers/dri/r300/r300_mem.c         |   38 -
 src/mesa/drivers/dri/r300/r300_mem.h         |   40 +
 src/mesa/drivers/dri/r300/r300_reg.h         |    3 
 src/mesa/drivers/dri/r300/r300_render.c      |    1 
 src/mesa/drivers/dri/r300/r300_state.c       |    1 
 src/mesa/drivers/dri/r300/r300_texmem.c      |    4 
 src/mesa/drivers/dri/r300/r300_vertprog.c    |    1 
 src/mesa/drivers/dri/r300/radeon_context.h   |   40 -
 src/mesa/drivers/dri/r300/radeon_mm.h        |   40 -
 src/mesa/drivers/dri/r300/radeon_span.c      |   79 +--
 src/mesa/drivers/dri/r300/radeon_span.h      |   50 --
 src/mesa/drivers/dri/r300/radeon_state.h     |    2 
 src/mesa/drivers/dri/radeon/radeon_context.h |  671 +++++++++++++--------------
 src/mesa/drivers/dri/radeon/radeon_span.c    |   51 +-
 src/mesa/drivers/dri/radeon/radeon_span.h    |    4 
 21 files changed, 528 insertions(+), 532 deletions(-)

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

New commits:
commit 4d5d4e1f97bf8d5c55ef817f7a28f920accc151b
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date:   Wed May 9 21:06:28 2007 +0000

    r300: Cleaned up radeon_context.h slightly; mostly Indent.

commit a9ab36b8f2f650d6af362ed3be5fd2c1fe40e7eb
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date:   Wed May 9 20:52:09 2007 +0000

    r300: radeon_span.h is now common code; radeon_span.c still needs some work.

commit 88288b614eb89b8995cbc2ece4bbdb25b7adb191
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date:   Wed May 9 20:49:49 2007 +0000

    r300: Renamed the R300 memory manager from "radeon" to "r300"; it's R300
    specific.

commit a15470606125478ae314e7dc00821e46292ac810
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date:   Wed May 9 20:41:27 2007 +0000

    r300: Indented radeon_span.h

commit 6fe41a4c01f4ec9f280f52901554a58aa8b30627
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date:   Wed May 9 20:36:48 2007 +0000

    r300: Further reduced the radeon_span.c diff.

commit f4a2b9f83d2b9571a2baea3c430ec15e28ac833c
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date:   Wed May 9 19:30:59 2007 +0000

    r300: I have no idea why this was forced on, but it seems to work fine when
    restored to the previous behaviour.

commit 56c2f7bb42eaeb443e2e273383d1d5974fc89e03
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date:   Wed May 9 19:24:59 2007 +0000

    r300: Removed the dangerous R300_SPAN_DISABLE_LOCKING flag.
    
    Enabling R300_SPAN_DISABLE_LOCKING would probably cause more lockups; I think
    there are a couple of other little bugs in this code, too. It's best to remove
    it.

commit df747eb354ca71227c9aa8aa10753be11203ca23
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date:   Wed May 9 18:44:56 2007 +0000

    r300: Removed a bit of disabled code.

commit ff7a41a159099f92248c6560140d1b947c0e8cc5
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date:   Wed May 9 18:37:46 2007 +0000

    r300: Don't need to include the deprecated r300_program.h in some files.
    
    The only file that still requires r300_program.h is r300_ioctl.c; and it should
    use the new defines in r300_reg.h!

commit 01fdb34b3933e567a902bbec27c942d510872ca1
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date:   Wed May 9 18:31:04 2007 +0000

    r300; Indent would destroy r300_reg.h, so add *INDENT-OFF*.