mesa: Changes to 'master'

[Brian Paul]

 src/mesa/drivers/dri/i915/intel_pixel.c         |   18 +++++++++++++++---
 src/mesa/drivers/dri/i915tex/intel_pixel_draw.c |   14 +++++++++++++-
 src/mesa/swrast/s_span.c                        |   11 +++++++++--
 src/mesa/swrast/s_zoom.c                        |    6 ++++--
 4 files changed, 41 insertions(+), 8 deletions(-)

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

New commits:
commit a4af3e5ab3fa0f45c25673c93d802cdff087145c
Author: Brian <brian at i915.localnet.net>
Date:   Wed Jun 20 11:01:04 2007 -0600

    Effectively disable _TexEnvProgram before calling _swrast_DrawPixels().
    
    It's OK to use _TexEnvProgram regardless of the texture state, but if fog
    is also enabled, the fragment program is lacking the actual fog computation
    so fogging doesn't appear.
    Fixing this might involve a new _MaintainFogProgram field and related code.
    For now, just disable the _TexEnvProgram and let swrast handle everything.

commit b9080dd5493eb23af6c5c494550c7b1cb481ca7b
Author: Brian <brian at i915.localnet.net>
Date:   Wed Jun 20 10:56:13 2007 -0600

    fix glDrawPixels + fragment program problem

commit c1cb5412336be0e1067899318403ea573be9bb4d
Author: Brian <brian at i915.localnet.net>
Date:   Wed Jun 20 10:55:31 2007 -0600

    copy wpos attrib info into zoomed span (fixes fog perspective correction problem)