mesa: Changes to 'master'

[Oliver McFadden]

 src/mesa/drivers/dri/r300/r300_context.h |   17 -
 src/mesa/drivers/dri/r300/r300_reg.h     |    8 
 src/mesa/drivers/dri/r300/r300_state.c   |  296 +++++++++++--------------------
 src/mesa/drivers/dri/r300/radeon_lock.h  |    3 
 4 files changed, 113 insertions(+), 211 deletions(-)

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

New commits:
commit e92903e24c245df80245776ed9423bd933a97740
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date:   Wed Jun 20 14:24:04 2007 +0000

    r300: Initial work on merging the real and generated vertex program functions.

commit 43e601206d9618eb5f9ec9660d9a7e0fa22feff0
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date:   Wed Jun 20 12:42:19 2007 +0000

    r300: Should use inst_count not 0 for R300_PVS_CNTL_3_PROGRAM_UNKNOWN_SHIFT.

commit 62b83638a5ffe4df25994ce5f36c493d51da046e
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date:   Wed Jun 20 12:23:47 2007 +0000

    r300: The vpi, vpp, and vps counts are already initialized; don't do it twice.

commit b41ef5506153fc2cd471341b4ad1eda2338f2438
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date:   Wed Jun 20 12:13:44 2007 +0000

    r300: Clean up the vertex program state code slightly; still needs lots of work.

commit 252fc61e4860f6a539faaf48f7d657d7d2242fbe
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date:   Wed Jun 20 12:03:42 2007 +0000

    r300: Vertex program position end bits are known.
    
    Possibly performance may improve by setting it to the last instruction that
    writes result.position, rather than the last instruction in the vertex program.

commit 27c8488526c5b3b0606cb5a3fbfac7a82246c0bd
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date:   Wed Jun 20 11:45:07 2007 +0000

    r300: Removed unused vap_param structure.

commit 804d3a8f6eaa0beee1504c3e6fbda5dae9f79299
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date:   Wed Jun 20 11:42:53 2007 +0000

    r300: Cleaned up long lines in the vertex functions.

commit 909091b7dc2ee2875807a1d3ebcb9732fdfeaab3
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date:   Wed Jun 20 03:02:34 2007 +0000

    r300: Setup the default state for polygon offset point/line.
    
    I believe there are still bugs with all polygon offset types. The point and line
    types may need to be handled specially, too.
    
    This shouldn't break anything because it just enabled the occlusion control bits
    for polygon offset.

commit bf334d852d60b9a5ea21234a816d0acb03f1b48c
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date:   Wed Jun 20 02:37:44 2007 +0000

    r300: Cleaned up the r300SetupVertexShader function.

commit 204f9e3fdb83fa9ef94c6e94a5fbd0dfa8d3b3dc
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date:   Wed Jun 20 02:31:35 2007 +0000

    r300: Cleaned up the r300SetupPixelShader function.

commit 381b86329e827ea81e4a7e8a99c4aaa21c5ec8ac
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date:   Sun Jun 17 02:04:58 2007 +0000

    r300: Trivial clean up in radeon_lock.h.