mesa: Changes to 'master'

[Brian Paul]

 src/mesa/drivers/dri/i915/intel_pixel.c         |   34 +++++++++++++-----------
 src/mesa/drivers/dri/i915tex/intel_pixel_draw.c |    9 ++++--
 src/mesa/swrast/s_context.c                     |    7 ++--
 src/mesa/swrast/s_copypix.c                     |   14 +++++++--
 src/mesa/swrast/s_drawpix.c                     |   17 +++++++++---
 src/mesa/swrast/s_span.c                        |   16 +++++------
 6 files changed, 61 insertions(+), 36 deletions(-)

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

New commits:
commit 171dcdfa27dda30916a7f9bfed89577feee5d350
Author: Brian <brian at i915.localnet.net>
Date:   Thu Jun 21 09:15:32 2007 -0600

    Another round of fixing attribute interpolation for glDraw/CopyPixels.
    
    Need to turn off FRAG_BIT_COL0 in swrast->_ActiveAttribMask when doing
    glRead/CopyPixels to prevent the user's colors from getting overwritten
    when a fragment program is active.
    This was happening in the DRI drivers when MaintainTexEnv program was
    used (the texenv fragment program was enabled when _swrast_DrawPixels was
    called).
    This still isn't an ideal solution, but fixes things for now.

commit fe11b2c04bf206bd50654c31e6789519c6c07563
Author: Brian <brian at i915.localnet.net>
Date:   Thu Jun 21 09:11:43 2007 -0600

    rename _swrast_update_fragment_attribs()