mesa: Branch 'master'

[Michel Daenzer]

 src/mesa/drivers/dri/r300/radeon_lock.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 63c57a14d3e9419434bb9ee4d0c5c0d64f2e7847 (from 25f21b5331d27225b1f6b7aaf2c9bf3f32764d91)
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Tue Mar 27 09:19:51 2007 +0200

    r300: Check ctx->WinSysDrawBuffer before calling function that dereferences it.
    
    Fixes https://bugs.freedesktop.org/show_bug.cgi?id=10417 .

diff --git a/src/mesa/drivers/dri/r300/radeon_lock.c b/src/mesa/drivers/dri/r300/radeon_lock.c
index 1a2dfca..b331cfa 100644
--- a/src/mesa/drivers/dri/r300/radeon_lock.c
+++ b/src/mesa/drivers/dri/r300/radeon_lock.c
@@ -55,7 +55,7 @@ static void radeonUpdatePageFlipping(rad
 	int use_back;
 
 	radeon->doPageFlip = radeon->sarea->pfState;
-        if (!radeon->doPageFlip) {
+        if (!radeon->doPageFlip && radeon->glCtx->WinSysDrawBuffer) {
            driFlipRenderbuffers(radeon->glCtx->WinSysDrawBuffer, GL_FALSE);
         }