mesa: Changes to 'master'

[Roland Scheidegger]

 src/mesa/drivers/dri/i915/i830_vtbl.c        |    6 ++++++
 src/mesa/drivers/dri/i915/i915_vtbl.c        |    8 +++++++-
 src/mesa/drivers/dri/i915/intel_context.h    |    1 +
 src/mesa/drivers/dri/i915/intel_render.c     |    2 ++
 src/mesa/drivers/dri/i915tex/i830_vtbl.c     |    6 ++++++
 src/mesa/drivers/dri/i915tex/i915_context.h  |    6 ------
 src/mesa/drivers/dri/i915tex/i915_vtbl.c     |    8 +++++++-
 src/mesa/drivers/dri/i915tex/intel_context.h |    1 +
 src/mesa/drivers/dri/i915tex/intel_render.c  |    2 ++
 9 files changed, 32 insertions(+), 8 deletions(-)

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

New commits:
commit 10f5a6ac85fb5f78069b7314e40a2a23e2636192
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date:   Sun Jul 29 18:31:36 2007 +0200

    fix fallback crashes when driver can't handle frag prog for i915 driver too (untested)

commit a188ba4bf9364df24842d8727f4c7ddb2f894a2c
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date:   Sun Jul 29 18:04:28 2007 +0200

    Fix crashes when the frag prog can't be handled in hardware (#11131)
    
    Must not change to/from swrast after Render.Start or bad things will happen.
    (Driver will still somewhat incorrectly report an implementation error,
    and apps can't really figure out if a prog is natively supported as validation
    is later - could try doing it earlier to give some hint at least, even though
    native status may still change later due to fog etc.)