mesa: Branch 'master'

[Haihao Xiang]

 src/mesa/drivers/dri/i965/brw_draw.c |    1 +
 1 files changed, 1 insertion(+)

New commits:
diff-tree a783713432a1aed168688ace7d03bc11abf9b406 (from 7ecdfb2f08c8722ecad9269ef753420a49be3dde)
Author: Xiang, Haihao <haihao.xiang at intel.com>
Date:   Mon Mar 5 22:18:21 2007 +0800

    fix for bug#9971
    
    call swsetup_Wakeup before falling back to software rendering

diff --git a/src/mesa/drivers/dri/i965/brw_draw.c b/src/mesa/drivers/dri/i965/brw_draw.c
index 092c6ba..4eb2eed 100644
--- a/src/mesa/drivers/dri/i965/brw_draw.c
+++ b/src/mesa/drivers/dri/i965/brw_draw.c
@@ -458,6 +458,7 @@ void brw_draw_prims( GLcontext *ctx,
     * swrast to do the drawing.
     */
    if (!retval) {
+       _swsetup_Wakeup(ctx);
       _tnl_draw_prims(ctx, arrays, prim, nr_prims, ib, min_index, max_index);
    }