mesa: Changes to 'master'

[Eric Anholt]

 src/mesa/drivers/dri/i965/brw_sf_state.c   |   85 ++++++++++-------------------
 src/mesa/drivers/dri/i965/brw_state_dump.c |    2 
 src/mesa/drivers/dri/i965/brw_structs.h    |    1 
 3 files changed, 34 insertions(+), 54 deletions(-)

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

New commits:
commit 447facfcd6d807128ebf6ba3efc894180b447494
Author: Eric Anholt <eric at anholt.net>
Date:   Mon Dec 17 14:51:24 2007 -0800

    [965] Simplify scissor handling by using DrawBuffer values.

commit 8336f3ffb7e4033337a1d0eafef43cbf3329f499
Author: Eric Anholt <eric at anholt.net>
Date:   Mon Dec 17 14:42:21 2007 -0800

    [965] fix bad conflict resolution in debug code.